[Git][debian-gis-team/pyresample][master] 3 commits: Switch to pytest-lazy-fixtures

[Antonio Valentino (@antonio.valentino)]

Antonio Valentino pushed to branch master at Debian GIS Project / pyresample


Commits:
fbde6358 by Antonio Valentino at 2024-05-15T19:56:18+00:00
Switch to pytest-lazy-fixtures

- - - - -
5b9a13cf by Antonio Valentino at 2024-05-15T20:16:14+00:00
New 0006-Switch-to-pythest-lazy-fixtures.patch

- - - - -
f250affb by Antonio Valentino at 2024-05-15T20:16:21+00:00
Set distribution to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/0006-Switch-to-pythest-lazy-fixtures.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,17 @@
-pyresample (1.28.3-2) UNRELEASED; urgency=medium
+pyresample (1.28.3-2) unstable; urgency=medium
 
-  * Team upload.
+  [ Bas Couwenberg ]
   * Use pybuild --print to get build_dir path.
 
- -- Bas Couwenberg <sebastic at debian.org>  Sat, 11 May 2024 21:16:30 +0200
+  [ Antonio Valentino ]
+  * debian/control:
+    - Depend on pytest-lazy-fixtures instead of pythest-lazy-fixture.
+  * debian/rules:
+    - Re-enable tests using lazy-fixtures.
+  * debian/patches:
+    - New 0006-Switch-to-pythest-lazy-fixtures.patch.
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Wed, 15 May 2024 19:56:34 +0000
 
 pyresample (1.28.3-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -26,7 +26,7 @@ Build-Depends: cython3,
                python3-pykdtree,
                python3-pyproj,
                python3-pytest <!nocheck>,
-               python3-pytest-lazy-fixture <!nocheck>,
+               python3-pytest-lazy-fixtures <!nocheck>,
                python3-rasterio,
                python3-scipy,
                python3-setuptools,


=====================================
debian/patches/0006-Switch-to-pythest-lazy-fixtures.patch
=====================================
@@ -0,0 +1,36 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Wed, 15 May 2024 20:06:45 +0000
+Subject: Switch to pythest-lazy-fixtures
+
+Forwarded: not-needed
+---
+ pyresample/test/test_resamplers/test_nearest.py   | 2 +-
+ pyresample/test/test_resamplers/test_resampler.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pyresample/test/test_resamplers/test_nearest.py b/pyresample/test/test_resamplers/test_nearest.py
+index e02aa9d..4e3c9c6 100644
+--- a/pyresample/test/test_resamplers/test_nearest.py
++++ b/pyresample/test/test_resamplers/test_nearest.py
+@@ -24,7 +24,7 @@ import dask.array as da
+ import numpy as np
+ import pytest
+ import xarray as xr
+-from pytest_lazyfixture import lazy_fixture
++from pytest_lazy_fixtures import lf as lazy_fixture
+ 
+ from pyresample.future.geometry import AreaDefinition, SwathDefinition
+ from pyresample.future.resamplers import KDTreeNearestXarrayResampler
+diff --git a/pyresample/test/test_resamplers/test_resampler.py b/pyresample/test/test_resamplers/test_resampler.py
+index b5e9751..350d9ad 100644
+--- a/pyresample/test/test_resamplers/test_resampler.py
++++ b/pyresample/test/test_resamplers/test_resampler.py
+@@ -24,7 +24,7 @@ import dask.array as da
+ import numpy as np
+ import pytest
+ import xarray as xr
+-from pytest_lazyfixture import lazy_fixture
++from pytest_lazy_fixtures import lf as lazy_fixture
+ 
+ from pyresample.future.resamplers.resampler import Resampler
+ from pyresample.geometry import AreaDefinition, SwathDefinition


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@
 0003-Fix-mathjax-path.patch
 0004-Fix-privacy-breachs.patch
 0005-Compatibility-with-numpy-2.0.patch
+0006-Switch-to-pythest-lazy-fixtures.patch


=====================================
debian/rules
=====================================
@@ -7,12 +7,6 @@
 # Enable hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-ifneq (,${PYBUILD_AUTOPKGTEST})
-TESTDIR=/usr/lib/python3/dist-packages/pyresample/test
-else
-TESTDIR=pyresample/test
-endif
-
 export PYBUILD_NAME=pyresample
 export USE_CYTHON=True
 export PYBUILD_TEST_ARGS=\
@@ -22,17 +16,6 @@ and not test_to_odc_geobox \
 and not test_area_def_cartopy_installed \
 and not test_area_repr_w_static_files \
 and not test_area_repr_wo_static_files" \
---ignore $(TESTDIR)/test_resamplers/test_nearest.py \
---ignore $(TESTDIR)/test_resamplers/test_resampler.py \
---ignore $(TESTDIR)/test_dask_ewa.py \
---ignore $(TESTDIR)/test_formatting.py \
---ignore $(TESTDIR)/test_geometry/test_area.py \
---ignore $(TESTDIR)/test_geometry/test_area_boundary.py \
---ignore $(TESTDIR)/test_geometry/test_swath.py \
---ignore $(TESTDIR)/test_geometry/test_swath_boundary.py \
---ignore $(TESTDIR)/test_geometry_legacy.py \
---ignore $(TESTDIR)/test_resamplers/test_resampler_registry.py \
---ignore $(TESTDIR)/test_utils.py \
 --pyargs ${PYBUILD_NAME}
 
 %:



View it on GitLab: https://salsa.debian.org/debian-gis-team/pyresample/-/compare/5ca56bebbd9dbc421dc0d5d39d9c925705bca655...f250affb5cd311746c24fa46f355567857fed128

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pyresample/-/compare/5ca56bebbd9dbc421dc0d5d39d9c925705bca655...f250affb5cd311746c24fa46f355567857fed128
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240515/75d8b841/attachment-0001.htm>