diff --git a/.release.sh b/.release.sh index 52a4e632c0..78ae44d287 100755 --- a/.release.sh +++ b/.release.sh @@ -4,11 +4,12 @@ VERSION=$(cat evennia/VERSION.txt) echo "This will release Evennia $VERSION (based on evennia/VERSION.txt)." echo "Before continuing:" -echo " 1. Make sure you have Evennia upload credentials." -echo " 2. Determine if CHANGELOG.md should be updated and rebuilt." -echo " 3. Make sure VERSION.txt and pyproject.toml both show version $VERSION." -echo " 4. Make sure all changes are committed (all un-staged files will be wiped)." -echo " 5. Make sure all unit tests pass." +echo " 1. Make sure you have Evennia upload credentials for Github (tagging) and PyPi (main package)." +echo " 2. Update CHANGELOG.md." +echo " 3. Run 'make local' in docs/ to update dynamic docs and autodocstrings (may have to run twice)." +echo " 4. Make sure VERSION.txt and pyproject.toml both show version $VERSION." +echo " 5. Make sure all changes are committed, e.g. as 'Evennia 1.x.x bug-fix release' (un-staged files will be wiped)." +echo " 6. Make sure all unit tests pass!" read -p "Continue? [Y/n]> " yn @@ -26,12 +27,12 @@ pip install --upgrade pip pip install build twine python -m build --sdist --wheel --outdir dist/ . -echo "Uploading PyPi package (requires credentials) ..." +echo "Uploading PyPi package (requires PyPi credentials) ..." python -m twine upload dist/* # tag the latest git commit -echo "Creating and pushing release tag tag v$VERSION ..." +echo "Creating and pushing release tag tag v$VERSION (requires GitHub credentials)..." git tag -a v$VERSION -m "Evennia release v$VERSION" git push --tags diff --git a/CHANGELOG.md b/CHANGELOG.md index ade0a481ea..0432d4d94c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,17 @@ # Changelog -### Evennia 1.0 +### Evennia 1.0.2 +Dec 21, 2022 + +Bug fix release. Fix more issues with discord bot reconnecting. Some doc +updates. + +### Evennia 1.0.1 +Dec 7, 2022 + +Bug fix release. Main issue was reconnect bug for discord bot. + +## Evennia 1.0 2019-2022 diff --git a/docs/source/Coding/Changelog.md b/docs/source/Coding/Changelog.md index ade0a481ea..0e8b442185 100644 --- a/docs/source/Coding/Changelog.md +++ b/docs/source/Coding/Changelog.md @@ -1,6 +1,17 @@ # Changelog -### Evennia 1.0 +### Evennia 1.0.2 +Dec 21, 2022 + +Bug fix release. Fix more issues with discord bot reconnecting. Some doc +updates. + +### Evennia 1.0.1 + + +Bug fix release. Main issue was reconnect bug for discord bot. + +## Evennia 1.0 2019-2022 diff --git a/docs/source/Contribs/Contrib-Crafting.md b/docs/source/Contribs/Contrib-Crafting.md index d7754b8093..36e9071350 100644 --- a/docs/source/Contribs/Contrib-Crafting.md +++ b/docs/source/Contribs/Contrib-Crafting.md @@ -42,7 +42,7 @@ is being combined instead): See the [sword example](evennia.contrib.game_systems.crafting.example_recipes) for an example of how to design a recipe tree for crafting a sword from base elements. -## Intallation and Usage +## Installation and Usage Import the `CmdCraft` command from evennia/contrib/crafting/crafting.py and add it to your Character cmdset. Reload and the `craft` command will be diff --git a/docs/source/Contribs/Contrib-Extended-Room.md b/docs/source/Contribs/Contrib-Extended-Room.md index 6f7b6e135e..e71745f6eb 100644 --- a/docs/source/Contribs/Contrib-Extended-Room.md +++ b/docs/source/Contribs/Contrib-Extended-Room.md @@ -16,11 +16,12 @@ In more detail, in `mygame/commands/default_cmdsets.py`: ```python ... -from evennia.contrib import extended_room # <--- +from evennia.contrib.grid import extended_room # <--- -class CharacterCmdset(default_cmds.Character_CmdSet): +class CharacterCmdset(default_cmds.CharacterCmdSet): ... def at_cmdset_creation(self): + super().at_cmdset_creation() ... self.add(extended_room.ExtendedRoomCmdSet) # <--- @@ -28,7 +29,10 @@ class CharacterCmdset(default_cmds.Character_CmdSet): Then reload to make the new commands available. Note that they only work on rooms with the typeclass `ExtendedRoom`. Create new rooms with the right -typeclass or use the `typeclass` command to swap existing rooms. +typeclass or use the `typeclass` command to swap existing rooms. Note that since +this contrib overrides the `look` command, you will need to add the +`extended_room.ExtendedRoomCmdSet` to the default character cmdset *after* +super().at_cmdset_creation(), or it will be overridden by the default look. ## Features diff --git a/evennia/VERSION.txt b/evennia/VERSION.txt index 7dea76edb3..6d7de6e6ab 100644 --- a/evennia/VERSION.txt +++ b/evennia/VERSION.txt @@ -1 +1 @@ -1.0.1 +1.0.2 diff --git a/evennia/contrib/tutorials/evadventure/dungeon.py b/evennia/contrib/tutorials/evadventure/dungeon.py index 38988e4bda..3caec0c702 100644 --- a/evennia/contrib/tutorials/evadventure/dungeon.py +++ b/evennia/contrib/tutorials/evadventure/dungeon.py @@ -128,7 +128,6 @@ class EvAdventureDungeonRoom(EvAdventureRoom): class EvAdventureDungeonExit(DefaultExit): """ Dungeon exit. This will not create the target room until it's traversed. - It must be created referencing the dungeon_orchestrator it belongs to. """ @@ -142,7 +141,8 @@ class EvAdventureDungeonExit(DefaultExit): def at_traverse(self, traversing_object, target_location, **kwargs): """ Called when traversing. `target_location` will be None if the - target was not yet created. + target was not yet created. It checks the current location to get the + dungeon-orchestrator in use. """ if target_location == self.location: diff --git a/pyproject.toml b/pyproject.toml index b348843cc2..296901b6e6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "evennia" -version = "1.0.1" +version = "1.0.2" maintainers = [{ name = "Griatch", email = "griatch@gmail.com" }] description = "A full-featured toolkit and server for text-based multiplayer games (MUDs, MU*, etc)." requires-python = ">=3.10"