Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev into main for 2023-11-16 #3054

Merged
merged 26 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d7e9834
Check if package metadata matches Alembic migrations
jdangerx Nov 8, 2023
2aaafc4
Update docs
jdangerx Nov 9, 2023
ed6455c
Merge pull request #3027 from catalyst-cooperative/test-db-schema
jdangerx Nov 9, 2023
fa096f2
Fix XBRL extraction clobber (#3026)
jdangerx Nov 10, 2023
2e83721
Update black requirement from <23.11,>=23 to >=23,<23.12
dependabot[bot] Nov 13, 2023
6596401
Update dask requirement from <2023.10.2,>=2022.5 to >=2022.5,<2023.11.1
dependabot[bot] Nov 13, 2023
44d5acf
Merge pull request #3039 from catalyst-cooperative/dependabot/pip/dev…
zaneselvans Nov 13, 2023
c5c9ca3
Update dagster-postgres requirement
dependabot[bot] Nov 13, 2023
fc3027f
Merge pull request #3037 from catalyst-cooperative/dependabot/pip/dev…
zaneselvans Nov 13, 2023
6ea776e
Merge pull request #3038 from catalyst-cooperative/dependabot/pip/dev…
zaneselvans Nov 13, 2023
bd96783
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Nov 13, 2023
eac7dbe
Always use tmp path for clobber tests.
jdangerx Nov 13, 2023
3c6c93f
Also use tmp path in test_xbrl2sqlite
jdangerx Nov 13, 2023
c072bf8
Merge pull request #3042 from catalyst-cooperative/pre-commit-ci-upda…
zaneselvans Nov 14, 2023
6cb0793
Merge pull request #3043 from catalyst-cooperative/fix-xbrl-clobber-l…
zaneselvans Nov 14, 2023
dacfcb6
Set up reproducible Python environments with conda-lock (#2968)
zaneselvans Nov 14, 2023
b97b4b8
Update conda-lock.yml and rendered conda environment files.
zaneselvans Nov 14, 2023
29ea06e
Add EIA860 2022 final release data
aesharpe Nov 13, 2023
68f95fc
Add unmapped utility and plant ids and update mcoe row count
aesharpe Nov 14, 2023
3c49a3b
Update conda-lock.yml and rendered conda environment files.
zaneselvans Nov 14, 2023
26ead2a
Merge pull request #3040 from catalyst-cooperative/eia860-2022-final-…
aesharpe Nov 15, 2023
a64a5a5
Update conda-lock.yml and rendered conda environment files.
aesharpe Nov 15, 2023
84337b2
Eia861 2022 final release (#3048)
aesharpe Nov 15, 2023
ecba5be
Update expected row counts for service territory geometry tables.
zaneselvans Nov 15, 2023
944db2c
Merge branch 'main' into nightly-build-2023-11-16
zaneselvans Nov 16, 2023
1e7d29e
Merge branch 'main' into nightly-build-2023-11-16
zaneselvans Nov 16, 2023
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
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@ repos:
# Formatters: hooks that re-write Python & documentation files
####################################################################################
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.4
rev: v0.1.5
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]

# Format the code
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 23.10.1
rev: 23.11.0
hooks:
- id: black
language_version: python3.11
exclude: migrations/.*

- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.3
rev: v3.1.0
hooks:
- id: prettier
types_or: [yaml]
Expand Down
3 changes: 2 additions & 1 deletion docs/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ Dagster Adoption
Data Coverage
^^^^^^^^^^^^^

* Updated :doc:`data_sources/eia860` to include early release data from 2022.
* Updated :doc:`data_sources/eia860` to include final release data from 2022.
* Updated :doc:`data_sources/eia861` to include final release data from 2022.
* Updated :doc:`data_sources/eia923` to include early release data from 2022 and
monthly YTD data as of April 2023.
* Updated :doc:`data_sources/epacems` to switch from the old FTP server to the new
Expand Down
56 changes: 28 additions & 28 deletions environments/conda-linux-64.lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ dependencies:
- colorama=0.4.6=pyhd8ed1ab_0
- crashtest=0.4.1=pyhd8ed1ab_0
- cycler=0.12.1=pyhd8ed1ab_0
- dagster-pipes=1.5.8=pyhd8ed1ab_0
- dagster-pipes=1.5.7=pyhd8ed1ab_0
- dataclasses=0.8=pyhc8e2a94_3
- dbus=1.13.6=h5008d03_3
- debugpy=1.8.0=py311hb755f60_1
Expand Down Expand Up @@ -249,7 +249,7 @@ dependencies:
- pyparsing=3.1.1=pyhd8ed1ab_0
- pysocks=1.7.1=pyha2e5f31_6
- python-dotenv=1.0.0=pyhd8ed1ab_1
- python-fastjsonschema=2.19.0=pyhd8ed1ab_0
- python-fastjsonschema=2.18.1=pyhd8ed1ab_0
- python-json-logger=2.0.7=pyhd8ed1ab_0
- python-multipart=0.0.6=pyhd8ed1ab_0
- python-tzdata=2023.3=pyhd8ed1ab_0
Expand Down Expand Up @@ -283,7 +283,7 @@ dependencies:
- threadpoolctl=3.2.0=pyha21a80b_0
- toml=0.10.2=pyhd8ed1ab_0
- tomli=2.0.1=pyhd8ed1ab_0
- tomlkit=0.12.3=pyha770c72_0
- tomlkit=0.12.2=pyha770c72_0
- toolz=0.12.0=pyhd8ed1ab_0
- toposort=1.10=pyhd8ed1ab_0
- tornado=6.3.3=py311h459d7ec_1
Expand Down Expand Up @@ -379,7 +379,7 @@ dependencies:
- python-slugify=8.0.1=pyhd8ed1ab_2
- pyu2f=0.1.5=pyhd8ed1ab_0
- qtpy=2.4.1=pyhd8ed1ab_0
- referencing=0.31.0=pyhd8ed1ab_0
- referencing=0.30.2=pyhd8ed1ab_0
- restructuredtext_lint=1.4.0=pyhd8ed1ab_0
- rfc3339-validator=0.1.4=pyhd8ed1ab_0
- rsa=4.9=pyhd8ed1ab_0
Expand All @@ -400,8 +400,8 @@ dependencies:
- argon2-cffi-bindings=21.2.0=py311h459d7ec_4
- arrow=1.3.0=pyhd8ed1ab_0
- async-timeout=4.0.3=pyhd8ed1ab_0
- aws-c-s3=0.3.24=h7630044_0
- botocore=1.32.0=pyhd8ed1ab_0
- aws-c-s3=0.3.23=h7630044_1
- botocore=1.31.85=pyhd8ed1ab_0
- branca=0.7.0=pyhd8ed1ab_1
- croniter=2.0.1=pyhd8ed1ab_0
- cryptography=41.0.5=py311h63ff55d_0
Expand All @@ -416,7 +416,7 @@ dependencies:
- harfbuzz=8.3.0=h3d44ed6_0
- httpcore=1.0.2=pyhd8ed1ab_0
- importlib_metadata=6.8.0=hd8ed1ab_0
- jsonschema-specifications=2023.11.1=pyhd8ed1ab_0
- jsonschema-specifications=2023.7.1=pyhd8ed1ab_0
- jupyter_server_terminals=0.4.4=pyhd8ed1ab_1
- kealib=1.5.2=hcd42e92_1
- libnetcdf=4.9.2=nompi_h80fb2b6_112
Expand All @@ -426,7 +426,7 @@ dependencies:
- pbr=6.0.0=pyhd8ed1ab_0
- pendulum=2.1.2=py311h459d7ec_6
- platformdirs=3.11.0=pyhd8ed1ab_0
- poppler=23.11.0=h590f24d_0
- poppler=23.10.0=h590f24d_0
- psycopg2-binary=2.9.7=pyhd8ed1ab_1
- pybtex=0.24.0=pyhd8ed1ab_2
- pydantic=1.10.13=py311h459d7ec_1
Expand All @@ -449,7 +449,7 @@ dependencies:
- alembic=1.12.1=pyhd8ed1ab_0
- arelle-release=2.17.3=pyhd8ed1ab_0
- argon2-cffi=23.1.0=pyhd8ed1ab_0
- aws-crt-cpp=0.24.7=h4712614_1
- aws-crt-cpp=0.24.6=h270613d_0
- black=23.10.1=py311h38be061_0
- bottleneck=1.3.7=py311h1f0f07a_1
- cachecontrol=0.13.1=pyhd8ed1ab_0
Expand All @@ -467,7 +467,7 @@ dependencies:
- isoduration=20.11.0=pyhd8ed1ab_0
- jsonschema=4.19.2=pyhd8ed1ab_0
- jupyter_core=5.5.0=py311h38be061_0
- libgdal=3.8.0=h0a992f2_1
- libgdal=3.7.3=h6f3d308_3
- numba=0.58.1=py311h96b013e_0
- numexpr=2.8.7=py311h039bad6_104
- oauthlib=3.2.2=pyhd8ed1ab_0
Expand All @@ -488,15 +488,15 @@ dependencies:
- typer=0.9.0=pyhd8ed1ab_0
- uvicorn-standard=0.24.0=h38be061_0
- virtualenv=20.24.6=pyhd8ed1ab_0
- aws-sdk-cpp=1.11.182=h8beafcf_7
- boto3=1.29.0=pyhd8ed1ab_0
- aws-sdk-cpp=1.11.182=h771f7cb_6
- boto3=1.28.85=pyhd8ed1ab_0
- cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0
- dagster=1.5.8=pyhd8ed1ab_0
- dagster=1.5.7=pyhd8ed1ab_0
- datasette=0.64.4=pyhd8ed1ab_1
- doc8=1.1.1=pyhd8ed1ab_0
- email-validator=2.1.0.post1=pyhd8ed1ab_0
- frictionless=4.40.8=pyh6c4a22f_0
- gdal=3.8.0=py311h815a124_1
- gdal=3.7.3=py311h815a124_3
- geopandas-base=0.14.1=pyha770c72_0
- google-auth=2.23.4=pyhca7485f_0
- gql-with-requests=3.4.1=pyhd8ed1ab_0
Expand All @@ -515,48 +515,48 @@ dependencies:
- timezonefinder=6.2.0=py311h459d7ec_2
- catalystcoop.ferc_xbrl_extractor=1.2.1=pyhd8ed1ab_0
- conda-lock=2.4.2=pyhd8ed1ab_0
- dagster-graphql=1.5.8=pyhd8ed1ab_0
- dagster-postgres=0.21.8=pyhd8ed1ab_0
- fiona=1.9.5=py311hf8e0aa6_1
- dagster-graphql=1.5.7=pyhd8ed1ab_0
- dagster-postgres=0.21.7=pyhd8ed1ab_0
- fiona=1.9.5=py311hbac4ec9_0
- google-api-core=2.14.0=pyhd8ed1ab_0
- google-auth-oauthlib=1.1.0=pyhd8ed1ab_0
- graphviz=8.1.0=h28d9a01_0
- ipython=8.17.2=pyh41d4057_0
- jupyter_events=0.9.0=pyhd8ed1ab_0
- libarrow=14.0.1=h4df1b6a_3_cpu
- libarrow=14.0.1=he5826ec_2_cpu
- mapclassify=2.6.1=pyhd8ed1ab_0
- nbclient=0.8.0=pyhd8ed1ab_0
- recordlinkage=0.16=pyhd8ed1ab_0
- tabulator=1.53.5=pyhd8ed1ab_0
- dagster-webserver=1.5.8=pyhd8ed1ab_0
- dagster-webserver=1.5.7=pyhd8ed1ab_0
- geopandas=0.14.1=pyhd8ed1ab_0
- google-cloud-core=2.3.3=pyhd8ed1ab_0
- ipykernel=6.26.0=pyhf8b6a83_0
- ipywidgets=8.1.1=pyhd8ed1ab_0
- libarrow-acero=14.0.1=h59595ed_3_cpu
- libarrow-flight=14.0.1=h120cb0d_3_cpu
- libarrow-gandiva=14.0.1=hacb8726_3_cpu
- libparquet=14.0.1=h352af49_3_cpu
- libarrow-acero=14.0.1=h59595ed_2_cpu
- libarrow-flight=14.0.1=h120cb0d_2_cpu
- libarrow-gandiva=14.0.1=hacb8726_2_cpu
- libparquet=14.0.1=h352af49_2_cpu
- nbconvert-core=7.11.0=pyhd8ed1ab_0
- pygraphviz=1.11=py311h72a77b7_1
- tableschema=1.19.3=pyh9f0ad1d_0
- datapackage=1.15.2=pyh44b312d_0
- google-cloud-storage=2.13.0=pyhca7485f_0
- jupyter_console=6.6.3=pyhd8ed1ab_0
- jupyter_server=2.10.1=pyhd8ed1ab_0
- libarrow-dataset=14.0.1=h59595ed_3_cpu
- libarrow-flight-sql=14.0.1=h61ff412_3_cpu
- jupyter_server=2.10.0=pyhd8ed1ab_0
- libarrow-dataset=14.0.1=h59595ed_2_cpu
- libarrow-flight-sql=14.0.1=h61ff412_2_cpu
- nbconvert-pandoc=7.11.0=pyhd8ed1ab_0
- qtconsole-base=5.5.0=pyha770c72_0
- gcsfs=2023.10.0=pyhd8ed1ab_0
- jupyter-lsp=2.2.0=pyhd8ed1ab_0
- jupyter-resource-usage=1.0.1=pyhd8ed1ab_0
- jupyterlab_server=2.25.1=pyhd8ed1ab_0
- libarrow-substrait=14.0.1=h61ff412_3_cpu
- libarrow-substrait=14.0.1=h61ff412_2_cpu
- nbconvert=7.11.0=pyhd8ed1ab_0
- notebook-shim=0.2.3=pyhd8ed1ab_0
- jupyterlab=4.0.8=pyhd8ed1ab_0
- pyarrow=14.0.1=py311h39c9aba_3_cpu
- pyarrow=14.0.1=py311h39c9aba_2_cpu
- notebook=7.0.6=pyhd8ed1ab_0
- jupyter=1.0.0=pyhd8ed1ab_10
- sphinx-autoapi=3.0.0=pyhd8ed1ab_0
Expand Down
Loading