From 9ef73585f5358482936cc905db97d83bd6c100a4 Mon Sep 17 00:00:00 2001 From: joncrall Date: Mon, 26 Aug 2024 10:15:01 -0400 Subject: [PATCH] Bump pygments for CVE-2022-40896, clean up other req formatting --- requirements/colors.txt | 6 +----- requirements/docs.txt | 2 +- requirements/jupyter.txt | 9 --------- requirements/tests-binary.txt | 2 +- requirements/tests.txt | 6 +++--- 5 files changed, 6 insertions(+), 19 deletions(-) diff --git a/requirements/colors.txt b/requirements/colors.txt index 1374acb0..812666db 100644 --- a/requirements/colors.txt +++ b/requirements/colors.txt @@ -1,6 +1,2 @@ -#Pygments >= 2.2.0 - -Pygments>= 2.4.1 ; python_version >= '3.5.0' # Python 2.7 -Pygments>= 2.0.0 ; python_version < '3.5.0' and python_version >= '2.7.0' # Python 2.7-3.4 - +Pygments >= 2.15.1 colorama >= 0.4.1;platform_system=="Windows" diff --git a/requirements/docs.txt b/requirements/docs.txt index 57d0dabc..e3d73963 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -3,6 +3,6 @@ sphinx-autobuild >= 2021.3.14 sphinx_rtd_theme >= 1.0.0 sphinxcontrib-napoleon >= 0.7 sphinx-autoapi >= 1.8.4 -Pygments >= 2.9.0 +Pygments >= 2.15.1 myst_parser >= 0.18.0 sphinx-reredirects >= 0.0.1 diff --git a/requirements/jupyter.txt b/requirements/jupyter.txt index ecaa6d69..630b47bf 100644 --- a/requirements/jupyter.txt +++ b/requirements/jupyter.txt @@ -7,25 +7,20 @@ # xdev availpkg attrs # xdev availpkg ipython_genutils - nbconvert>=6.1.0; python_version >= '3.7.0' and platform_python_implementation != "PyPy" # Python 3.7+ nbconvert>=6.0.0; python_version < '3.7.0' and python_version >= '3.6.0' and platform_python_implementation != "PyPy" # Python 3.6 # For nbconvert jinja2>=3.0.0 ; python_version >= '3.6' and platform_python_implementation != "PyPy" # Python 3.6+ - jupyter_client>=7.0.0 - IPython>=7.23.1 - # Requires psutil? Breaking on pypy windows? ipykernel>=6.11.0 ; python_version < '4.0' and python_version >= '3.12' and (platform_system!="Windows" or platform_python_implementation != "PyPy") # Python 3.12+ ipykernel>=6.0.0 ; python_version < '3.12' and python_version >= '3.7' and (platform_system!="Windows" or platform_python_implementation != "PyPy") # Python 3.7-3.11 - # For IPython-kernel debugpy>=1.6.0 ; python_version >= '3.10' # Python 3.10+ debugpy>=1.3.0 ; python_version < '3.10' and python_version >= '3.9' # Python 3.9 @@ -35,7 +30,6 @@ debugpy>=1.0.0 ; python_version < '3.9' and python_version >= '3.8' # Pyt # Needed for earlier versions of nbconvert ipython_genutils >= 0.2.0 ; python_version >= '3.6' and platform_python_implementation != "PyPy" # Python 3.10+ - # For IPython jedi>=0.16 @@ -43,6 +37,3 @@ attrs>=19.2.0 # For jupyter-client jupyter_core >= 4.7.0 - -# For jupyter-core -# pywin32>=1.0; platform_system=="Windows" and python_version >= '3.6' and platform_python_implementation != "PyPy" diff --git a/requirements/tests-binary.txt b/requirements/tests-binary.txt index 4200d6c2..4e8070a7 100644 --- a/requirements/tests-binary.txt +++ b/requirements/tests-binary.txt @@ -10,4 +10,4 @@ pybind11>=2.10.3 ; python_version < '4.0' and python_version >= '3.11' # Pyt pybind11>=2.7.1 ; python_version < '3.11' # Python <=3.10 cmake>=3.25.0 ; python_version < '4.0' and python_version >= '3.11' # Python 3.11+ -cmake>=3.21.2 ; python_version < '3.11' # Python <=3.10 +cmake>=3.21.2 ; python_version < '3.11' # Python <=3.10 diff --git a/requirements/tests.txt b/requirements/tests.txt index 14ebd483..c316c806 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -4,7 +4,7 @@ # major.minor version. # See xdev availpkg for helper script -pytest >= 6.2.5 ; python_version >= '3.10.0' # Python 3.10+ -pytest >= 4.6.0 ; python_version < '3.10.0' and python_version >= '3.7.0' # Python 3.7-3.9 +pytest >= 6.2.5 ; python_version >= '3.10.0' # Python 3.10+ +pytest >= 4.6.0 ; python_version < '3.10.0' and python_version >= '3.7.0' # Python 3.7-3.9 -pytest-cov >= 3.0.0 ; python_version >= '3.6.0' # Python 3.6+ +pytest-cov >= 3.0.0 ; python_version >= '3.6.0' # Python 3.6+