diff --git a/pip/cmsdist_packages.py b/pip/cmsdist_packages.py index d2bd9f0816b..568b847eec5 100644 --- a/pip/cmsdist_packages.py +++ b/pip/cmsdist_packages.py @@ -15,6 +15,8 @@ def packages(virtual_packages, *args): if not '==' in line: continue items = line.strip().split(';') (pkg, ver) = items[0].strip().split('==',1) + py_pkg = "py3-%s" % pkg + if py_pkg in virtual_packages: continue matched=True for item in items[1:]: m = match("^("+"|".join(list(extra_match.keys()))+")(==|!=)'([^']+)'$", item) @@ -22,5 +24,5 @@ def packages(virtual_packages, *args): if m.group(2)=='==' and not match(m.group(3),extra_match[m.group(1)]): matched=False if m.group(2)=='!=' and match(m.group(3),extra_match[m.group(1)]): matched=False if matched: - virtual_packages['py3-'+pkg]='%s/package.sh "py3-%s" "%s" "py3"' % (pkg_dir, pkg, ver) + virtual_packages[py_pkg]='%s/package.sh "%s" "%s" "py3"' % (pkg_dir, py_pkg, ver) return diff --git a/pip/requirements.txt b/pip/requirements.txt index 31b9485eaff..d039a58f59e 100644 --- a/pip/requirements.txt +++ b/pip/requirements.txt @@ -12,7 +12,7 @@ #flags or patching, please use package_name.file ############################################################################# absl-py==1.4.0 -aiohttp==3.8.4 +aiohttp==3.8.5 aiosqlite==0.18.0 aiosignal==1.3.1 anyio==3.6.2 @@ -60,7 +60,7 @@ cmsml==0.1.2 contourpy==1.0.7 correctionlib==2.2.2 crashtest==0.4.1 -certifi==2022.12.7 +certifi==2023.7.22 cffi==1.15.1 chardet==5.1.0 Click==8.1.3 @@ -74,8 +74,8 @@ contextvars==2.4 coverage==7.2.2 cppy==1.2.1 # Newer versions of py3-cryptography require OpenSSL 1.1.0+, see https://github.com/pyca/cryptography/issues/5906 -cryptography==41.0.1 cryptography==3.2.1 ; cmsos_name=='slc7' +cryptography==41.0.3 cx-Oracle==8.3.0 cycler==0.11.0 cython==0.29.35 @@ -267,7 +267,7 @@ pycuda==2022.2.2 pycurl==7.45.2 pydot==1.4.2 pyflakes==3.0.1 -Pygments==2.14.0 +Pygments==2.15.1 PyJWT==2.6.0 pylint==2.17.2 pymongo==4.3.3 @@ -300,7 +300,7 @@ rapidfuzz==2.15.1 regex==2023.3.23 repoze-lru==0.7 rep==0.6.6 -requests==2.28.2 +requests==2.31.0 requests-toolbelt==0.10.1 requests-oauthlib==1.3.1 requests-unixsocket==0.3.0 @@ -357,7 +357,7 @@ tomli==2.0.1 tomli-w==1.0.0 tomlkit==0.11.7 toolz==0.7.1 -tornado==6.2 +tornado==6.3.2 tqdm==4.65.0 traitlets==5.9.0 trove-classifiers==2023.3.9