diff --git a/Pygments-cpp-extension-fix.patch b/pip/Pygments-cpp-extension-fix.patch similarity index 73% rename from Pygments-cpp-extension-fix.patch rename to pip/Pygments-cpp-extension-fix.patch index 0d074dabbab..9a0a5398119 100644 --- a/Pygments-cpp-extension-fix.patch +++ b/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',)), diff --git a/pip/Pygments.file b/pip/Pygments.file index 9e73d5652bf..e09af15cd46 100644 --- a/pip/Pygments.file +++ b/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 diff --git a/pip/argon2-cffi.file b/pip/argon2-cffi.file index 8614c21b21f..647eb27b776 100644 --- a/pip/argon2-cffi.file +++ b/pip/argon2-cffi.file @@ -1 +1 @@ -Requires: py3-cffi py3-six +Requires: py3-cffi py3-six py3-flit-core py3-argon2-cffi-bindings diff --git a/pip/awkward.file b/pip/awkward.file index cb0a5541414..3949a52d0ae 100644 --- a/pip/awkward.file +++ b/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 diff --git a/pip/dulwich.file b/pip/dulwich.file new file mode 100644 index 00000000000..71e8cdbcb24 --- /dev/null +++ b/pip/dulwich.file @@ -0,0 +1 @@ +Requires: py3-urllib3 diff --git a/pip/flit.file b/pip/flit.file index e8e363c9c44..a193a446a7b 100644 --- a/pip/flit.file +++ b/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 diff --git a/pip/hatchling.file b/pip/hatchling.file new file mode 100644 index 00000000000..fbf77b242a7 --- /dev/null +++ b/pip/hatchling.file @@ -0,0 +1 @@ +Requires: py3-pathspec py3-tomli py3-pluggy py3-editables diff --git a/pip/hepdata-lib.file b/pip/hepdata-lib.file index a6ffd99a513..18e3a70aa91 100644 --- a/pip/hepdata-lib.file +++ b/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 diff --git a/pip/hepdata-validator.file b/pip/hepdata-validator.file new file mode 100644 index 00000000000..ded841ff22a --- /dev/null +++ b/pip/hepdata-validator.file @@ -0,0 +1 @@ +Requires: py3-jsonschema py3-PyYAML py3-Click py3-requests diff --git a/pip/ipykernel.file b/pip/ipykernel.file index 795549bbe81..dbba94a9901 100644 --- a/pip/ipykernel.file +++ b/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 diff --git a/pip/ipython.file b/pip/ipython.file index fa1d2d4c6e6..d52f8cfe6e3 100644 --- a/pip/ipython.file +++ b/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 diff --git a/pip/jsonschema.file b/pip/jsonschema.file index bf2ba975c1e..14cd3949f93 100644 --- a/pip/jsonschema.file +++ b/pip/jsonschema.file @@ -1,3 +1,2 @@ Requires: py3-repoze-lru py3-argparse py3-pyrsistent Requires: py3-attrs py3-six py3-importlib-metadata - diff --git a/pip/jupyter-packaging.file b/pip/jupyter-packaging.file index 9ee31636a72..734f4a5e241 100644 --- a/pip/jupyter-packaging.file +++ b/pip/jupyter-packaging.file @@ -1 +1 @@ -Requires: py3-packaging py3-deprecation py3-tomlkit +Requires: py3-packaging py3-deprecation py3-tomlkit py3-hatchling diff --git a/pip/jupyterlab-pygments.file b/pip/jupyterlab-pygments.file index ff0329842a0..955b3ceef98 100644 --- a/pip/jupyterlab-pygments.file +++ b/pip/jupyterlab-pygments.file @@ -1 +1 @@ -Requires: py3-Pygments +Requires: py3-Pygments py3-jupyter-packaging diff --git a/pip/keyring.file b/pip/keyring.file index a2818c79af6..686b27abec4 100644 --- a/pip/keyring.file +++ b/pip/keyring.file @@ -1 +1 @@ -Requires: py3-setuptools-scm py3-importlib-metadata py3-secretstorage py3-jeepney \ No newline at end of file +Requires: py3-setuptools-scm py3-importlib-metadata py3-secretstorage py3-jeepney py3-jaraco-classes diff --git a/pip/kiwisolver.file b/pip/kiwisolver.file new file mode 100644 index 00000000000..cc8c70afb39 --- /dev/null +++ b/pip/kiwisolver.file @@ -0,0 +1 @@ +Requires: py3-cppy diff --git a/pip/more-itertools.file b/pip/more-itertools.file index 7c962a18c6b..86c310f1314 100644 --- a/pip/more-itertools.file +++ b/pip/more-itertools.file @@ -1 +1 @@ -Requires: py3-six +Requires: py3-six py3-flit-core diff --git a/pip/nbformat.file b/pip/nbformat.file index 407aad9330a..12f10a8100c 100644 --- a/pip/nbformat.file +++ b/pip/nbformat.file @@ -1 +1 @@ -Requires: py3-traitlets py3-jsonschema py3-jupyter-core +Requires: py3-traitlets py3-jsonschema py3-jupyter-core py3-fastjsonschema diff --git a/pip/onnxmltools.file b/pip/onnxmltools.file index da100e2ba81..509ad0d2ff8 100644 --- a/pip/onnxmltools.file +++ b/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 diff --git a/pip/parsimonious.file b/pip/parsimonious.file index 7c962a18c6b..3353fdc599d 100644 --- a/pip/parsimonious.file +++ b/pip/parsimonious.file @@ -1 +1 @@ -Requires: py3-six +Requires: py3-six py3-regex diff --git a/pip/poetry-cyclic-deps.patch b/pip/poetry-cyclic-deps.patch new file mode 100644 index 00000000000..025a83e0f3f --- /dev/null +++ b/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] diff --git a/pip/poetry-plugin-export.file b/pip/poetry-plugin-export.file new file mode 100644 index 00000000000..e10a78b072d --- /dev/null +++ b/pip/poetry-plugin-export.file @@ -0,0 +1,2 @@ +Requires: py3-poetry-core +Patch0: pip/poetry-cyclic-deps diff --git a/pip/poetry.file b/pip/poetry.file index 6a3d1a9f589..1e5edd277b8 100644 --- a/pip/poetry.file +++ b/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 diff --git a/pip/pyparsing.file b/pip/pyparsing.file new file mode 100644 index 00000000000..eb3d7b377e3 --- /dev/null +++ b/pip/pyparsing.file @@ -0,0 +1 @@ +Requires: py3-flit-core diff --git a/pip/pytools.file b/pip/pytools.file index bb2e60c1469..b2ad5d8d701 100644 --- a/pip/pytools.file +++ b/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 diff --git a/pip/pyzmq.file b/pip/pyzmq.file index e8aa7622170..bc5d7f8927d 100644 --- a/pip/pyzmq.file +++ b/pip/pyzmq.file @@ -1,4 +1,4 @@ -Requires: libzmq +Requires: libzmq py3-packaging %define patchsrc \ cat > setup.cfg < - #define PREFETCH_READ_T0(addr) _mm_prefetch(reinterpret_cast(addr), _MM_HINT_T0) @@ -15,6 +15,6 @@ index 8e13403..9a68e88 100644 - #define PREFETCH_READ_T0(addr) do {} while (0) -#endif // defined(XGBOOST_MM_PREFETCH_PRESENT) +#define PREFETCH_READ_T0(addr) do {} while (0) - + namespace xgboost { namespace common { diff --git a/xgboost.spec b/xgboost.spec index 46c36d6c0b0..666000767ff 100644 --- a/xgboost.spec +++ b/xgboost.spec @@ -1,4 +1,4 @@ -### RPM external xgboost 1.3.3 +### RPM external xgboost 1.6.2 BuildRequires: cmake Source: git+https://github.com/dmlc/xgboost.git?obj=master/v%{realversion}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz