Merge pull request #8077 from cms-sw/python-pack-update

Python 3.9.14 plus bulk update of many python package

Pygments-cpp-extension-fix.patch → pip/Pygments-cpp-extension-fix.patch

@@ -1,13 +1,13 @@
 diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py
-index acb71ad..e8169a3 100644
+index 577d664..d7e6474 100644
 --- a/pygments/lexers/_mapping.py
 +++ b/pygments/lexers/_mapping.py
-@@ -101,7 +101,7 @@ LEXERS = {
-     'CommonLispLexer': ('pygments.lexers.lisp', 'Common Lisp', ('common-lisp', 'cl', 'lisp'), ('*.cl', '*.lisp'), ('text/x-common-lisp',)),
+@@ -97,7 +97,7 @@ LEXERS = {
      'ComponentPascalLexer': ('pygments.lexers.oberon', 'Component Pascal', ('componentpascal', 'cp'), ('*.cp', '*.cps'), ('text/x-component-pascal',)),
      'CoqLexer': ('pygments.lexers.theorem', 'Coq', ('coq',), ('*.v',), ('text/x-coq',)),
--    'CppLexer': ('pygments.lexers.c_cpp', 'C++', ('cpp', 'c++'), ('*.cpp', '*.hpp', '*.c++', '*.h++', '*.cc', '*.hh', '*.cxx', '*.hxx', '*.C', '*.H', '*.cp', '*.CPP'), ('text/x-c++hdr', 'text/x-c++src')),
-+    'CppLexer': ('pygments.lexers.c_cpp', 'C++', ('cpp', 'c++'), ('*.icc', '*.cpp', '*.hpp', '*.c++', '*.h++', '*.cc', '*.hh', '*.cxx', '*.hxx', '*.C', '*.H', '*.cp', '*.CPP'), ('text/x-c++hdr', 'text/x-c++src')),
+     'CplintLexer': ('pygments.lexers.cplint', 'cplint', ('cplint',), ('*.ecl', '*.prolog', '*.pro', '*.pl', '*.P', '*.lpad', '*.cpl'), ('text/x-cplint',)),
+-    'CppLexer': ('pygments.lexers.c_cpp', 'C++', ('cpp', 'c++'), ('*.cpp', '*.hpp', '*.c++', '*.h++', '*.cc', '*.hh', '*.cxx', '*.hxx', '*.C', '*.H', '*.cp', '*.CPP', '*.tpp'), ('text/x-c++hdr', 'text/x-c++src')),
++    'CppLexer': ('pygments.lexers.c_cpp', 'C++', ('cpp', 'c++'), ('*.icc', '*.cpp', '*.hpp', '*.c++', '*.h++', '*.cc', '*.hh', '*.cxx', '*.hxx', '*.C', '*.H', '*.cp', '*.CPP', '*.tpp'), ('text/x-c++hdr', 'text/x-c++src')),
      'CppObjdumpLexer': ('pygments.lexers.asm', 'cpp-objdump', ('cpp-objdump', 'c++-objdumb', 'cxx-objdump'), ('*.cpp-objdump', '*.c++-objdump', '*.cxx-objdump'), ('text/x-cpp-objdump',)),
      'CrmshLexer': ('pygments.lexers.dsls', 'Crmsh', ('crmsh', 'pcmk'), ('*.crmsh', '*.pcmk'), ()),
      'CrocLexer': ('pygments.lexers.d', 'Croc', ('croc',), ('*.croc',), ('text/x-crocsrc',)),

pip/Pygments.file

@@ -1,2 +1,2 @@
-Patch0: Pygments-cpp-extension-fix
+Patch0: pip/Pygments-cpp-extension-fix
 %define PipPostBuildPy mv %{i}/bin/pygmentize %{i}/bin/pygmentize3

pip/argon2-cffi.file

@@ -1 +1 @@
-Requires: py3-cffi py3-six
+Requires: py3-cffi py3-six py3-flit-core py3-argon2-cffi-bindings

pip/awkward.file

@@ -1,2 +1,2 @@
 Requires: py3-numpy py3-pytest-runner py3-pybind11 py3-PyYAML cmake
-%define source0 git+https://github.com/scikit-hep/awkward-1.0?obj=main/%{realversion}&export=%{n}-%{realversion}&submodules=1&output=/source.tar.gz
+%define source0 git+https://github.com/scikit-hep/awkward?obj=main/v%{realversion}&export=%{n}-%{realversion}&submodules=1&output=/source.tar.gz

pip/dulwich.file

@@ -0,0 +1 @@
+Requires: py3-urllib3

pip/flit.file

@@ -1 +1 @@
-Requires: py3-docutils py3-flit-core py3-pytoml py3-requests
+Requires: py3-docutils py3-flit-core py3-pytoml py3-requests py3-tomli py3-tomli-w

pip/hatchling.file

@@ -0,0 +1 @@
+Requires: py3-pathspec py3-tomli py3-pluggy py3-editables

pip/hepdata-lib.file

@@ -1 +1,2 @@
-Requires: root py3-pytest py3-pytest-cov py3-PyYAML py3-future py3-pylint
+Requires: root py3-pytest py3-pytest-cov py3-PyYAML py3-future py3-pylint py3-hepdata-validator
+%define source0 https://github.com/HEPData/hepdata_lib/archive/refs/tags/v%{realversion}.tar.gz

pip/hepdata-validator.file

@@ -0,0 +1 @@
+Requires: py3-jsonschema py3-PyYAML py3-Click py3-requests 

pip/ipykernel.file

@@ -1,2 +1,2 @@
-Requires: py3-ipython py3-jupyter-client py3-debugpy
+Requires: py3-ipython py3-jupyter-client py3-debugpy py3-psutil
 Requires: py3-ipython py3-jupyter-client py3-jedi py3-backcall

pip/ipython.file

@@ -1,2 +1,2 @@
-Requires: py3-jedi py3-prompt_toolkit py3-backcall py3-matplotlib-inline
+Requires: py3-jedi py3-prompt_toolkit py3-backcall py3-matplotlib-inline py3-stack-data
 Requires: py3-traitlets py3-pickleshare py3-Pygments py3-prompt_toolkit py3-pexpect py3-simplegeneric

pip/jsonschema.file

@@ -1,3 +1,2 @@
 Requires: py3-repoze-lru py3-argparse py3-pyrsistent
 Requires: py3-attrs py3-six py3-importlib-metadata
-

pip/jupyter-packaging.file

@@ -1 +1 @@
-Requires: py3-packaging py3-deprecation py3-tomlkit
+Requires: py3-packaging py3-deprecation py3-tomlkit py3-hatchling

pip/jupyterlab-pygments.file

@@ -1 +1 @@
-Requires: py3-Pygments
+Requires: py3-Pygments py3-jupyter-packaging

pip/keyring.file

@@ -1 +1 @@
-Requires: py3-setuptools-scm py3-importlib-metadata py3-secretstorage py3-jeepney
+Requires: py3-setuptools-scm py3-importlib-metadata py3-secretstorage py3-jeepney py3-jaraco-classes

pip/kiwisolver.file

@@ -0,0 +1 @@
+Requires: py3-cppy

pip/more-itertools.file

@@ -1 +1 @@
-Requires: py3-six
+Requires: py3-six py3-flit-core

pip/nbformat.file

@@ -1 +1 @@
-Requires: py3-traitlets py3-jsonschema py3-jupyter-core
+Requires: py3-traitlets py3-jsonschema py3-jupyter-core py3-fastjsonschema

pip/onnxmltools.file

@@ -1,2 +1,2 @@
 Requires: py3-numpy py3-onnx py3-protobuf py3-onnxconverter-common py3-skl2onnx py3-keras2onnx
-#define source0 https://github.com/onnx/onnxmltools/archive/v%{realversion}.tar.gz
+%define source0 https://github.com/onnx/onnxmltools/archive/%{realversion}.tar.gz

pip/parsimonious.file

@@ -1 +1 @@
-Requires: py3-six
+Requires: py3-six py3-regex

pip/poetry-cyclic-deps.patch

@@ -0,0 +1,25 @@
+diff --git a/setup.py b/setup.py
+index d076e11..3a2429d 100644
+--- a/setup.py
++++ b/setup.py
+@@ -11,7 +11,7 @@ package_data = \
+ {'': ['*']}
+
+ install_requires = \
+-['poetry-core>=1.1.0b3,<2.0.0', 'poetry>=1.2.0b3,<2.0.0']
++['poetry-core>=1.1.0b3,<2.0.0']
+
+ entry_points = \
+ {'poetry.application.plugin': ['export = '
+diff --git a/pyproject.toml b/pyproject.toml
+index 04f6d31..d55294c 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -16,7 +16,6 @@ include = [
+
+ [tool.poetry.dependencies]
+ python = "^3.7"
+-poetry = "^1.2.0b3"
+ poetry-core = "^1.1.0b3"
+
+ [tool.poetry.dev-dependencies]

pip/poetry-plugin-export.file

@@ -0,0 +1,2 @@
+Requires: py3-poetry-core
+Patch0: pip/poetry-cyclic-deps

pip/poetry.file

@@ -1,2 +1,3 @@
 Requires: py3-cachecontrol py3-cachy py3-cleo py3-html5lib py3-keyring py3-pexpect py3-pkginfo py3-virtualenv
 Requires: py3-requests-toolbelt py3-shellingham py3-tomlkit
+Requires: py3-dulwich py3-jsonschema py3-poetry-plugin-export

pip/pyparsing.file

@@ -0,0 +1 @@
+Requires: py3-flit-core

pip/pytools.file

@@ -1 +1 @@
-Requires: py3-decorator py3-appdirs py3-six py3-numpy
+Requires: py3-decorator py3-appdirs py3-six py3-numpy py3-platformdirs py3-typing-extensions

pip/pyzmq.file

@@ -1,4 +1,4 @@
-Requires: libzmq
+Requires: libzmq py3-packaging
 
 %define patchsrc \
 cat > setup.cfg <<EOF \