Py39, Molecule 3.2.1 and dep tree upgrade

This commit is contained in:
Luke Murphy 2021-01-06 11:49:48 +01:00
parent 447585b8c5
commit 9bf4196816
No known key found for this signature in database
GPG Key ID: 5E2EF5A63E3718CC
4 changed files with 31 additions and 29 deletions

View File

@ -3,9 +3,9 @@ kind: pipeline
name: linters name: linters
steps: steps:
- name: tox -e linters - name: tox -e linters
image: python:3.8-buster image: python:3.9-buster
commands: commands:
- pip install tox==3.14.6 - pip install tox
- tox -e linters - tox -e linters
--- ---
@ -13,9 +13,9 @@ kind: pipeline
name: packaging name: packaging
steps: steps:
- name: tox -e packaging - name: tox -e packaging
image: python:3.8-buster image: python:3.9-buster
commands: commands:
- pip install tox==3.14.6 - pip install tox
- tox -e packaging - tox -e packaging
depends_on: depends_on:
- linters - linters
@ -27,7 +27,7 @@ steps:
- name: tox -e py36 - name: tox -e py36
image: python:3.6-buster image: python:3.6-buster
commands: commands:
- pip install tox==3.14.6 - pip install tox
- tox -e py36 - tox -e py36
depends_on: depends_on:
- linters - linters
@ -39,7 +39,7 @@ steps:
- name: tox -e py37 - name: tox -e py37
image: python:3.7-buster image: python:3.7-buster
commands: commands:
- pip install tox==3.14.6 - pip install tox
- tox -e py37 - tox -e py37
depends_on: depends_on:
- linters - linters
@ -51,7 +51,7 @@ steps:
- name: tox -e py38 - name: tox -e py38
image: python:3.8-buster image: python:3.8-buster
commands: commands:
- pip install tox==3.14.6 - pip install tox
- tox -e py38 - tox -e py38
depends_on: depends_on:
- linters - linters
@ -61,10 +61,10 @@ kind: pipeline
name: devel name: devel
steps: steps:
- name: tox -e devel - name: tox -e devel
image: python:3.8-buster image: python:3.9-buster
failure: ignore failure: ignore
commands: commands:
- pip install tox==3.14.6 - pip install tox
- tox -e devel - tox -e devel
depends_on: depends_on:
- linters - linters
@ -74,7 +74,7 @@ kind: pipeline
name: integration name: integration
steps: steps:
- name: molecule test - name: molecule test
image: python:3.8-buster image: python:3.9-buster
environment: environment:
MOLECULE_NO_LOG: false MOLECULE_NO_LOG: false
HCLOUD_TOKEN: HCLOUD_TOKEN:

View File

@ -7,7 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [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 ## [0.2.2] - 2020-06-15

View File

@ -30,7 +30,10 @@ classifiers =
Natural Language :: English Natural Language :: English
Operating System :: OS Independent Operating System :: OS Independent
Programming Language :: Python :: 3 Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Topic :: System :: Systems Administration Topic :: System :: Systems Administration
Topic :: Utilities Topic :: Utilities
keywords = keywords =
@ -49,23 +52,23 @@ packages = find:
include_package_data = True include_package_data = True
zip_safe = False zip_safe = False
setup_requires = setup_requires =
setuptools_scm >= 3.5.0 setuptools_scm
setuptools_scm_git_archive >= 1.1 setuptools_scm_git_archive
install_requires = install_requires =
hcloud >= 1.6.3, < 2 hcloud >= 1.10.0, < 2
molecule >= 3.0.4, <= 3.1 molecule >= 3.2.1, <= 3.3
pyyaml >= 5.3.1, < 6 pyyaml >= 5.3.1, < 6
[options.extras_require] [options.extras_require]
test = test =
hcloud >= 1.6.3, < 2 hcloud >= 1.10.0, < 2
mock >= 4.0.2, < 5 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-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-verbose-parametrize>=1.7.0, < 2
pytest-xdist>=1.31.0, < 2 pytest-xdist>=2.2.0, < 3
pytest>=5.4.1, < 6 pytest>=6.2.1, < 7
[options.packages.find] [options.packages.find]
where = . where = .

15
tox.ini
View File

@ -1,12 +1,10 @@
# For more information about tox, see https://tox.readthedocs.io/en/latest/ # For more information about tox, see https://tox.readthedocs.io/en/latest/
[tox] [tox]
minversion = 3.14.0
envlist = envlist =
linters linters
packaging packaging
py{36,37,38} py{36,37,38,39}
devel devel
skipsdist = True skipsdist = True
skip_missing_interpreters = False skip_missing_interpreters = False
isolated_build = True isolated_build = True
@ -19,12 +17,11 @@ setenv =
PYTHONDONTWRITEBYTECODE=1 PYTHONDONTWRITEBYTECODE=1
PYTEST_ADDOPTS=molecule_hetznercloud/test/unit/ --cov={toxinidir}/molecule_hetznercloud/ --no-cov-on-fail {env:PYTEST_ADDOPTS:-n auto} PYTEST_ADDOPTS=molecule_hetznercloud/test/unit/ --cov={toxinidir}/molecule_hetznercloud/ --no-cov-on-fail {env:PYTEST_ADDOPTS:-n auto}
deps = deps =
ansible>=2.9,<2.10 ansible>=2.10,<2.11
extras = extras =
test test
commands = commands =
python -m pytest {posargs} python -m pytest {posargs}
whitelist_externals = whitelist_externals =
bash bash
twine twine
@ -34,7 +31,7 @@ whitelist_externals =
[testenv:linters] [testenv:linters]
commands = commands =
python -m pre_commit run {posargs:--all} python -m pre_commit run {posargs:--all}
deps = pre-commit>=1.18.1 deps = pre-commit
skip_install = true skip_install = true
usedevelop = false usedevelop = false
@ -42,9 +39,9 @@ usedevelop = false
usedevelop = false usedevelop = false
skip_install = true skip_install = true
deps = deps =
collective.checkdocs >= 0.2 collective.checkdocs
pep517 >= 0.5.0 pep517
twine >= 2.0.0 twine
commands = commands =
bash -c "rm -rf {toxinidir}/dist/ && mkdir -p {toxinidir}/dist/" bash -c "rm -rf {toxinidir}/dist/ && mkdir -p {toxinidir}/dist/"
python -m pep517.build \ python -m pep517.build \