Merge branch 'rstudio:main' into feature/remove-3pt7-workaround-syntax

CONTRIBUTING.md

@@ -49,6 +49,13 @@ pytest pins -m 'not fs_rsc'
 
 # run only local filesystem backend tests
 pytest pins -m 'fs_file'
+
+# run all tests except those for S3 and GCS
+pytest pins -m 'not fs_s3 and not fs_gcs'
+
+# run all tests except those using data on GitHub
+# n.b. doctests cannot have marks https://github.com/pytest-dev/pytest/issues/5794
+pytest pins -m 'not skip_on_github' -k 'not pins.boards.BoardManual'
 ```
 
 There are two important details to note for testing:

MAINTAINERS.md

@@ -1,5 +1,5 @@
 # Who maintains pins
 
-The pins-python package was is currently maintained by Isabel Zimmerman <[email protected]>. [Posit Software, PBC](https://posit.co/products/open-source/) is a copyright holder and funder of this package.
+The pins-python package is currently maintained by Isabel Zimmerman <[email protected]>. [Posit Software, PBC](https://posit.co/products/open-source/) is a copyright holder and funder of this package.
 
 Several individuals in the community have taken an active role in helping to maintain this package and submit fixes. Those individuals are shown in the git changelog.

pins/constructors.py

@@ -58,11 +58,11 @@ def board_deparse(board: BaseBoard):
         return f"board_connect(server_url={repr(url)}{allow_pickle})"
     elif prot in ["file", ("file", "local")]:
         return f"board_folder({repr(board.board)}{allow_pickle})"
-    elif prot in [["s3", "s3a"], ("s3", "s3a")]:
+    elif set(prot) == {"s3", "s3a"}:
         return f"board_s3({repr(board.board)}{allow_pickle})"
     elif prot == "abfs":
         return f"board_azure({repr(board.board)}{allow_pickle})"
-    elif prot == ("gcs", "gs"):
+    elif set(prot) == {"gcs", "gs"} or prot == "gs":
         return f"board_gcs({repr(board.board)}{allow_pickle})"
     elif prot == "http":
         return f"board_url({repr(board.board)}, {board.pin_paths}{allow_pickle})"

pins/tests/test_constructors.py

@@ -47,6 +47,8 @@ def construct_from_board(board):
         )
     elif fs_name == "abfs":
         board = c.board_azure(board.board)
+    elif fs_name == "gs":
+        board = c.board_gcs(board.board)
     else:
         board = getattr(c, f"board_{fs_name}")(board.board)