From 3e6ccb919c9810d591fbad6a954bb5809874e849 Mon Sep 17 00:00:00 2001 From: Markus Gerstel Date: Thu, 29 Oct 2020 12:30:14 +0000 Subject: [PATCH 1/6] Run tests on Python 3.9 --- .azure-pipelines.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 2666f34..6e42738 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -32,6 +32,8 @@ jobs: PYTHON_VERSION: 3.7 python38: PYTHON_VERSION: 3.8 + python39: + PYTHON_VERSION: 3.9 steps: - template: .azure-pipelines/ci.yml @@ -47,6 +49,8 @@ jobs: PYTHON_VERSION: 3.7 python38: PYTHON_VERSION: 3.8 + python39: + PYTHON_VERSION: 3.9 steps: - template: .azure-pipelines/ci.yml @@ -62,6 +66,8 @@ jobs: PYTHON_VERSION: 3.7 python38: PYTHON_VERSION: 3.8 + python39: + PYTHON_VERSION: 3.9 steps: - template: .azure-pipelines/ci.yml From 35b39f30f266905a7fb9de9557fdf0b170c4fec1 Mon Sep 17 00:00:00 2001 From: Markus Gerstel Date: Thu, 29 Oct 2020 12:30:32 +0000 Subject: [PATCH 2/6] Make pytest more verbose by default --- pytest.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/pytest.ini b/pytest.ini index fe55d2e..f35fcaa 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,2 +1,3 @@ [pytest] +addopts = -ra junit_family=xunit2 From 93bc57e2bfc477d8f284867949a7bc5b73d6b004 Mon Sep 17 00:00:00 2001 From: Markus Gerstel Date: Thu, 29 Oct 2020 13:59:42 +0000 Subject: [PATCH 3/6] Update changelog, remove Travis 3.9dev builds [ci skip] --- .travis.yml | 5 ----- HISTORY.rst | 2 +- tox.ini | 3 +-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 523d7a0..6c875e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,6 @@ language: python matrix: include: - - python: 3.9-dev - dist: bionic -# - python: 3.9 -# dist: bionic -# env: OPTIONAL=1 - python: 3.8 - python: 3.7 - python: 3.6 diff --git a/HISTORY.rst b/HISTORY.rst index 7b5accf..8df2df1 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,7 +4,7 @@ History 2.3.0 (????-??-??) ------------------ -* Python 3.6+ only, support for Python 3.5 has been dropped +* Add Python 3.9 support, drop Python 3.5 support * Fix a file descriptor leak on subprocess execution 2.2.0 (2020-09-07) diff --git a/tox.ini b/tox.ini index fc76a2d..3dcc731 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,8 @@ [tox] -envlist = py36, py37, py38, py39, flake8 +envlist = py36, py37, py38, flake8 [travis] python = - 3.9: py39 3.8: py38 3.7: py37 3.6: py36 From 099ba4df2add07c8e7752200d7dd666a21f297c4 Mon Sep 17 00:00:00 2001 From: Markus Gerstel Date: Thu, 29 Oct 2020 14:01:21 +0000 Subject: [PATCH 4/6] wheel release is no longer universal [ci skip] --- setup.cfg | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 1e57d71..2daa0b0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -11,9 +11,6 @@ replace = version="{new_version}" search = __version__ = "{current_version}" replace = __version__ = "{new_version}" -[bdist_wheel] -universal = 1 - [flake8] exclude = docs From 04d85c79301c3c2695e9322b67f653ca0c5de6ff Mon Sep 17 00:00:00 2001 From: Markus Gerstel Date: Thu, 29 Oct 2020 14:05:12 +0000 Subject: [PATCH 5/6] update project metadata --- setup.cfg | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/setup.cfg b/setup.cfg index 2daa0b0..a7d6a36 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,9 @@ +[metadata] +project-urls = + Documentation = https://procrunner.readthedocs.io/ + GitHub = https://github.com/DiamondLightSource/python-procrunner + Bug-Tracker = https://github.com/DiamondLightSource/python-procrunner/issues + [bumpversion] current_version = 2.2.0 commit = True From 9377ef3a36aa94dc443815c2b746dde2e486e8fd Mon Sep 17 00:00:00 2001 From: Markus Gerstel Date: Thu, 29 Oct 2020 14:27:40 +0000 Subject: [PATCH 6/6] separate out bumpversion configuration [ci skip] --- .bumpversion.cfg | 12 ++++++++++++ setup.cfg | 13 ------------- 2 files changed, 12 insertions(+), 13 deletions(-) create mode 100644 .bumpversion.cfg diff --git a/.bumpversion.cfg b/.bumpversion.cfg new file mode 100644 index 0000000..332c367 --- /dev/null +++ b/.bumpversion.cfg @@ -0,0 +1,12 @@ +[bumpversion] +current_version = 2.2.0 +commit = True +tag = True + +[bumpversion:file:setup.py] +search = version="{current_version}" +replace = version="{new_version}" + +[bumpversion:file:procrunner/__init__.py] +search = __version__ = "{current_version}" +replace = __version__ = "{new_version}" diff --git a/setup.cfg b/setup.cfg index a7d6a36..e9b819e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,19 +4,6 @@ project-urls = GitHub = https://github.com/DiamondLightSource/python-procrunner Bug-Tracker = https://github.com/DiamondLightSource/python-procrunner/issues -[bumpversion] -current_version = 2.2.0 -commit = True -tag = True - -[bumpversion:file:setup.py] -search = version="{current_version}" -replace = version="{new_version}" - -[bumpversion:file:procrunner/__init__.py] -search = __version__ = "{current_version}" -replace = __version__ = "{new_version}" - [flake8] exclude = docs