From 2110def8d00b7c39f9ee23925420dc994591380e Mon Sep 17 00:00:00 2001 From: Charles Graham Date: Thu, 22 Jan 2026 17:44:29 -0600 Subject: [PATCH 1/6] Update days back for usgs potential fix for #100 --- cwmscli/usgs/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cwmscli/usgs/__init__.py b/cwmscli/usgs/__init__.py index c42d8b4..ac25c41 100644 --- a/cwmscli/usgs/__init__.py +++ b/cwmscli/usgs/__init__.py @@ -124,7 +124,8 @@ def ratingsinifileimport(filename, api_root, api_key, api_key_loc): @click.option( "-c", "--days-back-collected", - default="365", + default=365, + type=float, help="Days back from current time measurements have been collected. Can be integer value", ) @office_option From a5c83749023ce24767a5542e008d29dcfeb6bba9 Mon Sep 17 00:00:00 2001 From: "Charles Graham, SWT" Date: Fri, 23 Jan 2026 16:03:05 +0000 Subject: [PATCH 2/6] Fix type for days back modified arg --- cwmscli/usgs/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cwmscli/usgs/__init__.py b/cwmscli/usgs/__init__.py index ac25c41..d292500 100644 --- a/cwmscli/usgs/__init__.py +++ b/cwmscli/usgs/__init__.py @@ -118,7 +118,8 @@ def ratingsinifileimport(filename, api_root, api_key, api_key_loc): @click.option( "-d", "--days-back-modified", - default="2", + default=2, + type=float, help="Days back from current time measurements have been modified in USGS database. Can be integer value", ) @click.option( From c3a604409950feb2276bc0bb6ad752c62259419b Mon Sep 17 00:00:00 2001 From: "Charles Graham, SWT" Date: Fri, 23 Jan 2026 16:10:42 +0000 Subject: [PATCH 3/6] Fix formatting issue with docs --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 455585f..0b9ba02 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - - uses: actions/setup-python@v6 + - uses: actions/setup-python@v6 with: python-version: "3.12" - name: Install deps From 1dbffe185c6a706e8fc3e9c7c990c571fc1646ce Mon Sep 17 00:00:00 2001 From: "Charles Graham, SWT" Date: Fri, 23 Jan 2026 16:11:01 +0000 Subject: [PATCH 4/6] Target a specific version with code-check black to prevent de-sync from the local version. Stable would update ahead of the local. --- .github/workflows/code-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/code-check.yml b/.github/workflows/code-check.yml index f28ba95..eb66b54 100644 --- a/.github/workflows/code-check.yml +++ b/.github/workflows/code-check.yml @@ -15,5 +15,5 @@ jobs: # below simply check the source code and fail if they find any files that need to be # formatted. The code is not automatically reformatted like it is when running the # pre-commit hooks. - - uses: psf/black@stable + - uses: psf/black@24.2.0 - uses: isort/isort-action@v1 From 366c80620941518a6f5bc69539375c92df25c0f1 Mon Sep 17 00:00:00 2001 From: msweier Date: Fri, 23 Jan 2026 10:24:13 -0600 Subject: [PATCH 5/6] ignore user pref --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b7faf40..155a712 100644 --- a/.gitignore +++ b/.gitignore @@ -205,3 +205,4 @@ cython_debug/ marimo/_static/ marimo/_lsp/ __marimo__/ +.vscode/ From 722dcc96dd69aaee6223e98f4680c2588803de87 Mon Sep 17 00:00:00 2001 From: msweier Date: Fri, 23 Jan 2026 10:46:06 -0600 Subject: [PATCH 6/6] cast to int --- cwmscli/usgs/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cwmscli/usgs/__init__.py b/cwmscli/usgs/__init__.py index d292500..fccce66 100644 --- a/cwmscli/usgs/__init__.py +++ b/cwmscli/usgs/__init__.py @@ -119,14 +119,14 @@ def ratingsinifileimport(filename, api_root, api_key, api_key_loc): "-d", "--days-back-modified", default=2, - type=float, + type=int, help="Days back from current time measurements have been modified in USGS database. Can be integer value", ) @click.option( "-c", "--days-back-collected", default=365, - type=float, + type=int, help="Days back from current time measurements have been collected. Can be integer value", ) @office_option