Skip to content

Commit fba3874

Browse files
committed
Revise release process and notes.
- Use twine. - Add test PyPI into the mix. - More use of Makefile for automation (there was already stuff in there from the cookiecutter template I wasn't using). Fixes #73.
1 parent aeeaedb commit fba3874

File tree

3 files changed

+39
-14
lines changed

3 files changed

+39
-14
lines changed

Makefile

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,18 @@ docs:
5959
$(MAKE) -C docs html
6060
open docs/_build/html/index.html
6161

62-
release: clean
63-
python setup.py sdist upload
64-
python setup.py bdist_wheel upload
65-
6662
dist: clean
67-
python setup.py sdist
68-
python setup.py bdist_wheel
63+
python setup.py sdist bdist_egg bdist_wheel
6964
ls -l dist
65+
66+
release-test: dist
67+
twine upload -r test dist/*
68+
echo "Review https://testpypi.python.org/pypi/planemo"
69+
70+
release:
71+
@while [ -z "$$CONTINUE" ]; do \
72+
read -r -p "Have you executed release-test and reviewed results? [y/N]: " CONTINUE; \
73+
done ; \
74+
[ $$CONTINUE = "y" ] || [ $$CONTINUE = "Y" ] || (echo "Exiting."; exit 1;)
75+
@echo "Releasing"
76+
twine upload dist/*

dev-requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ flake8
1010

1111
# For release
1212
wheel
13+
twine

docs/developing.rst

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,38 @@ Release Checklist
1010
This release checklist is based on the `Pocoo Release Management Workflow
1111
<http://www.pocoo.org/internal/release-management/>`_.
1212

13+
This assumes ``~/.pypirc`` file exists with the following fields (variations)
14+
are fine.
15+
16+
```
17+
[distutils]
18+
index-servers =
19+
pypi
20+
test
21+
22+
[pypi]
23+
username:<username>
24+
password:<password>
25+
26+
[test]
27+
repository:https://testpypi.python.org/pypi
28+
username:<username>
29+
password:<password>
30+
```
31+
1332
* Review ``git status`` for missing files.
1433
* Verify the latest Travis CI builds pass.
15-
* ``make lint && make test``
16-
* Update version info in ``planemo/__init__.py`` (drop ``-dev`` suffix).
34+
* ``make clean && make lint && make test``
35+
* Update version info in ``planemo/__init__.py`` (drop ``.dev0`` suffix).
1736
* Update release date and description in ``HISTORY.rst``.
1837
* ``make docs`` and review changelog.
1938
* ``git commit``
20-
* ``python2.7 setup.py bdist_wheel bdist_egg sdist upload``
21-
* ``python2.6 setup.py bdist_egg upload`` (TODO)
22-
* Check PyPI release page for obvious errors (https://pypi.python.org/pypi/planemo)
39+
* ``make release-test``
40+
* Review `Test PyPI <https://testpypi.python.org/pypi/planemo>`_ for errors (install with ``pip install -i https://testpypi.python.org/pypi planemo``).
41+
* ``make release``
2342
* ``git tag <release>``
24-
* Update version info in ``planemo/__init__.py`` (n+1-dev).
43+
* Update version info in ``planemo/__init__.py`` (n+1.dev0).
2544
* ``git commit``
2645
* ``git push origin``
2746
* ``git push --tags origin``
2847
* Update planemo homebrew recipe to new version.
29-
30-
This requires ``~/.pypirc`` file.

0 commit comments

Comments
 (0)