Skip to content

Commit

Permalink
Use tag version
Browse files Browse the repository at this point in the history
  • Loading branch information
smurfix committed Feb 10, 2020
1 parent c65722d commit 09ab687
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 14 deletions.
15 changes: 7 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,15 @@ jenkins-quality: reports
update:
pip install -r ci/test-requirements.txt

tag:
@git tag v$(shell python3 setup.py -V)
tagged:
git describe --tags --exact-match
test $$(git ls-files -m | wc -l) = 0

pypi: tag
@if python3 setup.py -V 2>/dev/null | grep -qs + >/dev/null 2>&1 ; \
then echo "You need a clean, tagged tree" >&2; exit 1 ; fi
pypi: tagged
python3 setup.py sdist upload
## version depends on tag, so re-tagging doesn't make sense


upload: pypi
git push-all --tags
git push --tags

.PHONY: all tagged pypi upload test check doc

2 changes: 0 additions & 2 deletions asyncamqp/_version.py

This file was deleted.

1 change: 1 addition & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Build-Depends: python3-setuptools, python3-all, debhelper (>= 9),
python3 (>> 3.6),
python3-anyio,
python3-pytest-trio,
python3-setuptools-scm,
python3-requests (>> 2.21),
python3-pyrabbit,
Standards-Version: 3.9.1
Expand Down
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import setuptools

exec(open("asyncamqp/_version.py", encoding="utf-8").read())

description = 'AMQP implementation using anyio'

setuptools.setup(
name=__packagename__, # noqa: F821
version=__version__, # noqa: F821
name="asyncamqp",
use_scm_version={"version_scheme": "guess-next-dev", "local_scheme": "dirty-tag"},
author="Matthias Urlichs",
author_email='[email protected]',
url='https://github.com/python-trio/asyncamqp',
Expand Down

0 comments on commit 09ab687

Please sign in to comment.