[Python-modules-commits] r27806 - in packages/python-cryptography/trunk/debian (3 files)

[mithrandi at users.alioth.debian.org]

    Date: Friday, February 21, 2014 @ 15:06:58
  Author: mithrandi
Revision: 27806

More fixes.

Added:
  packages/python-cryptography/trunk/debian/cffivers.py
Modified:
  packages/python-cryptography/trunk/debian/control
  packages/python-cryptography/trunk/debian/rules

Added: packages/python-cryptography/trunk/debian/cffivers.py
===================================================================
--- packages/python-cryptography/trunk/debian/cffivers.py	                        (rev 0)
+++ packages/python-cryptography/trunk/debian/cffivers.py	2014-02-21 15:06:58 UTC (rev 27806)
@@ -0,0 +1,8 @@
+import cffi
+import sys
+pkgname = sys.argv[1]
+min = cffi.__version__
+max = min.split('.')
+max[-1] = str(int(max[-1]) + 1)
+max = '.'.join(max)
+print('%s (>= %s), %s (<< %s)' % (pkgname, min, pkgname, max))

Modified: packages/python-cryptography/trunk/debian/control
===================================================================
--- packages/python-cryptography/trunk/debian/control	2014-02-21 14:02:18 UTC (rev 27805)
+++ packages/python-cryptography/trunk/debian/control	2014-02-21 15:06:58 UTC (rev 27806)
@@ -12,6 +12,8 @@
  python3-cffi (>= 0.8),
  python-six (>= 1.4.1),
  python3-six (>= 1.4.1),
+ python-pytest,
+ python3-pytest,
 Standards-Version: 3.9.5
 Homepage: https://cryptography.io/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-cryptography/trunk/
@@ -22,7 +24,7 @@
 Package: python-cryptography
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${cffi:Depends}
-Description: Python library exposing cryptographic recipes and primitives
+Description: Python library exposing cryptographic recipes and primitives (python 2)
  The cryptography library is designed to be a "one-stop-shop" for
  all your cryptographic needs in Python.
  .
@@ -35,4 +37,26 @@
   - Lack of high level, "Cryptography for humans", APIs.
   - Absence of algorithms such as AES-GCM.
   - Poor introspectability, and thus poor testability.
+ .
+ This package contains the Python 2 version of cryptography.
+
+Package: python3-cryptography
+Architecture: any
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${cffi3:Depends}
+Description: Python library exposing cryptographic recipes and primitives (python 3)
+ The cryptography library is designed to be a "one-stop-shop" for
+ all your cryptographic needs in Python.
+ .
+ As an alternative to the libraries that came before it, cryptography
+ tries to address some of the issues with those libraries:
+  - Lack of PyPy and Python 3 support.
+  - Lack of maintenance.
+  - Use of poor implementations of algorithms (i.e. ones with known
+    side-channel attacks).
+  - Lack of high level, "Cryptography for humans", APIs.
+  - Absence of algorithms such as AES-GCM.
+  - Poor introspectability, and thus poor testability.
   - Extremely error prone APIs, and bad defaults.
+  - Extremely error prone APIs, and bad defaults.
+ .
+ This package contains the Python 3 version of cryptography.

Modified: packages/python-cryptography/trunk/debian/rules
===================================================================
--- packages/python-cryptography/trunk/debian/rules	2014-02-21 14:02:18 UTC (rev 27805)
+++ packages/python-cryptography/trunk/debian/rules	2014-02-21 15:06:58 UTC (rev 27806)
@@ -1,16 +1,25 @@
 #!/usr/bin/make -f
-export DH_VERBOSE := 1
 export PYBUILD_NAME=cryptography
 
-# This ... awful thing borrowed from Vincent Bernat for the moment; hopefully
-# there will be a better canonical way to do this in future.
-DEB_DH_GENCONTROL_ARGS_snimpy=-- -Vcffi:Depends="$(shell python -c 'import cffi ; min=cffi.__version__ ; max=min.split(".") ; max[-1] = str(int(max[-1])+1) ;  print("python-cffi (>= %s), python-cffi (<< %s)" % (min, ".".join(max)))')"
-
 %:
-	dh $@ --with python2,python3 --buildsystem=pybuild 
+	dh $@ --with python2,python3 --buildsystem=pybuild
 
+# This ... awful thing originally borrowed from Vincent Bernat; hopefully there
+# will be a better canonical way to do this in future.
+override_dh_gencontrol:
+	dh_gencontrol -- \
+	    -Vcffi:Depends="$(shell python debian/cffivers.py python-cffi)" \
+	    -Vcffi3:Depends="$(shell python3 debian/cffivers.py python-cffi3)"
 
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf cryptography/hazmat/bindings/__pycache__ \
 	       cryptography/hazmat/primitives/__pycache__
+
+# Disable test suite for the moment, because it requires dependencies which are
+# not yet in Debian :(
+
+#override_dh_auto_test:
+#	PYBUILD_SYSTEM=custom \
+#	PYBUILD_TEST_ARGS="cd {build_dir}; {interpreter} -m pytest {dir}/tests" dh_auto_test