Bas Couwenberg pushed to branch master at Debian GIS Project / fiona
Commits: 728b0e12 by Bas Couwenberg at 2023-08-12T10:08:36+02:00 Remove generated files in clean target. - - - - - b21a653e by Bas Couwenberg at 2023-08-12T10:27:18+02:00 Add patch to fix pytz.exceptions.UnknownTimeZoneError: 'US/Mountain'. - - - - - 5 changed files: - debian/changelog - + debian/clean - debian/patches/series - + debian/patches/timezone.patch - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -3,6 +3,8 @@ fiona (1.9.4-3) UNRELEASED; urgency=medium * Team upload. * Use autopkgtest-pkg-pybuild testsuite. * Enable Salsa CI. + * Remove generated files in clean target. + * Add patch to fix pytz.exceptions.UnknownTimeZoneError: 'US/Mountain'. -- Bas Couwenberg <[email protected]> Sun, 16 Jul 2023 12:11:52 +0200 ===================================== debian/clean ===================================== @@ -0,0 +1,6 @@ +*-info/ +fiona/*.c +fiona/*.cpp +fiona/*.so +gdal-config.txt +VERSION.txt ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ 0001-Rename-fio-command-to-fiona-to-avoid-name-clash.patch test_drvsupport.patch 0001-Exclude-py-files-from-docs-examples-scripts-tests-fr.patch +timezone.patch ===================================== debian/patches/timezone.patch ===================================== @@ -0,0 +1,43 @@ +Description: Fix pytz.exceptions.UnknownTimeZoneError: 'US/Mountain'. + tzdata (2023c-8) in Debian no longer provides the US timezones: + . + * Ship only timezones in tzdata that follow the current rules of geographical + region (continent or ocean) and city name. Move all legacy timezone symlinks + (that are upgraded during package update) to tzdata-legacy. This includes + dropping the special handling for US/* timezones. (Closes: #1040997) +Author: Bas Couwenberg <[email protected]> +Forwarded: https://github.com/Toblerity/Fiona/pull/1287 + +--- a/tests/test_datetime.py ++++ b/tests/test_datetime.py +@@ -174,10 +174,10 @@ def generate_testdata(field_type, driver + ), + ( + datetime.datetime(2020, 1, 21, 12, 0, 0, tzinfo=pytz.utc).astimezone( +- timezone("US/Mountain") ++ timezone("America/Denver") + ), + datetime.datetime(2020, 1, 21, 12, 0, 0, tzinfo=pytz.utc).astimezone( +- timezone("US/Mountain") ++ timezone("America/Denver") + ), + ), + ( +@@ -270,7 +270,7 @@ def test_compare_datetimes_utc(): + timezone("Europe/Zurich") + ) + d2 = datetime.datetime(2020, 1, 21, 12, 0, 0, tzinfo=pytz.utc).astimezone( +- timezone("US/Mountain") ++ timezone("America/Denver") + ) + assert d1 == d2 + assert compare_datetimes_utc(d1, d2) +@@ -279,7 +279,7 @@ def test_compare_datetimes_utc(): + timezone("Europe/Zurich") + ) + d2 = datetime.datetime(2020, 6, 21, 12, 0, 0, tzinfo=pytz.utc).astimezone( +- timezone("US/Mountain") ++ timezone("America/Denver") + ) + assert d1 == d2 + assert compare_datetimes_utc(d1, d2) ===================================== debian/rules ===================================== @@ -43,10 +43,6 @@ export PYBUILD_TEST_ARGS=--ignore tests/test_bytescollection.py \ %: dh $@ --with python3 --buildsystem pybuild -override_dh_clean: - dh_clean - rm -rf fiona/*.so gdal-config.txt fiona/*.c VERSION.txt fiona/*.cpp Fiona.egg-info/ - override_dh_auto_test: # Ignore test failures on problematic architectures only ifneq (,$(filter $(DEB_BUILD_ARCH),hurd-i386 kfreebsd-amd64 kfreebsd-i386 ppc64)) @@ -55,8 +51,7 @@ else dh_auto_test endif -override_dh_install: - dh_install +execute_after_dh_install: rm -rf debian/python3-fiona/usr/bin debian/fiona.1: View it on GitLab: https://salsa.debian.org/debian-gis-team/fiona/-/compare/d80329c495fd8ea1fcaee080bf6c49a48425fdc9...b21a653e6f6e69fb89109aaf7aa4cc2829b9be59 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/fiona/-/compare/d80329c495fd8ea1fcaee080bf6c49a48425fdc9...b21a653e6f6e69fb89109aaf7aa4cc2829b9be59 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
