summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomislav Ivek2019-03-23 15:29:53 +0100
committerTomislav Ivek2019-03-23 15:29:53 +0100
commitfc495cf12915fc2a2896bcaa81bcf5c0fcbe29a0 (patch)
treeb609a50a38b57e07242aacdc5cf877f41b986705
parentbc67508481dff11c30982c36084000d0421aa709 (diff)
downloadaur-fc495cf12915fc2a2896bcaa81bcf5c0fcbe29a0.tar.gz
update to current master
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
-rw-r--r--arch-reqs.patch34
3 files changed, 28 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c1fd9a2d02a..bbcb2db855e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = conan-git
pkgdesc = A distributed, open source, C/C++ package manager.
- pkgver = 1.11.1.r6.ge03c60c6
+ pkgver = 1.13.2.r23.g7c829c84
pkgrel = 1
url = https://conan.io
arch = any
@@ -18,17 +18,19 @@ pkgbase = conan-git
depends = python-distro>=1.0.2
depends = python-pluginbase>=0.5
depends = python-pylint>=1.9.3
+ depends = python-pylint<2.3.0
depends = python-future>=0.16.0
depends = python-pygments>=2.0
depends = python-astroid>=1.6.5
depends = python-deprecation>=2.0
depends = python-tqdm>=4.28.1
+ depends = python-jinja>=2.3
provides = conan
conflicts = conan
source = conan-git::git+https://github.com/conan-io/conan.git
source = arch-reqs.patch
md5sums = SKIP
- md5sums = a916d69a8cfbd40151065bc29a0d0d03
+ md5sums = 31ca8bdab90284da36e0aec704ce2955
pkgname = conan-git
diff --git a/PKGBUILD b/PKGBUILD
index d6251673820..2fbdf314a4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Tomislav Ivek <tomislav.ivek@gmail.com>
pkgname=conan-git
-pkgver=1.11.1.r6.ge03c60c6
+pkgver=1.13.2.r23.g7c829c84
pkgrel=1
pkgdesc="A distributed, open source, C/C++ package manager."
arch=('any')
@@ -20,16 +20,18 @@ depends=('python-pyjwt>=1.4.0'
'python-distro>=1.0.2'
'python-pluginbase>=0.5'
'python-pylint>=1.9.3'
+ 'python-pylint<2.3.0'
'python-future>=0.16.0'
'python-pygments>=2.0'
'python-astroid>=1.6.5'
'python-deprecation>=2.0'
- 'python-tqdm>=4.28.1')
+ 'python-tqdm>=4.28.1'
+ 'python-jinja>=2.3')
provides=('conan')
conflicts=('conan')
source=("conan-git::git+https://github.com/conan-io/conan.git" "arch-reqs.patch")
md5sums=('SKIP'
- 'a916d69a8cfbd40151065bc29a0d0d03')
+ '31ca8bdab90284da36e0aec704ce2955')
pkgver() {
diff --git a/arch-reqs.patch b/arch-reqs.patch
index 2dad8edcd3b..6c14a4da0e1 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