Étienne Mollier pushed to branch master at Debian Med / python-cutadapt
Commits: d1b911b3 by Étienne Mollier at 2021-01-30T00:35:17+01:00 add build_flags.patch to propagate build flags - - - - - b761984f by Étienne Mollier at 2021-01-30T00:36:12+01:00 d/rules: export -ffloat-store for i386 DEB_* variables are also exported befor inclusion of dpkg-buildflags, so that their effects are taken into account. - - - - - 25804ac3 by Étienne Mollier at 2021-01-30T00:45:15+01:00 improved d/rules clean target - - - - - b0e4c5ac by Étienne Mollier at 2021-01-30T00:45:43+01:00 update changelog - - - - - ea7c7263 by Étienne Mollier at 2021-01-30T11:24:36+01:00 Revert "add build_flags.patch to propagate build flags" This reverts commit d1b911b35e9c36888ea3105cb630d7f9e34b3ac3. Simply reorganizing the variables exports in debian/rules allows one to get the expected behavior when using the DEB_* settings. - - - - - 7ce1c481 by Étienne Mollier at 2021-01-30T11:29:58+01:00 add skip-setuptools-scm.patch debian/rules clean hogs while setuptools-scm attempts to access the Internet to fetch something. This patch removes the component from the setup.py. - - - - - 49753ef0 by Étienne Mollier at 2021-01-30T11:35:18+01:00 skip-setuptools-scm.patch dep3 header - - - - - e33825e1 by Étienne Mollier at 2021-01-30T11:37:23+01:00 update changelog - - - - - 12f62870 by Étienne Mollier at 2021-01-30T11:39:13+01:00 routine-update: Ready to upload to unstable - - - - - 4 changed files: - debian/changelog - debian/patches/series - + debian/patches/skip-setuptools-scm.patch - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +python-cutadapt (3.2-2) unstable; urgency=medium + + * Team upload. + * Build i386 architecture with -ffloat-store to address failing tests. + * Add skip-setuptools-scm.patch to avoid accessing network resources during + builds and cleanup, and added supplement to the d/rules clean target.. + + -- Étienne Mollier <[email protected]> Sat, 30 Jan 2021 11:38:08 +0100 + python-cutadapt (3.2-1) unstable; urgency=medium * New upstream version ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ xfail_cutadapt_executable_test.patch +skip-setuptools-scm.patch ===================================== debian/patches/skip-setuptools-scm.patch ===================================== @@ -0,0 +1,18 @@ +Description: skip setuptools-scm + The setuptools-scm tries to access to ressources on the network. This patch + removes the component off the setup.py +Author: Étienne Mollier <[email protected]> +Forwarded: not-needed +Last-Update: 2021-01-30 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- python-cutadapt.orig/setup.py ++++ python-cutadapt/setup.py +@@ -85,7 +85,6 @@ + + setup( + name='cutadapt', +- setup_requires=['setuptools_scm'], # Support pip versions that don't know about pyproject.toml + use_scm_version={'write_to': 'src/cutadapt/_version.py'}, + author='Marcel Martin', + author_email='[email protected]', ===================================== debian/rules ===================================== @@ -3,18 +3,15 @@ # output every command that modifies files on the build system. #export DH_VERBOSE = 1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +ifneq (,$(filter $(DEB_BUILD_ARCH),i386)) +export DEB_CFLAGS_MAINT_APPEND += -ffloat-store +endif + # see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/* DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/default.mk -export DEB_BUILD_MAINT_OPTIONS = hardening=+all - -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - export PYBUILD_NAME=cutadapt %: @@ -34,5 +31,6 @@ override_dh_auto_clean: dh_auto_clean rm -rf src/cutadapt.egg-info/ .pytest_cache rm -f src/cutadapt/_version.py + rm -rf .eggs # cython-generated files rm -f src/cutadapt/_align.c src/cutadapt/qualtrim.c View it on GitLab: https://salsa.debian.org/med-team/python-cutadapt/-/compare/4dbb707bd735b6e90266e9e50c304b010c597e32...12f62870b7b25595ea5efe978ebc1a336b2ffe07 -- View it on GitLab: https://salsa.debian.org/med-team/python-cutadapt/-/compare/4dbb707bd735b6e90266e9e50c304b010c597e32...12f62870b7b25595ea5efe978ebc1a336b2ffe07 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
