From e113c85a12397d3b7a22fea6de70cc6b06508512 Mon Sep 17 00:00:00 2001 From: Sean Gillies Date: Sat, 9 Mar 2024 10:08:22 -0700 Subject: [PATCH] Update "master" to "main" (#1350) Resolves #1349 --- .github/workflows/test_gdal_latest.yml | 2 +- .github/workflows/tests.yml | 4 ++-- CHANGES.txt | 2 +- README.rst | 8 ++++---- tests/test_collection.py | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test_gdal_latest.yml b/.github/workflows/test_gdal_latest.yml index efda4b942..348d5d014 100644 --- a/.github/workflows/test_gdal_latest.yml +++ b/.github/workflows/test_gdal_latest.yml @@ -2,7 +2,7 @@ name: Test GDAL Latest on: push: - branches: [ master, 'maint-*' ] + branches: [ main, 'maint-*' ] schedule: - cron: '0 0 * * 0' pull_request: # also build on PRs touching this file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index df555d7f7..4a182fd82 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,7 +2,7 @@ name: Tests on: push: - branches: [ master, 'maint-*' ] + branches: [ main, 'maint-*' ] paths: - '.github/workflows/tests.yaml' - 'requirements*.txt' @@ -14,7 +14,7 @@ on: - 'fiona/**' - 'tests/**' pull_request: - branches: [ master, 'maint-*' ] + branches: [ main, 'maint-*' ] paths: - '.github/workflows/tests.yaml' - 'requirements*.txt' diff --git a/CHANGES.txt b/CHANGES.txt index e05997eb7..362df1bf3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -447,7 +447,7 @@ Upcoming changes: 1.9 is intended to be backwards compatible with 1.8 except where user code tests `isinstance(feature, dict)`. In version 2.0 the new Feature, Geometry, and Properties classes will become immutable mappings. See - https://github.com/Toblerity/fiona-rfc/blob/master/rfc/0001-fiona-2-0-changes.md + https://github.com/Toblerity/fiona-rfc/blob/main/rfc/0001-fiona-2-0-changes.md for more discussion of the upcoming changes for version 2.0. 1.8.6 (2019-03-18) diff --git a/README.rst b/README.rst index d29fae9df..ecc232da6 100644 --- a/README.rst +++ b/README.rst @@ -2,8 +2,8 @@ Fiona ===== -.. image:: https://github.com/Toblerity/Fiona/workflows/Tests/badge.svg?branch=master - :target: https://github.com/Toblerity/Fiona/actions?query=branch%3Amaster +.. image:: https://github.com/Toblerity/Fiona/workflows/Tests/badge.svg?branch=main + :target: https://github.com/Toblerity/Fiona/actions?query=branch%3Amain Fiona streams simple feature data to and from GIS formats like GeoPackage and Shapefile. @@ -103,7 +103,7 @@ CLI Usage ========= Fiona's command line interface, named "fio", is documented at `docs/cli.rst -`__. The CLI has a +`__. The CLI has a number of different commands. Its ``fio cat`` command streams GeoJSON features from any dataset. @@ -120,6 +120,6 @@ For more details about this project, please see: * Fiona `home page `__ * `Docs and manual `__ -* `Examples `__ +* `Examples `__ * Main `user discussion group `__ * `Developers discussion group `__ diff --git a/tests/test_collection.py b/tests/test_collection.py index 105c816ac..b7d9d443a 100644 --- a/tests/test_collection.py +++ b/tests/test_collection.py @@ -1034,12 +1034,12 @@ def test_open_kwargs(tmpdir, path_coutwildrnp_shp): @pytest.mark.network def test_collection_http(): ds = fiona.Collection( - "https://raw.githubusercontent.com/Toblerity/Fiona/master/tests/data/coutwildrnp.shp", + "https://raw.githubusercontent.com/Toblerity/Fiona/main/tests/data/coutwildrnp.shp", vsi="https", ) assert ( ds.path - == "/vsicurl/https://raw.githubusercontent.com/Toblerity/Fiona/master/tests/data/coutwildrnp.shp" + == "/vsicurl/https://raw.githubusercontent.com/Toblerity/Fiona/main/tests/data/coutwildrnp.shp" ) assert len(ds) == 67 @@ -1047,10 +1047,10 @@ def test_collection_http(): @pytest.mark.network def test_collection_zip_http(): ds = fiona.Collection( - "https://raw.githubusercontent.com/Toblerity/Fiona/master/tests/data/coutwildrnp.zip", + "https://raw.githubusercontent.com/Toblerity/Fiona/main/tests/data/coutwildrnp.zip", vsi="zip+https", ) - assert ds.path == "/vsizip/vsicurl/https://raw.githubusercontent.com/Toblerity/Fiona/master/tests/data/coutwildrnp.zip" + assert ds.path == "/vsizip/vsicurl/https://raw.githubusercontent.com/Toblerity/Fiona/main/tests/data/coutwildrnp.zip" assert len(ds) == 67