Merge branch 'maint-1.9' into issue1270

.github/workflows/rstcheck.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Python
         uses: actions/setup-python@v2

.github/workflows/test_gdal_latest.yaml → .github/workflows/test_gdal_latest.yml

@@ -24,7 +24,7 @@ jobs:
       GDAL_DATA: ${{ github.workspace }}/gdal_install/share/gdal
       LD_LIBRARY_PATH: "${{ github.workspace }}/gdal_install/lib/:${LD_LIBRARY_PATH}"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Update
         run: |
           apt-get update

.github/workflows/tests.yaml → .github/workflows/tests.yml

@@ -53,7 +53,7 @@ jobs:
             gdal-version: '3.7.1'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Update
         run: |
@@ -98,7 +98,7 @@ jobs:
           - os: ubuntu-latest
             python-version: '3.10'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Conda Setup
         uses: s-weigand/setup-conda@v1

.readthedocs.yaml

@@ -0,0 +1,9 @@
+version: 2
+
+build:
+  os: "ubuntu-22.04"
+  tools:
+    python: "mambaforge-22.9"
+
+conda:
+  environment: environment.yml

docs/manual.rst

@@ -254,10 +254,9 @@ collection to get back to the beginning.
 .. admonition:: File Encoding
 
    The format drivers will attempt to detect the encoding of your data, but may
-   fail. In my experience GDAL 1.7.2 (for example) doesn't detect that the
-   encoding of the Natural Earth dataset is Windows-1252. In this case, the
-   proper encoding can be specified explicitly by using the ``encoding``
-   keyword parameter of :py:func:`fiona.open`: ``encoding='Windows-1252'``.
+   fail. In this case, the proper encoding can be specified explicitly by using
+   the ``encoding`` keyword parameter of :py:func:`fiona.open`, for example:
+   ``encoding='Windows-1252'``.
 
    New in version 0.9.1.
 

fiona/__init__.py

@@ -135,7 +135,7 @@ def open(
 
     The drivers used by Fiona will try to detect the encoding of data
     files. If they fail, you may provide the proper ``encoding``, such
-    as 'Windows-1252' for the Natural Earth datasets.
+    as 'Windows-1252' for the original Natural Earth datasets.
 
     When the provided path is to a file containing multiple named layers
     of data, a layer can be singled out by ``layer``.

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)