openstack/deb-python-wrapt
Code Issues Proposed changes

python -m pytest

Browse Source 
* Using python -m pytest instead of py.test-VERSION.
  * Using pkgos-dh_auto_install from openstack-pkg-tools >= 52~.
  * Other fixes already in Debian.

Change-Id: Ib0ceddc0f361557be6cb2e800021d916bf95eecc
This commit is contained in:
Thomas Goirand
2016-10-05 16:25:48 +02:00
parent 82d0fbfd90
commit 26d8320bdc
4 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
debian/changelog vendored
View File

@@ -1,22 +1,48 @@
python-wrapt (1.9.0-2) unstable; urgency=medium
python-wrapt (1.9.0-3) unstable; urgency=medium
[ Ondřej Nový ]
* Fixed VCS URLs (https).
* d/rules: Changed UPSTREAM_GIT protocol to https
* d/s/options: extend-diff-ignore of .gitreview
* d/control: Using OpenStack's Gerrit as VCS URLs.
-- Ondřej Nový <novy@ondrej.org> Sun, 28 Feb 2016 15:53:01 +0100
[ Thomas Goirand ]
* Using python -m pytest instead of py.test-VERSION.
* Using pkgos-dh_auto_install from openstack-pkg-tools >= 52~.
-- Thomas Goirand <zigo@debian.org> Wed, 05 Oct 2016 16:24:58 +0200
python-wrapt (1.9.0-2) unstable; urgency=medium
* Repair the mistake of build-depends-indep: the binaries are *not*
arch: all.
-- Thomas Goirand <zigo@debian.org> Fri, 09 Sep 2016 13:22:18 +0000
python-wrapt (1.9.0-1) unstable; urgency=medium
[ Ondřej Nový ]
* Fixed VCS URLs (https).
* d/rules: Changed UPSTREAM_GIT protocol to https
[ Thomas Goirand ]
* New upstream release (Closes: #765064):
- Drop do-not-use-embedded-six.py.patch and
no-from-wrapt-import-six-in-tests.patch, as src/six.py is gone upstream.
- Drop fix-python-3.4-compat.patch applied upstream.
- Drop python-3.2-compat.patch as upstream isn't using embeddded six.
- Drop python-3.2-compat.patch as upstream isn't using embedded six.
* Standards-Version is now 3.9.6 (no change).
* Removed non-active maintainers.
* Reviewed (build-)depends and ran wrap-and-sort -t -a.
* Simplified debian/rules using goodies from openstack-pkg-tools >= 52~.
* Using python$$pyvers -m pytest to run tests (Closes: #835247).
* Fixed debian/copyright ordering.
* Standards-Version: 3.9.8 (no change).
* Added export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow.
* Removed do-not-use-the-rdt-sphinx-theme.patch and build-depends on the
python-sphinx-rtd-theme package.
-- Thomas Goirand <zigo@debian.org> Tue, 14 Oct 2014 00:01:48 +0800
-- Thomas Goirand <zigo@debian.org> Fri, 09 Sep 2016 08:05:11 +0000
python-wrapt (1.8.0-5) unstable; urgency=medium

16
debian/control vendored
View File

@@ -2,13 +2,12 @@ Source: python-wrapt
Section: python
Priority: optional
Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
Uploaders: Julien Danjou <acid@debian.org>,
Thomas Goirand <zigo@debian.org>,
Mehdi Abaakouk <sileht@sileht.net>,
Gonéri Le Bouder <goneri@debian.org>
Uploaders: Thomas Goirand <zigo@debian.org>,
Build-Depends: debhelper (>= 9),
python-all (>= 2.6.6-3~),
python-all-dev (>= 2.6.6-3~),
dh-python,
openstack-pkg-tools (>= 52~),
python-all,
python-all-dev,
python-pytest,
python-setuptools,
python-six,
@@ -18,14 +17,13 @@ Build-Depends: debhelper (>= 9),
python3-pytest,
python3-setuptools,
python3-six
Standards-Version: 3.9.6
Standards-Version: 3.9.8
Vcs-Browser: https://git.openstack.org/cgit/openstack/deb-python-wrapt?h=debian%2Fnewton
Vcs-Git: https://git.openstack.org/openstack/deb-python-wrapt -b debian/newton
Homepage: https://github.com/GrahamDumpleton/wrapt
Package: python-wrapt
Architecture: any
Pre-Depends: dpkg (>= 1.15.6~)
Depends: python-six, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
Description: decorators, wrappers and monkey patching. - Python 2.x
The aim of the wrapt module is to provide a transparent object proxy for
@@ -48,7 +46,6 @@ Description: decorators, wrappers and monkey patching. - Python 2.x
Package: python3-wrapt
Architecture: any
Pre-Depends: dpkg (>= 1.15.6~)
Depends: python3-six, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
Description: decorators, wrappers and monkey patching. - Python 3.x
The aim of the wrapt module is to provide a transparent object proxy for
@@ -72,7 +69,6 @@ Description: decorators, wrappers and monkey patching. - Python 3.x
Package: python-wrapt-doc
Architecture: all
Section: doc
Pre-Depends: dpkg (>= 1.15.6~)
Depends: ${misc:Depends}, ${sphinxdoc:Depends}
Description: decorators, wrappers and monkey patching. - doc
The aim of the wrapt module is to provide a transparent object proxy for

8
debian/copyright vendored
View File

@@ -2,6 +2,10 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: wrapt
Source: https://github.com/GrahamDumpleton/wrapt
Files: *
Copyright: (c) 2013, Graham Dumpleton <Graham.Dumpleton@gmail.com>
License: BSD-2-clause
Files: debian/*
Copyright: (c) 2014, Thomas Goirand <zigo@debian.org>
License: BSD-2-clause
@@ -10,10 +14,6 @@ Files: src/arguments.py
Copyright: Guido van Rossum <guido@cwi.nl> and others.
License: PSF-License
Files: *
Copyright: (c) 2013, Graham Dumpleton <Graham.Dumpleton@gmail.com>
License: BSD-2-clause
License: BSD-2-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

20
debian/rules vendored
View File

@@ -1,29 +1,21 @@
#!/usr/bin/make -f
PYTHONS:=$(shell pyversions -vr)
PYTHON3S:=$(shell py3versions -vr)
UPSTREAM_GIT := https://github.com/GrahamDumpleton/wrapt.git
-include /usr/share/openstack-pkg-tools/pkgos.make
include /usr/share/openstack-pkg-tools/pkgos.make
export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
%:
dh $@ --buildsystem=python_distutils --with python2,python3,sphinxdoc
override_dh_install:
set -e && for pyvers in $(PYTHONS); do \
python$$pyvers setup.py install --install-layout=deb \
--root $(CURDIR)/debian/python-wrapt; \
done
set -e && for pyvers in $(PYTHON3S); do \
python$$pyvers setup.py install --install-layout=deb \
--root $(CURDIR)/debian/python3-wrapt; \
done
override_dh_auto_install:
pkgos-dh_auto_install
override_dh_auto_test:
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
ln -s src wrapt
set -ex && for pyvers in $(PYTHONS) $(PYTHON3S); do \
PYTHONPATH=. py.test-$$pyvers -v tests ; \
PYTHONPATH=. python$$pyvers -m pytest -v tests ; \
done
rm -f wrapt
endif