Merging upstream version 4.66.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 17 insertions, 30 deletions

diff --git a/tox.ini b/tox.ini
index d77a5a8..cd5dc1b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,20 +4,16 @@
 # and then run "tox" from this directory.
 
 [tox]
-# deprecation warning: py{27,py2,34,35,36}
-envlist=py{27,34,35,36,37,38,39,310,py2,py3}{,-tf}{,-keras}, perf, setup.py
+envlist=py{37,38,39,310,311,py3}{,-tf}{,-keras}, perf, check
 isolated_build=True
 
 [gh-actions]
 python=
-    2.7: py27
-    3.5: py35
-    3.6: py36
     3.7: py37
     3.8: py38
     3.9: py39
     3.10: py310
-    pypy-2.7: pypy2
+    3.11: py311
     pypy-3.7: pypy3
 [gh-actions:env]
 PLATFORM=
@@ -26,12 +22,11 @@ PLATFORM=
 [core]
 deps=
     pytest
-    py3{4,5,6}: pytest<7
     pytest-cov
     pytest-timeout
-    py3{7,8,9,10}: pytest-asyncio
-    py3{6,7,8,9,10}: ipywidgets
-    py3{7,8,9,10}: git+https://github.com/casperdcl/nbval.git@master#egg=nbval
+    pytest-asyncio
+    ipywidgets
+    git+https://github.com/casperdcl/nbval.git@master#egg=nbval
     coverage
     coveralls
     codecov
@@ -41,7 +36,7 @@ commands=
     - codacy report -l Python -r coverage.xml --partial
 
 [testenv]
-passenv=TOXENV CI GITHUB_* CODECOV_* COVERALLS_* CODACY_* HOME
+passenv=TOXENV,CI,GITHUB_*,CODECOV_*,COVERALLS_*,CODACY_*,HOME
 deps=
     {[core]deps}
     cython
@@ -49,26 +44,17 @@ deps=
     matplotlib
     numpy
     pandas
+    rich
     tf: tensorflow!=2.5.0
-    !py27-keras: keras
-    py27-keras: keras<2.5
-    py35-keras: keras<2.7
-    py27-tf: protobuf<3.18
-    py3{6,7,8,9,10}: rich
+    keras: keras
 commands=
-    py3{4,5,6}: pytest --cov=tqdm --cov-report=xml --cov-report=term -k "not perf" -o addopts= -v --tb=short -rxs -W=error --durations=0 --durations-min=0.1
-    py3{7,8,9,10}: pytest --cov=tqdm --cov-report= tests_notebook.ipynb --nbval --nbval-current-env -W=ignore --nbval-sanitize-with=setup.cfg
-    py3{7,8,9,10}: pytest --cov=tqdm --cov-report=xml --cov-report=term --cov-append -k "not perf"
+    pytest --cov=tqdm --cov-report= -W=ignore tests_notebook.ipynb --nbval --current-env --sanitize-with=.meta/nbval.ini
+    pytest --cov=tqdm --cov-report=xml --cov-report=term --cov-append -k "not perf"
     {[core]commands}
 allowlist_externals=codacy
 
-[testenv:py{27,py2}{,-tf}{,-keras}]
-commands=
-    pytest --cov=tqdm --cov-report=xml --cov-report=term -k "not perf" -o addopts= -v --tb=short -rxs -W=error --durations=10
-    {[core]commands}
-
 # no cython/numpy/pandas
-[testenv:py{34,py2,py3}]
+[testenv:pypy3]
 deps={[core]deps}
 
 [testenv:perf]
@@ -78,11 +64,12 @@ deps=
     pytest-asyncio
 commands=pytest -k perf
 
-[testenv:setup.py]
+[testenv:check]
 deps=
-    docutils
-    pygments
+    build
+    twine
     py-make>=0.1.0
 commands=
-    {envpython} setup.py check --restructuredtext --metadata --strict
-    {envpython} setup.py make none
+    {envpython} -m build
+    {envpython} -m twine check dist/*
+    {envpython} -m pymake -h