diff options
Diffstat (limited to 'arch-reqs.patch')
| -rw-r--r-- | arch-reqs.patch | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/arch-reqs.patch b/arch-reqs.patch index bfbc12eca4ea..170d76f2829a 100644 --- a/arch-reqs.patch +++ b/arch-reqs.patch @@ -1,46 +1,42 @@ -diff -aur conan-1.28.0-pristine/conans/requirements_server.txt conan-1.28.0-new/conans/requirements_server.txt ---- conan-1.28.0-pristine/conans/requirements_server.txt 2020-07-30 11:30:59.000000000 +0200 -+++ conan-1.28.0-new/conans/requirements_server.txt 2020-08-03 20:20:41.573333330 +0200 +diff -aur conan-1.46.0-pristine/conans/requirements_server.txt conan-1.46.0-new/conans/requirements_server.txt +--- conan-1.46.0-pristine/conans/requirements_server.txt 2022-03-09 11:43:22.296626782 +0100 ++++ conan-1.46.0-new/conans/requirements_server.txt 2022-03-09 11:46:34.929963816 +0100 @@ -1,3 +1,3 @@ # Server -bottle>=0.12.8, < 0.13 +bottle>=0.12.8 pluginbase>=0.5 -diff -aur conan-1.28.0-pristine/conans/requirements.txt conan-1.28.0-new/conans/requirements.txt ---- conan-1.28.0-pristine/conans/requirements.txt 2020-07-30 11:30:59.000000000 +0200 -+++ conan-1.28.0-new/conans/requirements.txt 2020-08-03 20:20:09.506666663 +0200 -@@ -1,19 +1,19 @@ +diff -aur conan-1.46.0-pristine/conans/requirements.txt conan-1.46.0-new/conans/requirements.txt +--- conan-1.46.0-pristine/conans/requirements.txt 2022-03-09 11:43:22.296626782 +0100 ++++ conan-1.46.0-new/conans/requirements.txt 2022-03-09 11:46:12.626630054 +0100 +@@ -1,17 +1,14 @@ -PyJWT>=1.4.0, <2.0.0 --requests>=2.8.1, <3.0.0 --urllib3!=1.25.4,!=1.25.5 +-requests>=2.25, <3.0.0 +-urllib3>=1.26.6, <1.27 -colorama>=0.3.3, <0.5.0 -PyYAML>=3.11, <6.0 -patch-ng>=1.17.4, <1.18 +PyJWT>=1.4.0 -+requests>=2.8.1 -+urllib3>=1.25.6 ++requests>=2.25 ++urllib3>=1.26.6 +colorama>=0.3.3 +PyYAML>=3.11 +patch-ng>=1.17.4 fasteners>=0.14.1 --six>=1.10.0,<=1.14.0 +-six>=1.10.0,<=1.16.0 -node-semver==0.6.1 --distro>=1.0.2, <1.2.0 --future>=0.16.0, <0.19.0 +-distro>=1.0.2, <=1.6.0; sys_platform == 'linux' or sys_platform == 'linux2' -pygments>=2.0, <3.0 --deprecation>=2.0, <2.1 -tqdm>=4.28.1, <5 --Jinja2>=2.3, <3 +-Jinja2>=2.9, <3.0.0;python_version<='2.7' +-MarkupSafe<=2.0.1;python_version<='2.7' +-Jinja2>=3.0, <4.0.0;python_version>='3' -python-dateutil>=2.7.0, <3 +-configparser>=3.5;python_version<='2.7' +six>=1.10.0 +node-semver>=0.6.1 +distro>=1.0.2 -+future>=0.16.0 +pygments>=2.0 -+deprecation>=2.0 +tqdm>=4.28.1 -+Jinja2>=2.3 ++Jinja2>=3.0 +python-dateutil>=2.7.0 - idna==2.6 ; sys_platform == "darwin" # Solving conflict, somehow is installing 2.7 when requests require 2.6 - cryptography>=1.3.4, <2.4.0 ; sys_platform == "darwin" - pyOpenSSL>=16.0.0, <19.0.0 ; sys_platform == "darwin" |