diff options
Diffstat (limited to 'arch-reqs.patch')
| -rw-r--r-- | arch-reqs.patch | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/arch-reqs.patch b/arch-reqs.patch index 2dad8edcd3bd..6c14a4da0e11 100644 --- a/arch-reqs.patch +++ b/arch-reqs.patch @@ -1,6 +1,6 @@ -diff -ura conan-git-pristine/conans/requirements_server.txt conan-git-new/conans/requirements_server.txt ---- conan-git-pristine/conans/requirements_server.txt 2018-10-19 17:21:30.200162556 +0200 -+++ conan-git-new/conans/requirements_server.txt 2018-10-19 17:21:59.830168824 +0200 +diff -aur conan-1.13.0-pristine/conans/requirements_server.txt conan-1.13.0-new/conans/requirements_server.txt +--- conan-1.13.0-pristine/conans/requirements_server.txt 2019-03-08 16:28:47.496665636 +0100 ++++ conan-1.13.0-new/conans/requirements_server.txt 2019-03-08 16:33:02.447026160 +0100 @@ -1,3 +1,3 @@ # Server -bottle>=0.12.8, < 0.13 @@ -8,31 +8,35 @@ diff -ura conan-git-pristine/conans/requirements_server.txt conan-git-new/conans \ No newline at end of file +bottle>=0.12.8 +pluginbase>=0.5 -diff -ura conan-git-pristine/conans/requirements.txt conan-git-new/conans/requirements.txt ---- conan-git-pristine/conans/requirements.txt 2018-10-19 17:21:30.210162558 +0200 -+++ conan-git-new/conans/requirements.txt 2018-10-19 17:21:59.833502159 +0200 -@@ -1,15 +1,15 @@ +diff -aur conan-1.13.0-pristine/conans/requirements.txt conan-1.13.0-new/conans/requirements.txt +--- conan-1.13.0-pristine/conans/requirements.txt 2019-03-08 16:28:47.496665636 +0100 ++++ conan-1.13.0-new/conans/requirements.txt 2019-03-08 16:32:45.027001391 +0100 +@@ -1,16 +1,16 @@ -PyJWT>=1.4.0, <2.0.0 -requests>=2.7.0, <3.0.0 --colorama>=0.3.3, <0.4.0 +-colorama>=0.3.3, <0.5.0 -PyYAML>=3.11, <3.14.0 +-patch==1.16 +PyJWT>=1.4.0 +requests>=2.7.0 +colorama>=0.3.3 +PyYAML>=3.11 - patch==1.16 ++patch>=1.16 fasteners>=0.14.1 six>=1.10.0 --node-semver==0.2.0 +-node-semver==0.6.1 -distro>=1.0.2, <1.2.0 -+node-semver>=0.2.0 ++node-semver>=0.6.1 +distro>=1.0.2 - pylint>=1.9.3 - future==0.16.0 + pylint>=1.9.3,!=2.3.0 +-future==0.16.0 -pygments>=2.0, <3.0 ++future>=0.16.0 +pygments>=2.0 astroid>=1.6.5 -deprecation>=2.0, <2.1 --tqdm-conan==4.27.0 +-tqdm>=4.28.1, <5 +-Jinja2>=2.3, <3 +deprecation>=2.0 -+tqdm>=4.27.0 ++tqdm>=4.28.1 ++Jinja2>=2.3 |