diff options
Diffstat (limited to 'arch-reqs.patch')
| -rw-r--r-- | arch-reqs.patch | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/arch-reqs.patch b/arch-reqs.patch index e2c22750ae06..6957ee0f8b57 100644 --- a/arch-reqs.patch +++ b/arch-reqs.patch @@ -1,6 +1,6 @@ diff -aur conan-git-pristine/conans/requirements_server.txt conan-git-new/conans/requirements_server.txt ---- conan-git-pristine/conans/requirements_server.txt 2019-10-01 15:04:40.002101092 +0200 -+++ conan-git-new/conans/requirements_server.txt 2019-10-01 15:07:22.342561193 +0200 +--- conan-git-pristine/conans/requirements_server.txt 2019-11-11 11:28:27.289049177 +0100 ++++ conan-git-new/conans/requirements_server.txt 2019-11-11 11:36:42.769971622 +0100 @@ -1,3 +1,3 @@ # Server -bottle>=0.12.8, < 0.13 @@ -9,38 +9,43 @@ diff -aur conan-git-pristine/conans/requirements_server.txt conan-git-new/conans +bottle>=0.12.8 +pluginbase>=0.5 diff -aur conan-git-pristine/conans/requirements.txt conan-git-new/conans/requirements.txt ---- conan-git-pristine/conans/requirements.txt 2019-10-01 15:04:39.982101036 +0200 -+++ conan-git-new/conans/requirements.txt 2019-10-01 15:07:16.432544450 +0200 -@@ -1,19 +1,17 @@ +--- conan-git-pristine/conans/requirements.txt 2019-11-11 11:28:27.289049177 +0100 ++++ conan-git-new/conans/requirements.txt 2019-11-11 11:36:18.729928423 +0100 +@@ -1,21 +1,18 @@ -PyJWT>=1.4.0, <2.0.0 -requests>=2.8.1, <3.0.0 -urllib3!=1.25.4,!=1.25.5 -colorama>=0.3.3, <0.5.0 -PyYAML>=3.11, <6.0 --patch==1.16 +-patch-ng==1.17.2 +PyJWT>=1.4.0 +requests>=2.8.1 ++urllib3>=1.25.6 +colorama>=0.3.3 +PyYAML>=3.11 -+patch>=1.16 ++patch-ng>=1.17.1 fasteners>=0.14.1 - six>=1.10.0 +-six>=1.10.0,<1.13.0 -node-semver==0.6.1 -distro>=1.0.2, <1.2.0 --pylint>=1.9.3,!=2.3.0 +-pylint>=1.9.3, <2.0; python_version < '3' +-pylint>=2.0,!=2.3.0; python_version >= '3' -future>=0.16.0, <0.19.0 -pygments>=2.0, <3.0 -+node-semver>=0.6.1 -+distro>=1.0.2 -+pylint>=2.3.1 -+future>=0.16.0 -+pygments>=2.0 - astroid>=1.6.5 +-astroid>=1.6.5, <2.0; python_version < '3' +-astroid>=2.2.0; python_version >= '3' -deprecation>=2.0, <2.1 -tqdm>=4.28.1, <5 -Jinja2>=2.3, <3 -python-dateutil>=2.7.0, <3 -typed-ast<1.4; python_version == '3.4' and platform_system=='Windows' ++six>=1.10.0 ++node-semver>=0.6.1 ++distro>=1.0.2 ++pylint>=2.3.1 ++future>=0.16.0 ++pygments>=2.0 ++astroid>=2.2.0 +deprecation>=2.0 +tqdm>=4.28.1 +Jinja2>=2.3 |