Skip to content

Commit 1fe0893

Browse files
authored
ci/maint: unblock fsspec and s3 tests (#339)
* update how we connect to s3 in ci * update region * use other bucket w creds * check on databricks older dependency * streamline dependencies * debug why skip isnt working * move up debug statement * check if underlying board protocol is dbc * check hasattr first * maybe fsspec changed? * Update pyproject.toml * Update pyproject.toml
1 parent bdb58e1 commit 1fe0893

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ jobs:
6060
project_id: siuba-tests
6161
service_account_key: ${{ secrets.GCP_SA_KEY }}
6262
export_default_credentials: true
63-
6463
- name: Run tests
6564
shell: bash
6665
run: |

docker-compose.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '3.1'
2-
31
services:
42

53
rsconnect:

pins/tests/helpers.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
BOARD_CONFIG = {
2828
"file": {"path": ["PINS_TEST_FILE__PATH", None]},
29-
"s3": {"path": ["PINS_TEST_S3__PATH", "ci-pins"]},
29+
"s3": {"path": ["PINS_TEST_S3__PATH", "pins-test-hadley"]},
3030
"gcs": {"path": ["PINS_TEST_GCS__PATH", "pins-python"]},
3131
"abfs": {"path": ["PINS_TEST_AZURE__PATH", "ci-pins"]},
3232
"rsc": {"path": ["PINS_TEST_RSC__PATH", RSC_SERVER_URL]},
@@ -65,7 +65,10 @@ def wrapper(*args, **kwargs):
6565
board = arg_value
6666
break
6767

68-
if board and board.fs.protocol == "dbc":
68+
if board and (
69+
board.fs.protocol == "dbc"
70+
or (hasattr(board.fs, "fs") and board.fs.fs.protocol == "dbc")
71+
):
6972
pytest.skip("All Databricks tests must be read only")
7073

7174
return func(*args, **kwargs)

pyproject.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ requires-python = ">=3.9"
2121
dynamic = ["version"]
2222
dependencies = [
2323
"appdirs<2", # Using appdirs rather than platformdirs is deliberate, see https://github.com/rstudio/pins-python/pull/239
24-
"fsspec>=2022.2",
24+
"fsspec>=2022.2,<2025.9",
2525
"humanize>=1",
2626
"importlib-metadata>=4.4",
2727
"importlib-resources>=1.3",
@@ -37,13 +37,13 @@ dependencies = [
3737

3838
[project.optional-dependencies]
3939
aws = ["s3fs"]
40-
azure = ["adlfs"]
40+
azure = ["adlfs>=2024.4.1"]
4141
check = [
4242
"pre-commit",
4343
"pyright==1.1.372", # Pinned; manually sync with .github/workflows/code-checks.yml
4444
"ruff==0.5.4", # Pinned; manually sync with pre-commit-config.yaml
4545
"types-appdirs",
46-
"databricks-sdk"
46+
"pins[databricks]"
4747
]
4848
databricks = ["databricks-sdk"]
4949
doc = [
@@ -55,18 +55,18 @@ doc = [
5555
]
5656
gcs = ["gcsfs"]
5757
test = [
58-
"adlfs>=2024.4.1",
58+
"pins[azure]",
59+
"pins[gcs]",
60+
"pins[databricks]",
61+
"pins[aws]",
5962
"fastparquet",
60-
"gcsfs",
6163
"pip-tools",
6264
"pyarrow",
6365
"pytest==7.1.3",
6466
"pytest-cases",
6567
"pytest-dotenv",
6668
"pytest-parallel",
67-
"s3fs",
6869
"rdata",
69-
"databricks-sdk",
7070
]
7171

7272
[build-system]

0 commit comments

Comments
 (0)