Skip to content

Commit 5b863ec

Browse files
committed
* Use tagged version
1 parent 53aa967 commit 5b863ec

File tree

6 files changed

+13
-14
lines changed

6 files changed

+13
-14
lines changed

Makefile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,12 @@ test:
4343
$(PYTEST) $(PACKAGE) $(TEST_OPTIONS)
4444

4545

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

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

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

asyncgpio/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import sys
44

5-
from ._version import __version__ # noqa
6-
75
from .gpio import Chip
86
from .libgpiod import * # noqa
97

asyncgpio/_version.py

Lines changed: 0 additions & 3 deletions
This file was deleted.

debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
asyncgpio (0.4.0-3) unstable; urgency=medium
2+
3+
* Use tagged version
4+
5+
-- Matthias Urlichs <[email protected]> Fri, 22 May 2020 21:19:10 +0200
6+
17
asyncgpio (0.4.0-2) unstable; urgency=medium
28

39
* Edit error

debian/control

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Priority: optional
55
Build-Depends: dh-python, python3-setuptools, python3-all, debhelper (>= 9),
66
libgpiod-dev (>= 1.4),
77
python3-cffi,
8+
python3-setuptools-scm,
89
Standards-Version: 3.9.6
910
Homepage: https://github.com/M-o-a-T/asyncgpio
1011

setup.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
from setuptools import setup, find_packages
22

3-
exec(open("asyncgpio/_version.py", encoding="utf-8").read())
4-
53
LONG_DESC = open("README.rst", encoding="utf-8").read()
64

75
setup(
86
name="asyncgpio",
9-
version=__version__, # noqa: F821
7+
use_scm_version={"version_scheme": "guess-next-dev", "local_scheme": "dirty-tag"},
108
description="GPIO access via Trio and libgpiod",
119
url="https://github.com/M-o-a-T/asyncgpio",
1210
long_description=open("README.rst").read(),
1311
author="Matthias Urlichs",
1412
author_email="[email protected]",
1513
license="MIT -or- Apache License 2.0",
1614
packages=find_packages(),
15+
setup_requires=["setuptools_scm"],
1716
install_requires=[
1817
"trio",
1918
"cffi",

0 commit comments

Comments
 (0)