Skip to content

Commit

Permalink
Update tox.ini
Browse files Browse the repository at this point in the history
This adds Python 3.8 and Ubuntu Focal support and
pins pifpaf until [1] is merged and released.

Fixes some warnings on whitelist_externals that
wasn't correct.

[1] jd/pifpaf#150

(cherry picked from commit 2d73949)
  • Loading branch information
tobias-urdin committed Jul 15, 2021
1 parent 9b82f98 commit cc26062
Showing 1 changed file with 17 additions and 8 deletions.
25 changes: 17 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
minversion = 2.4
envlist = py36-{postgresql,mysql}{,-file,-swift,-ceph,-s3},pep8
envlist = {py36,py38}-{postgresql,mysql}{,-file,-swift,-ceph,-s3},pep8
skipsdist = True

[testenv]
Expand Down Expand Up @@ -45,35 +45,42 @@ deps =
-e
.[test,redis,prometheus,amqp1,{env:GNOCCHI_STORAGE_DEPS:},{env:GNOCCHI_INDEXER_DEPS:}]
{env:GNOCCHI_TEST_TARBALLS:}
# TODO(tobias-urdin): Remove this pin and use pifpaf directly instead when this is
# merged and released https://github.com/jd/pifpaf/pull/150
git+https://github.com/tobias-urdin/pifpaf@51f74a3d8743a7ac33259413df7efc30df993460
cliff!=2.9.0
gnocchiclient>=2.8.0,!=7.0.7
commands =
{toxinidir}/run-tests.sh {posargs}
{toxinidir}/run-func-tests.sh {posargs}

[testenv:py36-postgresql-file-upgrade-from-4.3]
[testenv:{py36,py38}-postgresql-file-upgrade-from-4.3]
# We should always recreate since the script upgrade
# Gnocchi we can't reuse the virtualenv
recreate = True
setenv =
GNOCCHI_VERSION_FROM=stable/4.3
GNOCCHI_VARIANT=test,postgresql,file
deps =
pifpaf>=0.13
# TODO(tobias-urdin): Remove this pin and use pifpaf directly instead when this is
# merged and released https://github.com/jd/pifpaf/pull/150
git+https://github.com/tobias-urdin/pifpaf@51f74a3d8743a7ac33259413df7efc30df993460
gnocchiclient>=2.8.0,!=7.0.7
xattr!=0.9.4
commands = {toxinidir}/run-upgrade-tests.sh postgresql-file

[testenv:py36-mysql-ceph-upgrade-from-4.3]
[testenv:{py36,py38}-mysql-ceph-upgrade-from-4.3]
# We should always recreate since the script upgrade
# Gnocchi we can't reuse the virtualenv
recreate = True
setenv =
GNOCCHI_VERSION_FROM=stable/4.3
GNOCCHI_VARIANT=test,mysql,ceph,ceph_recommended_lib
deps =
# TODO(tobias-urdin): Remove this pin and use pifpaf directly instead when this is
# merged and released https://github.com/jd/pifpaf/pull/150
git+https://github.com/tobias-urdin/pifpaf@51f74a3d8743a7ac33259413df7efc30df993460
gnocchiclient>=2.8.0,!=7.0.7
pifpaf[ceph]>=0.13
xattr!=0.9.4
commands = {toxinidir}/run-upgrade-tests.sh mysql-ceph

Expand All @@ -82,7 +89,7 @@ basepython = python3
deps = hacking>=0.12
commands = flake8

[testenv:py36-cover]
[testenv:{py36,py38}-cover]
commands = pifpaf -g GNOCCHI_INDEXER_URL run postgresql -- python setup.py testr --coverage --testr-args="{posargs}"

[flake8]
Expand All @@ -108,14 +115,16 @@ commands = doc8 --ignore-path doc/source/rest.rst,doc/source/comparison-table.rs

[testenv:docs-gnocchi-web]
basepython = python3
whitelist_externals = bash rm
whitelist_externals =
/bin/bash
/bin/rm
setenv = GNOCCHI_STORAGE_DEPS=file
GNOCCHI_TEST_DEBUG=1
install_command = pip install -U {opts} {packages}
deps = {[testenv:docs]deps}
setuptools
commands =
rm -rf doc/build/html
/bin/rm -rf doc/build/html
pifpaf -g GNOCCHI_INDEXER_URL run postgresql -- python setup.py build_sphinx

[doc8]
Expand Down

0 comments on commit cc26062

Please sign in to comment.