diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e08d5200..7720d1c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,6 @@ jobs: project_id: siuba-tests service_account_key: ${{ secrets.GCP_SA_KEY }} export_default_credentials: true - - name: Run tests shell: bash run: | diff --git a/docker-compose.yml b/docker-compose.yml index c0292d52..336b707e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.1' - services: rsconnect: diff --git a/pins/tests/helpers.py b/pins/tests/helpers.py index 38fd0f18..3c763c7f 100644 --- a/pins/tests/helpers.py +++ b/pins/tests/helpers.py @@ -26,7 +26,7 @@ BOARD_CONFIG = { "file": {"path": ["PINS_TEST_FILE__PATH", None]}, - "s3": {"path": ["PINS_TEST_S3__PATH", "ci-pins"]}, + "s3": {"path": ["PINS_TEST_S3__PATH", "pins-test-hadley"]}, "gcs": {"path": ["PINS_TEST_GCS__PATH", "pins-python"]}, "abfs": {"path": ["PINS_TEST_AZURE__PATH", "ci-pins"]}, "rsc": {"path": ["PINS_TEST_RSC__PATH", RSC_SERVER_URL]}, @@ -65,7 +65,10 @@ def wrapper(*args, **kwargs): board = arg_value break - if board and board.fs.protocol == "dbc": + if board and ( + board.fs.protocol == "dbc" + or (hasattr(board.fs, "fs") and board.fs.fs.protocol == "dbc") + ): pytest.skip("All Databricks tests must be read only") return func(*args, **kwargs) diff --git a/pyproject.toml b/pyproject.toml index 1deb7bb6..330dd5d6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ requires-python = ">=3.9" dynamic = ["version"] dependencies = [ "appdirs<2", # Using appdirs rather than platformdirs is deliberate, see https://github.com/rstudio/pins-python/pull/239 - "fsspec>=2022.2", + "fsspec>=2022.2,<2025.9", "humanize>=1", "importlib-metadata>=4.4", "importlib-resources>=1.3", @@ -37,13 +37,13 @@ dependencies = [ [project.optional-dependencies] aws = ["s3fs"] -azure = ["adlfs"] +azure = ["adlfs>=2024.4.1"] check = [ "pre-commit", "pyright==1.1.372", # Pinned; manually sync with .github/workflows/code-checks.yml "ruff==0.5.4", # Pinned; manually sync with pre-commit-config.yaml "types-appdirs", - "databricks-sdk" + "pins[databricks]" ] databricks = ["databricks-sdk"] doc = [ @@ -55,18 +55,18 @@ doc = [ ] gcs = ["gcsfs"] test = [ - "adlfs>=2024.4.1", + "pins[azure]", + "pins[gcs]", + "pins[databricks]", + "pins[aws]", "fastparquet", - "gcsfs", "pip-tools", "pyarrow", "pytest==7.1.3", "pytest-cases", "pytest-dotenv", "pytest-parallel", - "s3fs", "rdata", - "databricks-sdk", ] [build-system]