Skip to content

Commit

Permalink
Merge branch 'list_candidates' of github.com:jeffhsu3/snakemake-stora…
Browse files Browse the repository at this point in the history
…ge-plugin-gcs into list_candidates
  • Loading branch information
jeffhsu3 committed Mar 14, 2024
2 parents 336063f + 02bc04c commit 8173850
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 11 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [0.1.4](https://github.com/snakemake/snakemake-storage-plugin-gcs/compare/v0.1.3...v0.1.4) (2024-03-08)


### Bug Fixes

* repair GCS query string ([#26](https://github.com/snakemake/snakemake-storage-plugin-gcs/issues/26)) ([f61e8d0](https://github.com/snakemake/snakemake-storage-plugin-gcs/commit/f61e8d0e3b83d3b03ad2eb41ceb0c5902345ef48))

## [0.1.3](https://github.com/snakemake/snakemake-storage-plugin-gcs/compare/v0.1.2...v0.1.3) (2023-12-20)


Expand Down
33 changes: 27 additions & 6 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "snakemake-storage-plugin-gcs"
version = "0.1.3"
version = "0.1.4"
description = "A Snakemake storage plugin for Google Cloud Storage"
authors = [
"Vanessa Sochat <[email protected]>",
Expand All @@ -14,14 +14,16 @@ keywords = ["snakemake", "storage", "plugin", "google cloud storage"]

[tool.poetry.dependencies]
python = "^3.11"
snakemake-interface-common = "^1.14.2"
snakemake-interface-storage-plugins = "^3.0.0"
google-cloud-storage = "^2.12.0"
google-crc32c = "^1.1.2"

[tool.poetry.group.dev.dependencies]
black = "^23.9.1"
flake8 = "^6.1.0"
coverage = "^7.3.1"
pytest = "^7.4.2"
pytest = ">=7.4.2,<9.0.0"
snakemake = {git="https://github.com/snakemake/snakemake.git"}

[build-system]
Expand Down
6 changes: 3 additions & 3 deletions snakemake_storage_plugin_gcs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,11 +192,11 @@ def is_valid_query(cls, query: str) -> StorageQueryValidationResult:
valid=False,
reason=f"cannot be parsed as URL ({e})",
)
if parsed.scheme != "gcs":
if parsed.scheme != "gs":
return StorageQueryValidationResult(
query=query,
valid=False,
reason="must start with gcs (gcs://...)",
reason="must start with gs (gs://...)",
)
return StorageQueryValidationResult(
query=query,
Expand All @@ -210,7 +210,7 @@ def example_queries(cls) -> List[ExampleQuery]:
"""
return [
ExampleQuery(
query="gcs://mybucket/myfile.txt",
query="gs://mybucket/myfile.txt",
type=QueryType.ANY,
description="A file in an google storage (GCS) bucket",
)
Expand Down

0 comments on commit 8173850

Please sign in to comment.