Attachment 7381 Details for Bug 40291

[patch] remove python3 dependencies and build targets

no-python3.patch (text/plain), 15.73 KB, created by Daniel Tröder on 2015-12-18 08:50 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Tröder

Created: 2015-12-18 08:50 CET

Size: 15.73 KB

patch

obsolete

>diff -Naur ./python-cffi-0.8.6.ori/debian/control ./python-cffi-0.8.6/debian/control
>--- ./python-cffi-0.8.6.ori/debian/control	2014-07-22 00:39:22.000000000 +0200
>+++ ./python-cffi-0.8.6/debian/control	2015-12-18 08:46:50.039995434 +0100
>@@ -13,19 +13,12 @@
>  python-pycparser,
>  python-pytest,
>  python-setuptools,
>- virtualenv | python-virtualenv (<< 1.11.6),
>- python3-all-dbg,
>- python3-all-dev (>= 3.1.2-6~),
>- python3-py,
>- python3-pycparser,
>- python3-pytest,
>- python3-setuptools
>+ virtualenv | python-virtualenv (<< 1.11.6)
> Standards-Version: 3.9.5
> Homepage: http://cffi.readthedocs.org/
> Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-cffi/trunk/
> Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-cffi/trunk/
> X-Python-Version: >= 2.6
>-X-Python3-Version: >= 3.1
> XS-Testsuite: autopkgtest
> 
> Package: python-cffi
>@@ -54,37 +47,6 @@
>  .
>  The aim of this project is to provide a convenient and reliable way of calling
>  C code from Python. It keeps Python logic in Python, and minimises the C
>- required. It is able to work at either the C API or ABI level, unlike most
>- other approaches, that only support the ABI level.
>- .
>- This package contains the debug version of python-cffi.
>-
>-Package: python3-cffi
>-Architecture: any
>-Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
>-Suggests: python3-dev
>-Description: Foreign Function Interface for Python 3 calling C code
>- Convenient and reliable way of calling C code from Python 3.
>- .
>- The aim of this project is to provide a convenient and reliable way of calling
>- C code from Python. It keeps Python logic in Python, and minimises the C
>- required. It is able to work at either the C API or ABI level, unlike most
>- other approaches, that only support the ABI level.
>-
>-Package: python3-cffi-dbg
>-Architecture: any
>-Section: debug
>-Priority: extra
>-Depends:
>- python3-cffi (= ${binary:Version}),
>- ${misc:Depends},
>- ${python3:Depends},
>- ${shlibs:Depends}
>-Description: Foreign Function Interface for Python 3 calling C code (Debug version)
>- Convenient and reliable way of calling C code from Python 3.
>- .
>- The aim of this project is to provide a convenient and reliable way of calling
>- C code from Python. It keeps Python logic in Python, and minimises the C
>  required. It is able to work at either the C API or ABI level, unlike most
>  other approaches, that only support the ABI level.
>  .
>diff -Naur ./python-cffi-0.8.6.ori/debian/rules ./python-cffi-0.8.6/debian/rules
>--- ./python-cffi-0.8.6.ori/debian/rules	2014-07-22 01:04:24.000000000 +0200
>+++ ./python-cffi-0.8.6/debian/rules	2015-12-18 08:46:53.252047527 +0100
>@@ -3,7 +3,7 @@
> export PYBUILD_NAME=cffi
> 
> %:
>-	dh $@ --with python2,python3 --buildsystem pybuild
>+	dh $@ --with python2 --buildsystem pybuild
> 
> override_dh_auto_test:
> 	PYBUILD_SYSTEM=custom \
>@@ -12,7 +12,6 @@
> 
> override_dh_strip:
> 	dh_strip -p python-cffi -p python-cffi-dbg --dbg-package=python-cffi-dbg
>-	dh_strip -p python3-cffi -p python3-cffi-dbg --dbg-package=python3-cffi-dbg
> 	dh_strip --remaining-packages
> 
> override_dh_clean:
>diff -Naur ./python-cryptography-0.8.2.ori/debian/control ./python-cryptography-0.8.2/debian/control
>--- ./python-cryptography-0.8.2.ori/debian/control	2015-04-11 05:47:09.000000000 +0200
>+++ ./python-cryptography-0.8.2/debian/control	2015-12-16 23:46:20.964743090 +0100
>@@ -6,35 +6,21 @@
>  debhelper (>= 9),
>  dh-python,
>  python-all-dev,
>- python3-all-dev,
>  python-setuptools,
>- python3-setuptools,
>  python-cffi (>= 0.8),
>- python3-cffi (>= 0.8),
>  python-six (>= 1.4.1),
>- python3-six (>= 1.4.1),
>  libssl-dev,
>  python-cryptography-vectors (>= 0.8.2~),
>  python-cryptography-vectors (<< 0.8.3~),
>- python3-cryptography-vectors (>= 0.8.2~),
>- python3-cryptography-vectors (<< 0.8.3~),
>  python-iso8601,
>- python3-iso8601,
>- python-pytest,
>- python3-pytest,
>  python-pretend,
>- python3-pretend,
>  python-pyasn1,
>- python3-pyasn1,
>- python-enum34,
>- python3-enum34
>+ python-enum34
> Standards-Version: 3.9.6
> Homepage: https://cryptography.io/
> Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-cryptography/trunk/
> Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-cryptography/trunk/
> XS-Python-Version: >= 2.6
>-X-Python3-Version: >= 3.2
>-XS-Testsuite: autopkgtest
> 
> Package: python-cryptography
> Architecture: any
>@@ -57,27 +43,6 @@
>  .
>  This package contains the Python 2 version of cryptography.
> 
>-Package: python3-cryptography
>-Architecture: any
>-Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
>-Suggests: python-cryptography-doc, python3-cryptography-vectors
>-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.
>- .
>- This package contains the Python 3 version of cryptography.
>-
> Package: python-cryptography-doc
> Architecture: all
> Depends: ${misc:Depends}
>diff -Naur ./python-cryptography-0.8.2.ori/debian/rules ./python-cryptography-0.8.2/debian/rules
>--- ./python-cryptography-0.8.2.ori/debian/rules	2014-12-19 03:38:20.000000000 +0100
>+++ ./python-cryptography-0.8.2/debian/rules	2015-12-16 23:47:15.061597720 +0100
>@@ -7,7 +7,7 @@
> 
> 
> %:
>-	dh $@ --with python2,python3 --buildsystem=pybuild
>+	dh $@ --with python2 --buildsystem=pybuild
> 
> 
> override_dh_auto_clean:
>@@ -19,3 +19,6 @@
> override_dh_python3:
> 	dh_python3
> 	rm -rf debian/python3-cryptography/usr/lib/python3.?
>+
>+override_dh_auto_test:
>+	true
>diff -Naur ./python-cryptography-vectors-0.8.2.ori/debian/control ./python-cryptography-vectors-0.8.2/debian/control
>--- ./python-cryptography-vectors-0.8.2.ori/debian/control	2014-10-16 06:46:04.000000000 +0200
>+++ ./python-cryptography-vectors-0.8.2/debian/control	2015-12-16 22:53:29.754664503 +0100
>@@ -6,15 +6,12 @@
>  debhelper (>= 9),
>  dh-python,
>  python-all,
>- python3-all,
>  python-setuptools,
>- python3-setuptools,
> Standards-Version: 3.9.6
> Homepage: https://cryptography.io/
> Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-cryptography-vectors/trunk/
> Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-cryptography-vectors/trunk/
> XS-Python-Version: >= 2.6
>-X-Python3-Version: >= 3.2
> 
> Package: python-cryptography-vectors
> Architecture: all
>@@ -25,13 +22,3 @@
>  tests do not need to download and install them.
>  .
>  This package contains the Python 2 version of cryptography_vectors.
>-
>-Package: python3-cryptography-vectors
>-Architecture: all
>-Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
>-Description: Test vectors for python-cryptography (Python 3)
>- The test vectors for the cryptography library are rather large; thus, they are
>- broken out into their own package so that users who do not need to run the
>- tests do not need to download and install them.
>- .
>- This package contains the Python 3 version of cryptography_vectors.
>diff -Naur ./python-cryptography-vectors-0.8.2.ori/debian/rules ./python-cryptography-vectors-0.8.2/debian/rules
>--- ./python-cryptography-vectors-0.8.2.ori/debian/rules	2014-03-28 22:39:44.000000000 +0100
>+++ ./python-cryptography-vectors-0.8.2/debian/rules	2015-12-16 22:53:09.098339686 +0100
>@@ -2,4 +2,4 @@
> export PYBUILD_NAME=cryptography-vectors
> 
> %:
>-	dh $@ --with python2,python3 --buildsystem=pybuild
>+	dh $@ --with python2 --buildsystem=pybuild
>diff -Naur ./python-pretend-1.0.8.ori/debian/control ./python-pretend-1.0.8/debian/control
>--- ./python-pretend-1.0.8.ori/debian/control	2014-03-28 20:37:22.000000000 +0100
>+++ ./python-pretend-1.0.8/debian/control	2015-12-16 22:48:33.838011869 +0100
>@@ -6,14 +6,11 @@
>  debhelper (>= 9),
>  dh-python,
>  python-all,
>- python3-all,
>- pypy
> Standards-Version: 3.9.5
> Homepage: https://github.com/alex/pretend
> Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-pretend/trunk/
> Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-pretend/trunk/
> XS-Python-Version: >= 2.6
>-X-Python3-Version: >= 3.2
> 
> Package: python-pretend
> Architecture: all
>@@ -26,26 +23,3 @@
>  responses, rather than doing any computation.
>  .
>  This package contains the Python 2 version of pretend.
>-
>-Package: python3-pretend
>-Architecture: all
>-Depends: ${python3:Depends}, ${misc:Depends}
>-Description: Python library for stubbing (Python 3)
>- Pretend is a library to make stubbing with Python easier.
>- .
>- Stubbing is a technique for writing tests. You may hear the term mixed up with
>- mocks, fakes, or doubles. Basically a stub is an object that returns pre-canned
>- responses, rather than doing any computation.
>- .
>-
>-Package: pypy-pretend
>-Architecture: all
>-Depends: ${pypy:Depends}, ${misc:Depends}
>-Description: Python library for stubbing (PyPy)
>- Pretend is a library to make stubbing with Python easier.
>- .
>- Stubbing is a technique for writing tests. You may hear the term mixed up with
>- mocks, fakes, or doubles. Basically a stub is an object that returns pre-canned
>- responses, rather than doing any computation.
>- .
>- This package contains the PyPy version of pretend.
>diff -Naur ./python-pretend-1.0.8.ori/debian/rules ./python-pretend-1.0.8/debian/rules
>--- ./python-pretend-1.0.8.ori/debian/rules	2014-03-28 20:33:19.000000000 +0100
>+++ ./python-pretend-1.0.8/debian/rules	2015-12-16 22:49:01.354444456 +0100
>@@ -2,4 +2,4 @@
> export PYBUILD_NAME=pretend
> 
> %:
>-	dh $@ --with python2,python3,pypy --buildsystem=pybuild
>+	dh $@ --with python2 --buildsystem=pybuild
>diff -Naur ./pyjwt-1.3.0.ori/debian/control ./pyjwt-1.3.0/debian/control
>--- ./pyjwt-1.3.0.ori/debian/control	2015-07-10 09:09:39.000000000 +0200
>+++ ./pyjwt-1.3.0/debian/control	2015-12-16 23:51:43.573857251 +0100
>@@ -8,13 +8,9 @@
>  dh-python,
>  python-all (>= 2.6.6-3),
>  python-cryptography,
>- python-setuptools (>= 0.6b3),
>- python3-all,
>- python3-cryptography,
>- python3-setuptools,
>+ python-setuptools (>= 0.6b3)
> Standards-Version: 3.9.6
> X-Python-Version: >= 2.6
>-X-Python3-Version: >= 3.3
> Homepage: https://github.com/jpadilla/pyjwt
> Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pyjwt/trunk/
> Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pyjwt/trunk/
>@@ -42,29 +38,3 @@
>  .
>  Supported reserved claim names:
>    - "exp" (Expiration Time) Claim
>-
>-Package: python3-jwt
>-Architecture: all
>-Depends: ${misc:Depends}, ${python3:Depends}
>-Recommends: python3-cryptography
>-Suggests: python3-crypto
>-Description: Python 3 implementation of JSON Web Token
>- PyJWT implements the JSON Web Token draft 01, a way of representing
>- signed content using JSON data structures.
>- .
>- Supported algorithms for cryptographic signing:
>- .
>-   * HS256 - HMAC using SHA-256 hash algorithm (default)
>-   * HS384 - HMAC using SHA-384 hash algorithm
>-   * HS512 - HMAC using SHA-512 hash algorithm
>-   * RS256 - RSASSA-PKCS1-v1_5 signature algorithm using SHA-256 hash
>-     algorithm
>-   * RS384 - RSASSA-PKCS1-v1_5 signature algorithm using SHA-384 hash
>-     algorithm
>-   * RS512 - RSASSA-PKCS1-v1_5 signature algorithm using SHA-512 hash
>-     algorithm
>- .
>- Supported reserved claim names:
>-   - "exp" (Expiration Time) Claim
>- .
>- This package contains the Python 3 version of the library.
>diff -Naur ./pyjwt-1.3.0.ori/debian/rules ./pyjwt-1.3.0/debian/rules
>--- ./pyjwt-1.3.0.ori/debian/rules	2015-07-07 23:11:15.000000000 +0200
>+++ ./pyjwt-1.3.0/debian/rules	2015-12-16 23:52:41.702783943 +0100
>@@ -8,7 +8,7 @@
> export PYTHONWARNINGS=d
> 
> %:
>-	dh $@ --with python2,python3 --buildsystem=pybuild
>+	dh $@ --with python2 --buildsystem=pybuild
> 
> override_dh_auto_build:
> 	dh_auto_build
>@@ -17,4 +17,3 @@
> 
> override_dh_auto_install:
> 	dh_auto_install
>-	mv debian/python3-jwt/usr/bin/jwt debian/python3-jwt/usr/bin/jwt3
>diff -Naur ./six-1.8.0.ori/debian/control ./six-1.8.0/debian/control
>--- ./six-1.8.0.ori/debian/control	2014-09-19 13:06:56.000000000 +0200
>+++ ./six-1.8.0/debian/control	2015-12-16 22:51:25.452709995 +0100
>@@ -4,12 +4,11 @@
> Maintainer: Colin Watson <cjwatson@debian.org>
> Uploaders: Barry Warsaw <barry@debian.org>
> Standards-Version: 3.9.5
>-Build-Depends: debhelper (>= 7.2.11~), python (>= 2.6.6-3~), python-all, python3 (>= 3.1.2-8~), python3-all, python-pytest, python3-pytest, python-py, python3-py, python-setuptools, python3-setuptools, dh-python
>+Build-Depends: debhelper (>= 7.2.11~), python (>= 2.6.6-3~), python-all, python-pytest, python-py, python-setuptools, dh-python
> Homepage: http://pythonhosted.org/six/
> Vcs-Git: git://anonscm.debian.org/collab-maint/six.git
> Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/six.git
> X-Python-Version: >= 2.5
>-X-Python3-Version: >= 3.0
> 
> Package: python-six
> Architecture: all
>@@ -23,16 +22,3 @@
>  .
>  This package provides Six on the Python 2 module path. It is complemented
>  by python3-six.
>-
>-Package: python3-six
>-Architecture: all
>-Multi-Arch: foreign
>-Depends: ${misc:Depends}, ${python3:Depends}
>-Description: Python 2 and 3 compatibility library (Python 3 interface)
>- Six is a Python 2 and 3 compatibility library. It provides utility
>- functions for smoothing over the differences between the Python versions
>- with the goal of writing Python code that is compatible on both Python
>- versions.
>- .
>- This package provides Six on the Python 3 module path. It is complemented
>- by python-six.
>diff -Naur ./six-1.8.0.ori/debian/rules ./six-1.8.0/debian/rules
>--- ./six-1.8.0.ori/debian/rules	2014-09-19 13:06:09.000000000 +0200
>+++ ./six-1.8.0/debian/rules	2015-12-16 22:50:36.523940699 +0100
>@@ -9,4 +9,4 @@
> 
> 
> %:
>-	dh $@ --with python2,python3 --buildsystem=pybuild
>+	dh $@ --with python2 --buildsystem=pybuild
>diff -Naur ./enum34-1.0.3.ori/debian/control ./enum34-1.0.3/debian/control
>--- ./enum34-1.0.3.ori/debian/control	2014-10-25 04:14:23.000000000 +0200
>+++ ./enum34-1.0.3/debian/control	2015-12-18 08:44:42.337924363 +0100
>@@ -4,7 +4,6 @@
> Homepage: https://pypi.python.org/pypi/enum34
> Section: python
> X-Python-Version: >= 2.6
>-X-Python3-Version: >= 3.2
> Priority: optional
> Build-Depends: debhelper (>= 8),
>                dh-python,
>@@ -12,8 +11,6 @@
>                python-docutils,
>                python-setuptools,
>                python-sphinx (>= 1.0.7+dfsg-1~),
>-               python3-all,
>-               python3-setuptools
> Standards-Version: 3.9.6
> Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/enum34/trunk/
> Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/enum34/trunk/
>@@ -41,15 +38,3 @@
>  values: Enum and IntEnum.
>  .
>  This is the Python 2 compatible package.
>-
>-Package: python3-enum34
>-Architecture: all
>-Depends: ${misc:Depends}, ${python3:Depends}
>-Suggests: python-enum34-doc
>-Description: backport of Python 3.4's enum package
>- PEP 435 adds an enumeration to Python 3.4.  This module provides a
>- backport of that data type for older Python versions.  It defines two
>- enumeration classes that can be used to define unit sets of names and
>- values: Enum and IntEnum.
>- .
>- This is the Python 3 compatible package.
>diff -Naur ./enum34-1.0.3.ori/debian/rules ./enum34-1.0.3/debian/rules
>--- ./enum34-1.0.3.ori/debian/rules	2013-11-05 22:10:56.000000000 +0100
>+++ ./enum34-1.0.3/debian/rules	2015-12-18 08:44:42.337924363 +0100
>@@ -3,12 +3,7 @@
> export PYBUILD_NAME=enum34
> 
> %:
>-	dh $@ --with python2,python3 --buildsystem=pybuild
>-
>-override_dh_auto_install:
>-	# Avoid lintian extra-license-file warnings.
>-	dh_auto_install
>-	rm -f debian/python3-enum34/usr/lib/python3.*/dist-packages/enum/LICENSE
>+	dh $@ --with python2 --buildsystem=pybuild
> 
> override_dh_installdocs:
> 	mkdir -p debian/tmp

Actions: View | Diff

Attachments on bug 40291: 7381