diff --git a/CHANGELOG.md b/CHANGELOG.md index 731593f..0e1aa66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,12 @@ Changelog --------- -**0.14.0 (TBA)** +**0.14.0 (2017-09-07)** * Add `--debug` option to enable debug logging instead of using the `TOOT_DEBUG` environment variable. +* Fix: don't read requirements.txt from setup.py, this fails when packaging deb + and potentially in some other cases (see #18) **0.13.0 (2017-08-26)** diff --git a/README.rst b/README.rst index ab85dff..e92ed7c 100644 --- a/README.rst +++ b/README.rst @@ -17,14 +17,29 @@ Interact with Mastodon social networks from the command line. Installation ------------ -On Debian or Ubuntu running Python 3, download the .deb package from the -`latest release `_ and install it -using apt. This will also install the required prerequisites. +From APT package repository +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +This works for Debian, Ubuntu and derivatives. + +The repo is signed with my `keybase.io `_ key. + +Add the `bezdomni.net` repository: .. code-block:: - apt install ./python3-toot_0.13.0-1_all.deb + echo "deb http://bezdomni.net/packages/ ./" | sudo tee /etc/apt/sources.list.d/bezomni.list + curl https://keybase.io/ihabunek/pgp_keys.asc | sudo apt-key add - +Install the package: + +.. code-block:: + + sudo apt update + sudo apt install python3-toot + +From Python Package Index +~~~~~~~~~~~~~~~~~~~~~~~~~ Otherwise, install from PyPI using pip, preferably into a virtual environment: diff --git a/RELEASE.md b/RELEASE.md new file mode 100644 index 0000000..8e9abac --- /dev/null +++ b/RELEASE.md @@ -0,0 +1,24 @@ +Release instructions +==================== + +* Update the version number in `setup.py` +* Update the `CHANGELOG.md` with the release notes & date +* Tag a release +* Push master & tag to GitHub + +Publishing to PyPI +------------------ + +* `make dist` to create source and wheel distributions +* `make publish` to push them to PyPI + +Publishing to Debian repo +------------------------- + +Publishing deb packages is done via [ihabunek/packages](https://github.com/ihabunek/packages) + +* `make deb` to create the debian package +* copy deb file to packages project directory +* in packages project directory: + * `make` to build the repo files + * `make publish` to send them to the server diff --git a/setup.py b/setup.py index 9b885c8..fe56904 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ with open("README.rst") as readme: setup( name='toot', - version='0.13.0', + version='0.14.0', description='Interact with Mastodon social networks from the command line.', long_description=long_description, author='Ivan Habunek',