summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomislav Ivek2019-11-11 14:36:36 +0100
committerTomislav Ivek2019-11-11 14:36:36 +0100
commit8b4de8f422c60a268de9d73da17962aedf3cc57d (patch)
tree5465ba1e429982c2cd03a4dbd929952eaeb40dc1
parent5b14eda832f2559abefddf7d34faf8bd86579e6b (diff)
downloadaur-8b4de8f422c60a268de9d73da17962aedf3cc57d.tar.gz
changes after 1.20
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD9
-rw-r--r--arch-reqs.patch35
3 files changed, 30 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 855d94b7e56..06843c0d869 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = conan-git
pkgdesc = A distributed, open source, C/C++ package manager.
- pkgver = 1.19.0.r3.g5acac3b2
+ pkgver = 1.20.2.r17.g14f84411
pkgrel = 1
url = https://conan.io
arch = any
@@ -8,9 +8,10 @@ pkgbase = conan-git
makedepends = python-setuptools
depends = python-pyjwt>=1.4.0
depends = python-requests>=2.8.1
+ depends = python-urllib3>=1.25.6
depends = python-colorama>=0.3.3
depends = python-yaml>=3.11
- depends = python-patch>=1.16
+ depends = python-patch-ng>=1.17.1
depends = python-fasteners>=0.14.1
depends = python-six>=1.10.0
depends = python-node-semver>=0.6.1
@@ -20,7 +21,7 @@ pkgbase = conan-git
depends = python-pylint>=2.3.1
depends = python-future>=0.16.0
depends = python-pygments>=2.0
- depends = python-astroid>=1.6.5
+ depends = python-astroid>=2.2.0
depends = python-deprecation>=2.0
depends = python-tqdm>=4.28.1
depends = python-jinja>=2.3
@@ -30,7 +31,7 @@ pkgbase = conan-git
source = conan-git::git+https://github.com/conan-io/conan.git
source = arch-reqs.patch
md5sums = SKIP
- md5sums = 96d55422ed2b25562ea659098046e407
+ md5sums = c3d593bd4806156696eb871d2d536856
pkgname = conan-git
diff --git a/PKGBUILD b/PKGBUILD
index c9b6d5b1021..a191683ec4b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Tomislav Ivek <tomislav.ivek@gmail.com>
pkgname=conan-git
-pkgver=1.19.0.r3.g5acac3b2
+pkgver=1.20.2.r17.g14f84411
pkgrel=1
pkgdesc="A distributed, open source, C/C++ package manager."
arch=('any')
@@ -10,9 +10,10 @@ license=('MIT')
makedepends=('python-setuptools')
depends=('python-pyjwt>=1.4.0'
'python-requests>=2.8.1'
+ 'python-urllib3>=1.25.6'
'python-colorama>=0.3.3'
'python-yaml>=3.11'
- 'python-patch>=1.16'
+ 'python-patch-ng>=1.17.1'
'python-fasteners>=0.14.1'
'python-six>=1.10.0'
'python-node-semver>=0.6.1'
@@ -22,7 +23,7 @@ depends=('python-pyjwt>=1.4.0'
'python-pylint>=2.3.1'
'python-future>=0.16.0'
'python-pygments>=2.0'
- 'python-astroid>=1.6.5'
+ 'python-astroid>=2.2.0'
'python-deprecation>=2.0'
'python-tqdm>=4.28.1'
'python-jinja>=2.3'
@@ -31,7 +32,7 @@ provides=('conan')
conflicts=('conan')
source=("conan-git::git+https://github.com/conan-io/conan.git" "arch-reqs.patch")
md5sums=('SKIP'
- '96d55422ed2b25562ea659098046e407')
+ 'c3d593bd4806156696eb871d2d536856')
pkgver() {
diff --git a/arch-reqs.patch b/arch-reqs.patch
index e2c22750ae0..6957ee0f8b5 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