Bas Couwenberg pushed to branch master at Debian GIS Project / python-cartopy
Commits: 5107e944 by Bas Couwenberg at 2022-12-01T20:07:41+01:00 Use patch to not set RPATH in libraries. - - - - - 777c5f8a by Bas Couwenberg at 2022-12-01T20:15:26+01:00 Don't use xvfb-run for tests, causes FTBFS. - - - - - 5 changed files: - debian/changelog - debian/control - + debian/patches/rpath.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -2,6 +2,8 @@ python-cartopy (0.21.0+dfsg-4) UNRELEASED; urgency=medium * Team upload. * Add -v to pytest arguments. + * Use patch to not set RPATH in libraries. + * Don't use xvfb-run for tests, causes FTBFS. -- Bas Couwenberg <[email protected]> Thu, 01 Dec 2022 17:16:20 +0100 ===================================== debian/control ===================================== @@ -5,8 +5,7 @@ Uploaders: Ghislain Antony Vaillant <[email protected]>, Section: python Priority: optional Rules-Requires-Root: no -Build-Depends: chrpath, - cython3, +Build-Depends: cython3, debhelper-compat (= 12), dh-python, libgeos-dev, @@ -28,9 +27,7 @@ Build-Depends: chrpath, python3-setuptools, python3-setuptools-scm, python3-shapely, - python3-tk, - xauth, - xvfb + python3-tk Standards-Version: 4.6.1 Vcs-Browser: https://salsa.debian.org/debian-gis-team/python-cartopy Vcs-Git: https://salsa.debian.org/debian-gis-team/python-cartopy.git ===================================== debian/patches/rpath.patch ===================================== @@ -0,0 +1,17 @@ +Description: Don't set RPATH in libraries. +Author: Bas Couwenberg <[email protected]> +Forwarded: not-needed + +--- a/setup.py ++++ b/setup.py +@@ -136,10 +136,6 @@ if sys.platform.startswith('win'): + include_dir = get_config_var('INCLUDEDIR') + library_dir = get_config_var('LIBDIR') + extra_extension_args = defaultdict(list) +-if not sys.platform.startswith('win'): +- extra_extension_args["runtime_library_dirs"].append( +- get_config_var('LIBDIR') +- ) + + # Description + # =========== ===================================== debian/patches/series ===================================== @@ -2,3 +2,4 @@ 0002-test_robinson.patch 0003-test_gridliner.patch setup-version.patch +rpath.patch ===================================== debian/rules ===================================== @@ -36,9 +36,9 @@ override_dh_auto_clean: override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) ifneq (,$(filter $(DEB_BUILD_ARCH),mips64el s390x ppc64)) - xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" dh_auto_test || echo "Ignoring test failures" + dh_auto_test || echo "Ignoring test failures" else - xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" dh_auto_test + dh_auto_test endif endif @@ -59,9 +59,6 @@ override_dh_auto_install: # Don't include test output $(RM) -r debian/*/usr/lib/python*/dist-packages/cartopy_test_output - # Strip RPATH - chrpath --delete debian/*/usr/lib/python*/dist-packages/*/*.so - override_dh_python3: dh_python3 dh_numpy3 View it on GitLab: https://salsa.debian.org/debian-gis-team/python-cartopy/-/compare/90762834bd35735ac7e886d70cec1d08fc966652...777c5f8a61276c42bd8cc9868aa1ace9b35f12de -- View it on GitLab: https://salsa.debian.org/debian-gis-team/python-cartopy/-/compare/90762834bd35735ac7e886d70cec1d08fc966652...777c5f8a61276c42bd8cc9868aa1ace9b35f12de You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
