[arch-commits] Commit in python-cryptography/repos (6 files)

Felix Yan fyan at archlinux.org
Fri Dec 11 04:03:52 UTC 2015


    Date: Friday, December 11, 2015 @ 05:03:52
  Author: fyan
Revision: 255783

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  python-cryptography/repos/extra-i686/PKGBUILD
    (from rev 255782, python-cryptography/trunk/PKGBUILD)
  python-cryptography/repos/extra-i686/pin-pytest.patch
    (from rev 255782, python-cryptography/trunk/pin-pytest.patch)
  python-cryptography/repos/extra-x86_64/PKGBUILD
    (from rev 255782, python-cryptography/trunk/PKGBUILD)
  python-cryptography/repos/extra-x86_64/pin-pytest.patch
    (from rev 255782, python-cryptography/trunk/pin-pytest.patch)
Deleted:
  python-cryptography/repos/extra-i686/PKGBUILD
  python-cryptography/repos/extra-x86_64/PKGBUILD

-------------------------------+
 /PKGBUILD                     |  116 ++++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD           |   54 ------------------
 extra-i686/pin-pytest.patch   |   13 ++++
 extra-x86_64/PKGBUILD         |   54 ------------------
 extra-x86_64/pin-pytest.patch |   13 ++++
 5 files changed, 142 insertions(+), 108 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-12-11 03:56:10 UTC (rev 255782)
+++ extra-i686/PKGBUILD	2015-12-11 04:03:52 UTC (rev 255783)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgbase=python-cryptography
-pkgname=('python-cryptography' 'python2-cryptography')
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="A package designed to expose cryptographic recipes and primitives to Python developers"
-arch=('i686' 'x86_64')
-license=('Apache')
-url="http://pypi.python.org/pypi/cryptography"
-makedepends=('python-setuptools' 'python2-setuptools' 'python-six' 'python2-six' 'python-cffi' 'python2-cffi' 'python2-enum34'
-             'python-pyasn1' 'python2-pyasn1' 'python-idna' 'python2-idna' 'python2-ipaddress')
-checkdepends=('python-pytest-runner' 'python2-pytest-runner' "python-cryptography-vectors=$pkgver" "python2-cryptography-vectors=$pkgver"
-              'python-iso8601' 'python2-iso8601' 'python-pretend' 'python2-pretend' 'python-pyasn1-modules' 'python2-pyasn1-modules'
-              'python-hypothesis' 'python2-hypothesis')
-source=("http://pypi.python.org/packages/source/c/cryptography/cryptography-${pkgver}.tar.gz")
-md5sums=('6ec05b916c52d8668cd3a3f6f1cea084')
-
-prepare() {
-   cp -a cryptography-${pkgver}{,-python2}
-}
-
-build() {
-   # Build python 3 module
-   cd cryptography-${pkgver}
-   python3 setup.py build
- 
-   # Build python 2 module
-   cd ../cryptography-${pkgver}-python2
-   python2 setup.py build
-}
-
-check() {
-   cd "${srcdir}"/cryptography-${pkgver}
-   PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.5:$PYTHONPATH" python3 setup.py ptr
-
-   cd "${srcdir}"/cryptography-${pkgver}-python2
-   PYTHONPATH="$PWD/build/lib.linux-$CARCH-2.7:$PYTHONPATH" python2 setup.py ptr
-}
- 
-package_python-cryptography() {
-   depends=('python-pyasn1' 'python-six' 'python-cffi' 'python-idna')
- 
-   cd cryptography-${pkgver}
-   python3 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-}
- 
-package_python2-cryptography() {
-   depends=('python2-pyasn1' 'python2-six' 'python2-cffi' 'python2-enum34' 'python2-idna' 'python2-ipaddress')
- 
-   cd cryptography-${pkgver}-python2
-   python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-}

Copied: python-cryptography/repos/extra-i686/PKGBUILD (from rev 255782, python-cryptography/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-12-11 04:03:52 UTC (rev 255783)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgbase=python-cryptography
+pkgname=('python-cryptography' 'python2-cryptography')
+pkgver=1.1.2
+pkgrel=1
+pkgdesc="A package designed to expose cryptographic recipes and primitives to Python developers"
+arch=('i686' 'x86_64')
+license=('Apache')
+url="http://pypi.python.org/pypi/cryptography"
+makedepends=('python-setuptools' 'python2-setuptools' 'python-six' 'python2-six' 'python-cffi' 'python2-cffi' 'python2-enum34'
+             'python-pyasn1' 'python2-pyasn1' 'python-idna' 'python2-idna' 'python2-ipaddress')
+checkdepends=('python-pytest-runner' 'python2-pytest-runner' "python-cryptography-vectors=$pkgver" "python2-cryptography-vectors=$pkgver"
+              'python-iso8601' 'python2-iso8601' 'python-pretend' 'python2-pretend' 'python-pyasn1-modules' 'python2-pyasn1-modules'
+              'python-hypothesis' 'python2-hypothesis')
+source=("http://pypi.python.org/packages/source/c/cryptography/cryptography-${pkgver}.tar.gz"
+        pin-pytest.patch)
+md5sums=('15eeba9e31f852bac21155baa3dfbc61'
+         '54f471441df9d3e825bf99946bf0ce1c')
+
+prepare() {
+  # We have patched pytest
+  (cd cryptography-${pkgver}; patch -Rp1 -i ../pin-pytest.patch)
+  cp -a cryptography-${pkgver}{,-python2}
+}
+
+build() {
+   # Build python 3 module
+   cd cryptography-${pkgver}
+   python3 setup.py build
+ 
+   # Build python 2 module
+   cd ../cryptography-${pkgver}-python2
+   python2 setup.py build
+}
+
+check() {
+   cd "${srcdir}"/cryptography-${pkgver}
+   PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.5:$PYTHONPATH" python3 setup.py ptr
+
+   cd "${srcdir}"/cryptography-${pkgver}-python2
+   PYTHONPATH="$PWD/build/lib.linux-$CARCH-2.7:$PYTHONPATH" python2 setup.py ptr
+}
+ 
+package_python-cryptography() {
+   depends=('python-pyasn1' 'python-six' 'python-cffi' 'python-idna')
+ 
+   cd cryptography-${pkgver}
+   python3 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+}
+ 
+package_python2-cryptography() {
+   depends=('python2-pyasn1' 'python2-six' 'python2-cffi' 'python2-enum34' 'python2-idna' 'python2-ipaddress')
+ 
+   cd cryptography-${pkgver}-python2
+   python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+}

Copied: python-cryptography/repos/extra-i686/pin-pytest.patch (from rev 255782, python-cryptography/trunk/pin-pytest.patch)
===================================================================
--- extra-i686/pin-pytest.patch	                        (rev 0)
+++ extra-i686/pin-pytest.patch	2015-12-11 04:03:52 UTC (rev 255783)
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 19f1e66..43fe17e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -59,7 +59,7 @@
+ 
+ # If you add a new dep here you probably need to add it in the tox.ini as well
+ test_requirements = [
+-    "pytest",
++    "pytest!=2.8.4",
+     "pretend",
+     "iso8601",
+     "hypothesis",

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2015-12-11 03:56:10 UTC (rev 255782)
+++ extra-x86_64/PKGBUILD	2015-12-11 04:03:52 UTC (rev 255783)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgbase=python-cryptography
-pkgname=('python-cryptography' 'python2-cryptography')
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="A package designed to expose cryptographic recipes and primitives to Python developers"
-arch=('i686' 'x86_64')
-license=('Apache')
-url="http://pypi.python.org/pypi/cryptography"
-makedepends=('python-setuptools' 'python2-setuptools' 'python-six' 'python2-six' 'python-cffi' 'python2-cffi' 'python2-enum34'
-             'python-pyasn1' 'python2-pyasn1' 'python-idna' 'python2-idna' 'python2-ipaddress')
-checkdepends=('python-pytest-runner' 'python2-pytest-runner' "python-cryptography-vectors=$pkgver" "python2-cryptography-vectors=$pkgver"
-              'python-iso8601' 'python2-iso8601' 'python-pretend' 'python2-pretend' 'python-pyasn1-modules' 'python2-pyasn1-modules'
-              'python-hypothesis' 'python2-hypothesis')
-source=("http://pypi.python.org/packages/source/c/cryptography/cryptography-${pkgver}.tar.gz")
-md5sums=('6ec05b916c52d8668cd3a3f6f1cea084')
-
-prepare() {
-   cp -a cryptography-${pkgver}{,-python2}
-}
-
-build() {
-   # Build python 3 module
-   cd cryptography-${pkgver}
-   python3 setup.py build
- 
-   # Build python 2 module
-   cd ../cryptography-${pkgver}-python2
-   python2 setup.py build
-}
-
-check() {
-   cd "${srcdir}"/cryptography-${pkgver}
-   PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.5:$PYTHONPATH" python3 setup.py ptr
-
-   cd "${srcdir}"/cryptography-${pkgver}-python2
-   PYTHONPATH="$PWD/build/lib.linux-$CARCH-2.7:$PYTHONPATH" python2 setup.py ptr
-}
- 
-package_python-cryptography() {
-   depends=('python-pyasn1' 'python-six' 'python-cffi' 'python-idna')
- 
-   cd cryptography-${pkgver}
-   python3 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-}
- 
-package_python2-cryptography() {
-   depends=('python2-pyasn1' 'python2-six' 'python2-cffi' 'python2-enum34' 'python2-idna' 'python2-ipaddress')
- 
-   cd cryptography-${pkgver}-python2
-   python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-}

Copied: python-cryptography/repos/extra-x86_64/PKGBUILD (from rev 255782, python-cryptography/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-12-11 04:03:52 UTC (rev 255783)
@@ -0,0 +1,58 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgbase=python-cryptography
+pkgname=('python-cryptography' 'python2-cryptography')
+pkgver=1.1.2
+pkgrel=1
+pkgdesc="A package designed to expose cryptographic recipes and primitives to Python developers"
+arch=('i686' 'x86_64')
+license=('Apache')
+url="http://pypi.python.org/pypi/cryptography"
+makedepends=('python-setuptools' 'python2-setuptools' 'python-six' 'python2-six' 'python-cffi' 'python2-cffi' 'python2-enum34'
+             'python-pyasn1' 'python2-pyasn1' 'python-idna' 'python2-idna' 'python2-ipaddress')
+checkdepends=('python-pytest-runner' 'python2-pytest-runner' "python-cryptography-vectors=$pkgver" "python2-cryptography-vectors=$pkgver"
+              'python-iso8601' 'python2-iso8601' 'python-pretend' 'python2-pretend' 'python-pyasn1-modules' 'python2-pyasn1-modules'
+              'python-hypothesis' 'python2-hypothesis')
+source=("http://pypi.python.org/packages/source/c/cryptography/cryptography-${pkgver}.tar.gz"
+        pin-pytest.patch)
+md5sums=('15eeba9e31f852bac21155baa3dfbc61'
+         '54f471441df9d3e825bf99946bf0ce1c')
+
+prepare() {
+  # We have patched pytest
+  (cd cryptography-${pkgver}; patch -Rp1 -i ../pin-pytest.patch)
+  cp -a cryptography-${pkgver}{,-python2}
+}
+
+build() {
+   # Build python 3 module
+   cd cryptography-${pkgver}
+   python3 setup.py build
+ 
+   # Build python 2 module
+   cd ../cryptography-${pkgver}-python2
+   python2 setup.py build
+}
+
+check() {
+   cd "${srcdir}"/cryptography-${pkgver}
+   PYTHONPATH="$PWD/build/lib.linux-$CARCH-3.5:$PYTHONPATH" python3 setup.py ptr
+
+   cd "${srcdir}"/cryptography-${pkgver}-python2
+   PYTHONPATH="$PWD/build/lib.linux-$CARCH-2.7:$PYTHONPATH" python2 setup.py ptr
+}
+ 
+package_python-cryptography() {
+   depends=('python-pyasn1' 'python-six' 'python-cffi' 'python-idna')
+ 
+   cd cryptography-${pkgver}
+   python3 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+}
+ 
+package_python2-cryptography() {
+   depends=('python2-pyasn1' 'python2-six' 'python2-cffi' 'python2-enum34' 'python2-idna' 'python2-ipaddress')
+ 
+   cd cryptography-${pkgver}-python2
+   python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+}

Copied: python-cryptography/repos/extra-x86_64/pin-pytest.patch (from rev 255782, python-cryptography/trunk/pin-pytest.patch)
===================================================================
--- extra-x86_64/pin-pytest.patch	                        (rev 0)
+++ extra-x86_64/pin-pytest.patch	2015-12-11 04:03:52 UTC (rev 255783)
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 19f1e66..43fe17e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -59,7 +59,7 @@
+ 
+ # If you add a new dep here you probably need to add it in the tox.ini as well
+ test_requirements = [
+-    "pytest",
++    "pytest!=2.8.4",
+     "pretend",
+     "iso8601",
+     "hypothesis",



More information about the arch-commits mailing list