From 35b97356d1aaf2dc0f07348ec3499be49237f194 Mon Sep 17 00:00:00 2001 From: Hugo Date: Tue, 10 Apr 2018 14:39:18 +0300 Subject: [PATCH 1/6] Single-source the package version --- pylast/__init__.py | 5 +++-- setup.py | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pylast/__init__.py b/pylast/__init__.py index 7c989dc..0b9755b 100644 --- a/pylast/__init__.py +++ b/pylast/__init__.py @@ -32,14 +32,15 @@ import tempfile import time import xml.dom -__version__ = "2.4.0.dev0" +from . import version + __author__ = "Amr Hassan, hugovk, Mice Pápai" __copyright__ = ( "Copyright (C) 2008-2010 Amr Hassan, 2013-2018 hugovk, " "2017 Mice Pápai" ) __license__ = "apache2" __email__ = "amr.hassan@gmail.com" - +__version__ = version.__version__ if sys.version_info.major == 2: import htmlentitydefs diff --git a/setup.py b/setup.py index fe1c40c..1c6d5cb 100755 --- a/setup.py +++ b/setup.py @@ -4,11 +4,16 @@ from setuptools import find_packages, setup with open("README.md") as f: long_description = f.read() +version_dict = {} +with open("pylast/version.py") as f: + exec(f.read(), version_dict) + version = version_dict['__version__'] + setup( name="pylast", long_description=long_description, long_description_content_type="text/markdown", - version="2.4.0.dev0", + version=version, author="Amr Hassan and Contributors", install_requires=["six"], tests_require=[ From c6b080d578cf8b31700a8b0965bdc348291a75ca Mon Sep 17 00:00:00 2001 From: Hugo Date: Sat, 9 Jun 2018 09:40:15 +0300 Subject: [PATCH 2/6] Single-source the package version --- pylast/version.py | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 pylast/version.py diff --git a/pylast/version.py b/pylast/version.py new file mode 100644 index 0000000..2a59a87 --- /dev/null +++ b/pylast/version.py @@ -0,0 +1,2 @@ +# Master version for pylast +__version__ = "2.4.0.dev0" From efd123004a955018172dfd4f52281bee81f53ea5 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sat, 9 Jun 2018 09:43:41 +0300 Subject: [PATCH 3/6] Update release docs --- RELEASING.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index 5e22fb7..45da843 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -1,10 +1,10 @@ # Release Checklist * [ ] Get master to the appropriate code release state. [Travis CI](https://travis-ci.org/pylast/pylast) should be running cleanly for all merges to master. -* [ ] Remove `.dev0` suffix from version in `pylast/__init__.py` and `setup.py`: +* [ ] Remove `.dev0` suffix from the version: ```bash git checkout master -edit pylast/__init__.py setup.py +edit pylast/version.py ``` * [ ] Commit and tag with the version number: ```bash @@ -28,10 +28,10 @@ git push --tags * [ ] Create new GitHub release: https://github.com/pylast/pylast/releases/new * Tag: Pick existing tag "2.1.0" * Title: "Release 2.1.0" -* [ ] Increment version and append `.dev0` in `pylast/__init__.py` and `setup.py`: +* [ ] Increment version and append `.dev0`: ```bash git checkout master -edit pylast/__init__.py setup.py +edit pylast/version.py ``` * [ ] Commit and push: ```bash From d16423c3435dfb631bd286726606b78576ce24a8 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sat, 9 Jun 2018 09:44:39 +0300 Subject: [PATCH 4/6] CI: Also show Black diff on failure --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 89fa5d0..fb2ccdd 100644 --- a/tox.ini +++ b/tox.ini @@ -44,4 +44,4 @@ deps = black commands = {[testenv:lint]commands} - black --check . + black --check --diff . From ca11de0a3a5a94ed8d1f6e661bee95ce41d564d4 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sat, 9 Jun 2018 09:44:59 +0300 Subject: [PATCH 5/6] Black fix --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1c6d5cb..4cb8aa8 100755 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ with open("README.md") as f: version_dict = {} with open("pylast/version.py") as f: exec(f.read(), version_dict) - version = version_dict['__version__'] + version = version_dict["__version__"] setup( name="pylast", From 907891bcb108a1e89f04c04a2daefa6743d244a7 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sat, 9 Jun 2018 09:50:08 +0300 Subject: [PATCH 6/6] Include version file in manifest --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index c778b80..a82ada5 100755 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ -include pylast/__init__.py +include pylast/*.py include setup.py include README.md include COPYING