From ad2ae0c5289f17eeb4914d1a9479441a0119aa0e Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Oct 23 2022 04:26:39 +0000
Subject: Update to latest version (#2136303)


---

diff --git a/.gitignore b/.gitignore
index ae9f785..352b026 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@
 /rasterio-1.2.10.tar.gz
 /rasterio-1.3.0.tar.gz
 /rasterio-1.3.2.tar.gz
+/rasterio-1.3.3.tar.gz
diff --git a/0001-Loosen-up-build-requirements.patch b/0001-Loosen-up-build-requirements.patch
index 1799690..653cb54 100644
--- a/0001-Loosen-up-build-requirements.patch
+++ b/0001-Loosen-up-build-requirements.patch
@@ -1,7 +1,7 @@
-From 95aed27c949feb98fa0f4a2024dcfb8b106219b6 Mon Sep 17 00:00:00 2001
+From 94535d831682c173950a49464f7ac27203d88012 Mon Sep 17 00:00:00 2001
 From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
 Date: Wed, 8 Sep 2021 04:47:08 -0400
-Subject: [PATCH] Loosen up build requirements
+Subject: [PATCH 1/2] Loosen up build requirements
 
 And drop coverage dependencies.
 
@@ -12,18 +12,18 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
  2 files changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/pyproject.toml b/pyproject.toml
-index ded80825..c9714462 100644
+index 39133c93..c9714462 100644
 --- a/pyproject.toml
 +++ b/pyproject.toml
 @@ -1,5 +1,5 @@
  [build-system]
--requires = ["setuptools", "wheel", "cython~=0.29.24", "oldest-supported-numpy"]
+-requires = ["setuptools", "wheel", "cython>=0.29.29", "oldest-supported-numpy"]
 +requires = ["setuptools", "wheel", "cython~=0.29.24", "numpy"]
  
  [tool.pytest.ini_options]
  markers = [
 diff --git a/setup.py b/setup.py
-index 3fac7e4d..79bf8271 100755
+index 407e1cc6..8df095e8 100755
 --- a/setup.py
 +++ b/setup.py
 @@ -282,7 +282,6 @@ extra_reqs = {
diff --git a/0002-Don-t-used-fixed-port-for-test-server.patch b/0002-Don-t-used-fixed-port-for-test-server.patch
new file mode 100644
index 0000000..1ead08b
--- /dev/null
+++ b/0002-Don-t-used-fixed-port-for-test-server.patch
@@ -0,0 +1,41 @@
+From ba2a68371ec87687880a5bd5f84b524a401a4dd4 Mon Sep 17 00:00:00 2001
+From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+Date: Sun, 23 Oct 2022 00:01:40 -0400
+Subject: [PATCH 2/2] Don't used fixed port for test server
+
+Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
+---
+ tests/test_warp.py | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/tests/test_warp.py b/tests/test_warp.py
+index bc86e14d..cf12dad0 100644
+--- a/tests/test_warp.py
++++ b/tests/test_warp.py
+@@ -1966,12 +1966,11 @@ def http_error_server(data):
+     import multiprocessing
+     import http.server
+ 
+-    PORT = 8000
+     Handler = functools.partial(RangeRequestErrorHandler, directory=str(data))
+-    httpd = http.server.HTTPServer(("", PORT), Handler)
++    httpd = http.server.HTTPServer(("", 0), Handler)
+     p = multiprocessing.Process(target=httpd.serve_forever)
+     p.start()
+-    yield
++    yield f'{httpd.server_name}:{httpd.server_port}'
+     p.terminate()
+     p.join()
+ 
+@@ -1984,7 +1983,7 @@ def test_reproject_error_propagation(http_error_server, caplog):
+     """Propagate errors up from ChunkAndWarpMulti and check for a retry."""
+ 
+     with rasterio.open(
+-        "/vsicurl?max_retry=1&retry_delay=.1&url=http://localhost:8000/RGB.byte.tif"
++        f"/vsicurl?max_retry=1&retry_delay=.1&url=http://{http_error_server}/RGB.byte.tif"
+     ) as src:
+         out = np.zeros((src.count, src.height, src.width), dtype="uint8")
+ 
+-- 
+2.36.1
+
diff --git a/python-rasterio.spec b/python-rasterio.spec
index d46518a..4aab2f9 100644
--- a/python-rasterio.spec
+++ b/python-rasterio.spec
@@ -1,7 +1,7 @@
 %global srcname rasterio
 
 Name:           python-%{srcname}
-Version:        1.3.2
+Version:        1.3.3
 Release:        %autorelease
 Summary:        Fast and direct raster I/O for use with Numpy and SciPy
 
@@ -9,7 +9,9 @@ License:        BSD
 URL:            https://github.com/mapbox/rasterio
 # PyPI tarball doesn't include test data.
 Source0:        https://github.com/mapbox/rasterio/archive/%{version}/%{srcname}-%{version}.tar.gz
-Patch0001:      0001-Loosen-up-build-requirements.patch
+Patch:          0001-Loosen-up-build-requirements.patch
+# https://github.com/rasterio/rasterio/pull/2619
+Patch:          0002-Don-t-used-fixed-port-for-test-server.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  gdal >= 1.11
@@ -55,13 +57,10 @@ BuildRequires:  python3-devel
 %check
 rm -r %{srcname}  # Don't try unbuilt copy.
 
-# Skip tests on s390x, GEOS is broken on that arch and results in test failures
-%ifnarch s390x
 # test_outer_boundless_pixel_fidelity is very flaky, so skip it.
 # Skip debian tests since we are not on debian
 %{pytest} -ra -m 'not network and not wheel' \
     -k 'not test_outer_boundless_pixel_fidelity and not debian'
-%endif
 
 
 %files -n python3-%{srcname} -f %{pyproject_files}
diff --git a/sources b/sources
index 12e92cb..19474c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rasterio-1.3.2.tar.gz) = 9f1bf17f006ae837b92278eb43a630397b44e669d1fe7e5543de65a6533a7cebf36dda6c3346bdb4b07d85a1891b7904517b91bbc47929c189e355782938afee
+SHA512 (rasterio-1.3.3.tar.gz) = 4504a58f35c225178d7261dc0a6016c3c23608f19aa29678553227f73adbc6cec03e3986168785c9c49e1222a679802ba1852a1b377b2816248b40933b1d4ffa