Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.1'

services:

rsconnect:
Expand Down
7 changes: 5 additions & 2 deletions pins/tests/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]},
Expand Down Expand Up @@ -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)
Expand Down
16 changes: 8 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -37,15 +37,15 @@ 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"]
databricks = ["databricks-sdk<0.56.0"]
doc = [
"ipykernel",
"ipython<=8.12",
Expand All @@ -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]
Expand Down
Loading