diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 26cf21b..e31c51a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,26 +3,30 @@ repos: hooks: - id: black name: black - entry: poetry run black - language: system + entry: black + language: python + additional_dependencies: [black] types: [file, python] exclude: ^cwmscli/_generated/ownership_data\.py$ - id: isort name: isort - entry: poetry run isort - language: system + entry: isort + language: python + additional_dependencies: [isort] types: [file, python] exclude: ^cwmscli/_generated/ownership_data\.py$ - id: yamlfix name: yamlfix - entry: poetry run yamlfix - language: system + entry: yamlfix + language: python + additional_dependencies: [yamlfix] types: [file, yaml] - id: ownership-sync name: generated ownership files - entry: poetry run python scripts/sync_ownership.py --check - language: system + entry: python scripts/sync_ownership.py --check + language: python + additional_dependencies: [poetry] pass_filenames: false diff --git a/.pre-commit-config.yaml.org b/.pre-commit-config.yaml.org new file mode 100644 index 0000000..26cf21b --- /dev/null +++ b/.pre-commit-config.yaml.org @@ -0,0 +1,28 @@ +repos: + - repo: local + hooks: + - id: black + name: black + entry: poetry run black + language: system + types: [file, python] + exclude: ^cwmscli/_generated/ownership_data\.py$ + + - id: isort + name: isort + entry: poetry run isort + language: system + types: [file, python] + exclude: ^cwmscli/_generated/ownership_data\.py$ + + - id: yamlfix + name: yamlfix + entry: poetry run yamlfix + language: system + types: [file, yaml] + + - id: ownership-sync + name: generated ownership files + entry: poetry run python scripts/sync_ownership.py --check + language: system + pass_filenames: false diff --git a/cwmscli/usgs/getusgs_cda.py b/cwmscli/usgs/getusgs_cda.py index 19db973..1db3350 100644 --- a/cwmscli/usgs/getusgs_cda.py +++ b/cwmscli/usgs/getusgs_cda.py @@ -370,6 +370,16 @@ def CWMS_writeData(USGS_ts, USGS_data, USGS_data_method, days_back): office = row["office-id"] values["quality-code"] = 0 + # 15 minute conversion to allow storing smaller interval data (eg. 5 minute) as 15 minute data + if ts_id.split(".")[3] == "15Minutes": + values_dt = values.copy() + values_dt["date-time"] = pd.to_datetime( + values_dt["date-time"] + ) + values_dt.set_index("date-time", inplace=True) + values15 = values_dt.resample("15min").first() + values = values15.reset_index() + # write values to CWMS database try: data = cwms.timeseries_df_to_json(