From 9bf4196816eadf0b002e70f34a5a845242e4ee62 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 6 Jan 2021 11:49:48 +0100 Subject: [PATCH] Py39, Molecule 3.2.1 and dep tree upgrade --- .drone.yml | 20 ++++++++++---------- CHANGELOG.md | 4 +++- setup.cfg | 21 ++++++++++++--------- tox.ini | 15 ++++++--------- 4 files changed, 31 insertions(+), 29 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1ee1a06..81403f0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,9 +3,9 @@ kind: pipeline name: linters steps: - name: tox -e linters - image: python:3.8-buster + image: python:3.9-buster commands: - - pip install tox==3.14.6 + - pip install tox - tox -e linters --- @@ -13,9 +13,9 @@ kind: pipeline name: packaging steps: - name: tox -e packaging - image: python:3.8-buster + image: python:3.9-buster commands: - - pip install tox==3.14.6 + - pip install tox - tox -e packaging depends_on: - linters @@ -27,7 +27,7 @@ steps: - name: tox -e py36 image: python:3.6-buster commands: - - pip install tox==3.14.6 + - pip install tox - tox -e py36 depends_on: - linters @@ -39,7 +39,7 @@ steps: - name: tox -e py37 image: python:3.7-buster commands: - - pip install tox==3.14.6 + - pip install tox - tox -e py37 depends_on: - linters @@ -51,7 +51,7 @@ steps: - name: tox -e py38 image: python:3.8-buster commands: - - pip install tox==3.14.6 + - pip install tox - tox -e py38 depends_on: - linters @@ -61,10 +61,10 @@ kind: pipeline name: devel steps: - name: tox -e devel - image: python:3.8-buster + image: python:3.9-buster failure: ignore commands: - - pip install tox==3.14.6 + - pip install tox - tox -e devel depends_on: - linters @@ -74,7 +74,7 @@ kind: pipeline name: integration steps: - name: molecule test - image: python:3.8-buster + image: python:3.9-buster environment: MOLECULE_NO_LOG: false HCLOUD_TOKEN: diff --git a/CHANGELOG.md b/CHANGELOG.md index 14751f2..3a83ad6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -- Decolonise Git praxis and use the main branch as default. +- Support Python 3.9. +- Support Molecule 3.2.1 +- Decolonise Git praxis and use the main branch as default ## [0.2.2] - 2020-06-15 diff --git a/setup.cfg b/setup.cfg index 4c93b01..7fb487a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,7 +30,10 @@ classifiers = Natural Language :: English Operating System :: OS Independent Programming Language :: Python :: 3 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 Topic :: System :: Systems Administration Topic :: Utilities keywords = @@ -49,23 +52,23 @@ packages = find: include_package_data = True zip_safe = False setup_requires = - setuptools_scm >= 3.5.0 - setuptools_scm_git_archive >= 1.1 + setuptools_scm + setuptools_scm_git_archive install_requires = - hcloud >= 1.6.3, < 2 - molecule >= 3.0.4, <= 3.1 + hcloud >= 1.10.0, < 2 + molecule >= 3.2.1, <= 3.3 pyyaml >= 5.3.1, < 6 [options.extras_require] test = - hcloud >= 1.6.3, < 2 + hcloud >= 1.10.0, < 2 mock >= 4.0.2, < 5 - pytest-cov >= 2.8.1, < 3 + pytest-cov >= 2.10.1, < 3 pytest-helpers-namespace >= 2019.1.8, < 2020 - pytest-mock >= 3.1.0, < 4 + pytest-mock >= 3.5.0, < 4 pytest-verbose-parametrize>=1.7.0, < 2 - pytest-xdist>=1.31.0, < 2 - pytest>=5.4.1, < 6 + pytest-xdist>=2.2.0, < 3 + pytest>=6.2.1, < 7 [options.packages.find] where = . diff --git a/tox.ini b/tox.ini index 7c0874d..3ee9fac 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,10 @@ # For more information about tox, see https://tox.readthedocs.io/en/latest/ [tox] -minversion = 3.14.0 envlist = linters packaging - py{36,37,38} + py{36,37,38,39} devel - skipsdist = True skip_missing_interpreters = False isolated_build = True @@ -19,12 +17,11 @@ setenv = PYTHONDONTWRITEBYTECODE=1 PYTEST_ADDOPTS=molecule_hetznercloud/test/unit/ --cov={toxinidir}/molecule_hetznercloud/ --no-cov-on-fail {env:PYTEST_ADDOPTS:-n auto} deps = - ansible>=2.9,<2.10 + ansible>=2.10,<2.11 extras = test commands = python -m pytest {posargs} - whitelist_externals = bash twine @@ -34,7 +31,7 @@ whitelist_externals = [testenv:linters] commands = python -m pre_commit run {posargs:--all} -deps = pre-commit>=1.18.1 +deps = pre-commit skip_install = true usedevelop = false @@ -42,9 +39,9 @@ usedevelop = false usedevelop = false skip_install = true deps = - collective.checkdocs >= 0.2 - pep517 >= 0.5.0 - twine >= 2.0.0 + collective.checkdocs + pep517 + twine commands = bash -c "rm -rf {toxinidir}/dist/ && mkdir -p {toxinidir}/dist/" python -m pep517.build \