From 694032dab0b96335f8ead631e6576e67318db03c Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Tue, 12 Dec 2023 15:41:41 -0700 Subject: [PATCH 1/2] Refactor calculation of annualized_respondents_ferc714 (#3024) * Refactor calculation of annualized_respondents_ferc714 Rather than loading huge demand_hourly_pa_ferc714 dataset and calculating report_date columns from these, we can infer these values from the ferc714_settings. Additionally, we can use cross product merge to blow out the respondents, rather than doing the complex procedure that we did up to this point. * Put back check that report_date is not in respondent_id_ferc714 * import dataset_settings resource into annualized_respondents_ferc714 * Update conda-lock.yml and rendered conda environment files. --------- Co-authored-by: rousik Co-authored-by: Zane Selvans Co-authored-by: zaneselvans --- environments/conda-linux-64.lock.yml | 26 +- environments/conda-lock.yml | 386 +++++++++++++------------- environments/conda-osx-64.lock.yml | 26 +- environments/conda-osx-arm64.lock.yml | 26 +- src/pudl/output/ferc714.py | 67 ++--- 5 files changed, 249 insertions(+), 282 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index 0dbbdcef09..f69593763b 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -136,7 +136,7 @@ dependencies: - alabaster=0.7.13=pyhd8ed1ab_0 - anyascii=0.3.2=pyhd8ed1ab_0 - appdirs=1.4.4=pyh9f0ad1d_0 - - astroid=3.0.1=py311h38be061_0 + - astroid=3.0.2=py311h38be061_0 - atk-1.0=2.38.0=hd4edc92_1 - attrs=23.1.0=pyh71513ae_1 - aws-c-event-stream=0.3.2=h1fff966_7 @@ -160,13 +160,13 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_0 - crashtest=0.4.1=pyhd8ed1ab_0 - cycler=0.12.1=pyhd8ed1ab_0 - - dagster-pipes=1.5.11=pyhd8ed1ab_0 + - dagster-pipes=1.5.12=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - dbus=1.13.6=h5008d03_3 - debugpy=1.8.0=py311hb755f60_1 - decorator=5.1.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - - distlib=0.3.7=pyhd8ed1ab_0 + - distlib=0.3.8=pyhd8ed1ab_0 - docstring_parser=0.15=pyhd8ed1ab_0 - docutils=0.20.1=py311h38be061_3 - entrypoints=0.4=pyhd8ed1ab_0 @@ -180,7 +180,7 @@ dependencies: - frozenlist=1.4.0=py311h459d7ec_1 - fsspec=2023.12.1=pyhca7485f_0 - gdk-pixbuf=2.42.10=h829c605_4 - - google-cloud-sdk=456.0.0=py311h38be061_0 + - google-cloud-sdk=457.0.0=py311h38be061_0 - greenlet=3.0.2=py311hb755f60_0 - gts=0.7.6=h977cf35_4 - hpack=4.0.0=pyh9f0ad1d_0 @@ -369,7 +369,7 @@ dependencies: - pip=23.3.1=pyhd8ed1ab_0 - postgresql=16.1=h8972f4a_7 - proj=9.3.0=h1d62c97_2 - - prompt-toolkit=3.0.41=pyha770c72_0 + - prompt-toolkit=3.0.42=pyha770c72_0 - protobuf=4.24.4=py311h46cbc50_0 - psycopg2=2.9.9=py311h03dec38_0 - pyasn1-modules=0.3.0=pyhd8ed1ab_0 @@ -402,7 +402,7 @@ dependencies: - arrow=1.3.0=pyhd8ed1ab_0 - async-timeout=4.0.3=pyhd8ed1ab_0 - aws-c-s3=0.4.1=hfadff92_0 - - botocore=1.33.11=pyhd8ed1ab_0 + - botocore=1.33.12=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.7=py311hcb13ee4_1 @@ -427,7 +427,7 @@ dependencies: - pbr=6.0.0=pyhd8ed1ab_0 - pendulum=2.1.2=py311h459d7ec_6 - poppler=23.12.0=h590f24d_0 - - prompt_toolkit=3.0.41=hd8ed1ab_0 + - prompt_toolkit=3.0.42=hd8ed1ab_0 - psycopg2-binary=2.9.9=pyhd8ed1ab_0 - pybtex=0.24.0=pyhd8ed1ab_2 - pydantic-core=2.14.5=py311h46250e7_0 @@ -489,9 +489,9 @@ dependencies: - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0.post1=h38be061_0 - aws-sdk-cpp=1.11.182=h8beafcf_7 - - boto3=1.33.11=pyhd8ed1ab_0 + - boto3=1.33.12=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - - dagster=1.5.11=pyhd8ed1ab_0 + - dagster=1.5.12=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 - doc8=1.1.1=pyhd8ed1ab_0 - email-validator=2.1.0.post1=pyhd8ed1ab_0 @@ -500,7 +500,7 @@ dependencies: - geopandas-base=0.14.1=pyha770c72_0 - google-auth=2.25.2=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 - - gtk2=2.24.33=h90689f9_2 + - gtk2=2.24.33=h7f000aa_3 - ipykernel=6.26.0=pyhf8b6a83_0 - ipywidgets=8.1.1=pyhd8ed1ab_0 - jsonschema-with-format-nongpl=4.20.0=pyhd8ed1ab_0 @@ -516,8 +516,8 @@ dependencies: - timezonefinder=6.2.0=py311h459d7ec_2 - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.11=pyhd8ed1ab_0 - - dagster-postgres=0.21.11=pyhd8ed1ab_0 + - dagster-graphql=1.5.12=pyhd8ed1ab_0 + - dagster-postgres=0.21.12=pyhd8ed1ab_0 - fiona=1.9.5=py311hf8e0aa6_2 - google-api-core=2.15.0=pyhd8ed1ab_0 - google-auth-oauthlib=1.1.0=pyhd8ed1ab_0 @@ -530,7 +530,7 @@ dependencies: - qtconsole-base=5.5.1=pyha770c72_0 - recordlinkage=0.16=pyhd8ed1ab_0 - tabulator=1.53.5=pyhd8ed1ab_0 - - dagster-webserver=1.5.11=pyhd8ed1ab_0 + - dagster-webserver=1.5.12=pyhd8ed1ab_0 - geopandas=0.14.1=pyhd8ed1ab_0 - google-cloud-core=2.4.1=pyhd8ed1ab_0 - libarrow-acero=14.0.1=h59595ed_3_cpu diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index c61689b53c..fe8d762f1f 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -804,42 +804,42 @@ package: category: main optional: false - name: astroid - version: 3.0.1 + version: 3.0.2 manager: conda platform: linux-64 dependencies: python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/astroid-3.0.1-py311h38be061_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/astroid-3.0.2-py311h38be061_0.conda hash: - md5: 1cfd7512ea9cf20a14568c6991da262f - sha256: 5aa75c004f51dab842c28f1003e4bf5d6d725867e25474a722aa9fe331649301 + md5: f8811b77ac1d389d28f8fb4960eee238 + sha256: b0946bb0eaa24022e4a627e8e9ef595478333d594f5de7136333417f6be040d1 category: main optional: false - name: astroid - version: 3.0.1 + version: 3.0.2 manager: conda platform: osx-64 dependencies: python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/astroid-3.0.1-py311h6eed73b_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/astroid-3.0.2-py311h6eed73b_0.conda hash: - md5: 39aff7722673b4083e5b0d9aa7e33681 - sha256: 9b3233dda23466616bdab742c890062ec757e985f9314c93b5244d5c624b3c1f + md5: a2e76b577f7db434f81b40bb64176478 + sha256: bb3e7ec8fcfecf374549403b69948d423751a11bc047c130ffb85a724c42e1bd category: main optional: false - name: astroid - version: 3.0.1 + version: 3.0.2 manager: conda platform: osx-arm64 dependencies: python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/astroid-3.0.1-py311h267d04e_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/astroid-3.0.2-py311h267d04e_0.conda hash: - md5: 1f1ed24d8d83b882f223403c119a1e44 - sha256: 97c2611101771a148a8c0b4fff48e93e2e969a2f5998f21d6aa034ca339fc209 + md5: fc693fad14bdfb471f4538b4b02b7167 + sha256: 9948ee58536c7d8ce9fbbaa250ffcbaed383eaef2b3477a9047f62ad6bb62cb5 category: main optional: false - name: asttokens @@ -1914,52 +1914,52 @@ package: category: main optional: false - name: boto3 - version: 1.33.11 + version: 1.33.12 manager: conda platform: linux-64 dependencies: - botocore: ">=1.33.11,<1.34.0" + botocore: ">=1.33.12,<1.34.0" jmespath: ">=0.7.1,<2.0.0" python: ">=3.7" s3transfer: ">=0.8.2,<0.9.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.11-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.12-pyhd8ed1ab_0.conda hash: - md5: 5bd2b183cccabe53846acc0bc36a701a - sha256: 9b30f449a8eb6e1e4a2b9ce8cf87d0348a92cad1a0df6819f458376dd2f2424d + md5: 84feffcfe4266580673fd337e54b5af4 + sha256: 59926f5d8f80116ad393a33772c4ad5c00f56173cb7189e8a293af3630e2052e category: main optional: false - name: boto3 - version: 1.33.11 + version: 1.33.12 manager: conda platform: osx-64 dependencies: python: ">=3.7" jmespath: ">=0.7.1,<2.0.0" s3transfer: ">=0.8.2,<0.9.0" - botocore: ">=1.33.11,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.11-pyhd8ed1ab_0.conda + botocore: ">=1.33.12,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.12-pyhd8ed1ab_0.conda hash: - md5: 5bd2b183cccabe53846acc0bc36a701a - sha256: 9b30f449a8eb6e1e4a2b9ce8cf87d0348a92cad1a0df6819f458376dd2f2424d + md5: 84feffcfe4266580673fd337e54b5af4 + sha256: 59926f5d8f80116ad393a33772c4ad5c00f56173cb7189e8a293af3630e2052e category: main optional: false - name: boto3 - version: 1.33.11 + version: 1.33.12 manager: conda platform: osx-arm64 dependencies: python: ">=3.7" jmespath: ">=0.7.1,<2.0.0" s3transfer: ">=0.8.2,<0.9.0" - botocore: ">=1.33.11,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.11-pyhd8ed1ab_0.conda + botocore: ">=1.33.12,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.12-pyhd8ed1ab_0.conda hash: - md5: 5bd2b183cccabe53846acc0bc36a701a - sha256: 9b30f449a8eb6e1e4a2b9ce8cf87d0348a92cad1a0df6819f458376dd2f2424d + md5: 84feffcfe4266580673fd337e54b5af4 + sha256: 59926f5d8f80116ad393a33772c4ad5c00f56173cb7189e8a293af3630e2052e category: main optional: false - name: botocore - version: 1.33.11 + version: 1.33.12 manager: conda platform: linux-64 dependencies: @@ -1967,14 +1967,14 @@ package: python: ">=3.7" python-dateutil: ">=2.1,<3.0.0" urllib3: ">=1.25.4,<1.27" - url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.11-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.12-pyhd8ed1ab_0.conda hash: - md5: 096f907152d65c6f5ba9d437e27a4074 - sha256: b3ddf4459fa887fc76d1a97eaa9da7a31bd84838bd35cbda72ff54949971dc8a + md5: f3c9a95fcbb0be6fe2dc536ab44807bf + sha256: 2b906a0a248c11c5e15b7afff88cfe640b734dcc692aaa149ff2385f13ff351d category: main optional: false - name: botocore - version: 1.33.11 + version: 1.33.12 manager: conda platform: osx-64 dependencies: @@ -1982,14 +1982,14 @@ package: python-dateutil: ">=2.1,<3.0.0" jmespath: ">=0.7.1,<2.0.0" urllib3: ">=1.25.4,<1.27" - url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.11-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.12-pyhd8ed1ab_0.conda hash: - md5: 096f907152d65c6f5ba9d437e27a4074 - sha256: b3ddf4459fa887fc76d1a97eaa9da7a31bd84838bd35cbda72ff54949971dc8a + md5: f3c9a95fcbb0be6fe2dc536ab44807bf + sha256: 2b906a0a248c11c5e15b7afff88cfe640b734dcc692aaa149ff2385f13ff351d category: main optional: false - name: botocore - version: 1.33.11 + version: 1.33.12 manager: conda platform: osx-arm64 dependencies: @@ -1997,10 +1997,10 @@ package: python-dateutil: ">=2.1,<3.0.0" jmespath: ">=0.7.1,<2.0.0" urllib3: ">=1.25.4,<1.27" - url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.11-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.12-pyhd8ed1ab_0.conda hash: - md5: 096f907152d65c6f5ba9d437e27a4074 - sha256: b3ddf4459fa887fc76d1a97eaa9da7a31bd84838bd35cbda72ff54949971dc8a + md5: f3c9a95fcbb0be6fe2dc536ab44807bf + sha256: 2b906a0a248c11c5e15b7afff88cfe640b734dcc692aaa149ff2385f13ff351d category: main optional: false - name: bottleneck @@ -3792,7 +3792,7 @@ package: category: main optional: false - name: dagster - version: 1.5.11 + version: 1.5.12 manager: conda platform: linux-64 dependencies: @@ -3800,7 +3800,7 @@ package: click: ">=5.0" coloredlogs: ">=6.1,<=14.0" croniter: ">=0.3.34" - dagster-pipes: ">=1.5.11,<1.5.12.0a0" + dagster-pipes: ">=1.5.12,<1.5.13.0a0" docstring_parser: "" grpcio: ">=1.44.0" grpcio-health-checking: ">=1.44.0" @@ -3826,14 +3826,14 @@ package: typing_extensions: ">=4.4.0" universal_pathlib: "" watchdog: ">=0.8.3" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.11-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.12-pyhd8ed1ab_0.conda hash: - md5: 5c2edce540b4ee809fc191d87325d6b0 - sha256: 73d8ad12f3e280ebec2ae5357ec6b08e19e8f6df63e7be21b4d90db406329844 + md5: a2ed0674a7dfb3b153148cc816855a4a + sha256: 027a55889f14722a2a4d2e9296d1390fa9521f2a908147333834359096dd3444 category: main optional: false - name: dagster - version: 1.5.11 + version: 1.5.12 manager: conda platform: osx-64 dependencies: @@ -3866,15 +3866,15 @@ package: alembic: ">=1.2.1,!=1.6.3,!=1.7.0,!=1.11.0" pydantic: ">1.10.0,!=1.10.7" pendulum: <3 - dagster-pipes: ">=1.5.11,<1.5.12.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.11-pyhd8ed1ab_0.conda + dagster-pipes: ">=1.5.12,<1.5.13.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.12-pyhd8ed1ab_0.conda hash: - md5: 5c2edce540b4ee809fc191d87325d6b0 - sha256: 73d8ad12f3e280ebec2ae5357ec6b08e19e8f6df63e7be21b4d90db406329844 + md5: a2ed0674a7dfb3b153148cc816855a4a + sha256: 027a55889f14722a2a4d2e9296d1390fa9521f2a908147333834359096dd3444 category: main optional: false - name: dagster - version: 1.5.11 + version: 1.5.12 manager: conda platform: osx-arm64 dependencies: @@ -3907,32 +3907,32 @@ package: alembic: ">=1.2.1,!=1.6.3,!=1.7.0,!=1.11.0" pydantic: ">1.10.0,!=1.10.7" pendulum: <3 - dagster-pipes: ">=1.5.11,<1.5.12.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.11-pyhd8ed1ab_0.conda + dagster-pipes: ">=1.5.12,<1.5.13.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.12-pyhd8ed1ab_0.conda hash: - md5: 5c2edce540b4ee809fc191d87325d6b0 - sha256: 73d8ad12f3e280ebec2ae5357ec6b08e19e8f6df63e7be21b4d90db406329844 + md5: a2ed0674a7dfb3b153148cc816855a4a + sha256: 027a55889f14722a2a4d2e9296d1390fa9521f2a908147333834359096dd3444 category: main optional: false - name: dagster-graphql - version: 1.5.11 + version: 1.5.12 manager: conda platform: linux-64 dependencies: - dagster: ">=1.5.11,<1.5.12.0a0" + dagster: ">=1.5.12,<1.5.13.0a0" gql-with-requests: ">=3.0.0" graphene: ">=3" python: ">=3.8" requests: "" starlette: "" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.11-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.12-pyhd8ed1ab_0.conda hash: - md5: bcecd97c7835c5057b220b1fdf52412b - sha256: a968aee0eec0587555f827b584af484149ed235a331222ad10c69f92c80623de + md5: f516bf51aaa40ccc15add9302a659ec2 + sha256: f1b4d4608e72dced9f1fe3f44673324eaa47abd1c4dea6a31c7aba5f6a2d8e47 category: dev optional: true - name: dagster-graphql - version: 1.5.11 + version: 1.5.12 manager: conda platform: osx-64 dependencies: @@ -3941,15 +3941,15 @@ package: python: ">=3.8" graphene: ">=3" gql-with-requests: ">=3.0.0" - dagster: ">=1.5.11,<1.5.12.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.11-pyhd8ed1ab_0.conda + dagster: ">=1.5.12,<1.5.13.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.12-pyhd8ed1ab_0.conda hash: - md5: bcecd97c7835c5057b220b1fdf52412b - sha256: a968aee0eec0587555f827b584af484149ed235a331222ad10c69f92c80623de + md5: f516bf51aaa40ccc15add9302a659ec2 + sha256: f1b4d4608e72dced9f1fe3f44673324eaa47abd1c4dea6a31c7aba5f6a2d8e47 category: dev optional: true - name: dagster-graphql - version: 1.5.11 + version: 1.5.12 manager: conda platform: osx-arm64 dependencies: @@ -3958,110 +3958,110 @@ package: python: ">=3.8" graphene: ">=3" gql-with-requests: ">=3.0.0" - dagster: ">=1.5.11,<1.5.12.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.11-pyhd8ed1ab_0.conda + dagster: ">=1.5.12,<1.5.13.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.12-pyhd8ed1ab_0.conda hash: - md5: bcecd97c7835c5057b220b1fdf52412b - sha256: a968aee0eec0587555f827b584af484149ed235a331222ad10c69f92c80623de + md5: f516bf51aaa40ccc15add9302a659ec2 + sha256: f1b4d4608e72dced9f1fe3f44673324eaa47abd1c4dea6a31c7aba5f6a2d8e47 category: dev optional: true - name: dagster-pipes - version: 1.5.11 + version: 1.5.12 manager: conda platform: linux-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-pipes-1.5.11-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-pipes-1.5.12-pyhd8ed1ab_0.conda hash: - md5: 521cde2b4e9f5919f1c10384f8050874 - sha256: 84b0f25af328c185f0bb86fbe2a49f2cd2917ecd6c3413881a54b2a92c6a63d5 + md5: 1c66ca63de735589ae01017033df2034 + sha256: 561c86c9aa3211b37cc5675c7c8d719cb027525846c4dc2b879517a4558efa77 category: main optional: false - name: dagster-pipes - version: 1.5.11 + version: 1.5.12 manager: conda platform: osx-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-pipes-1.5.11-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-pipes-1.5.12-pyhd8ed1ab_0.conda hash: - md5: 521cde2b4e9f5919f1c10384f8050874 - sha256: 84b0f25af328c185f0bb86fbe2a49f2cd2917ecd6c3413881a54b2a92c6a63d5 + md5: 1c66ca63de735589ae01017033df2034 + sha256: 561c86c9aa3211b37cc5675c7c8d719cb027525846c4dc2b879517a4558efa77 category: main optional: false - name: dagster-pipes - version: 1.5.11 + version: 1.5.12 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-pipes-1.5.11-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-pipes-1.5.12-pyhd8ed1ab_0.conda hash: - md5: 521cde2b4e9f5919f1c10384f8050874 - sha256: 84b0f25af328c185f0bb86fbe2a49f2cd2917ecd6c3413881a54b2a92c6a63d5 + md5: 1c66ca63de735589ae01017033df2034 + sha256: 561c86c9aa3211b37cc5675c7c8d719cb027525846c4dc2b879517a4558efa77 category: main optional: false - name: dagster-postgres - version: 0.21.11 + version: 0.21.12 manager: conda platform: linux-64 dependencies: - dagster: 1.5.11.* + dagster: 1.5.12.* psycopg2-binary: "" python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.11-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.12-pyhd8ed1ab_0.conda hash: - md5: de15ce0dd3e33040b34c29fe8c0efafd - sha256: 960e055be62adfd094257eadb0a23eacc9cce3f1b540deddec9b6a498e3ece85 + md5: 3e77306199e15b093ad06f02c4b31947 + sha256: 9b4ddf5b96c96b8208a7b627bdfb78ff472cd54c380c111f3ec85bb877147499 category: main optional: false - name: dagster-postgres - version: 0.21.11 + version: 0.21.12 manager: conda platform: osx-64 dependencies: psycopg2-binary: "" python: ">=3.8" - dagster: 1.5.11.* - url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.11-pyhd8ed1ab_0.conda + dagster: 1.5.12.* + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.12-pyhd8ed1ab_0.conda hash: - md5: de15ce0dd3e33040b34c29fe8c0efafd - sha256: 960e055be62adfd094257eadb0a23eacc9cce3f1b540deddec9b6a498e3ece85 + md5: 3e77306199e15b093ad06f02c4b31947 + sha256: 9b4ddf5b96c96b8208a7b627bdfb78ff472cd54c380c111f3ec85bb877147499 category: main optional: false - name: dagster-postgres - version: 0.21.11 + version: 0.21.12 manager: conda platform: osx-arm64 dependencies: psycopg2-binary: "" python: ">=3.8" - dagster: 1.5.11.* - url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.11-pyhd8ed1ab_0.conda + dagster: 1.5.12.* + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.12-pyhd8ed1ab_0.conda hash: - md5: de15ce0dd3e33040b34c29fe8c0efafd - sha256: 960e055be62adfd094257eadb0a23eacc9cce3f1b540deddec9b6a498e3ece85 + md5: 3e77306199e15b093ad06f02c4b31947 + sha256: 9b4ddf5b96c96b8208a7b627bdfb78ff472cd54c380c111f3ec85bb877147499 category: main optional: false - name: dagster-webserver - version: 1.5.11 + version: 1.5.12 manager: conda platform: linux-64 dependencies: click: ">=7.0,<9.0" - dagster: ">=1.5.11,<1.5.12.0a0" - dagster-graphql: ">=1.5.11,<1.5.12.0a0" + dagster: ">=1.5.12,<1.5.13.0a0" + dagster-graphql: ">=1.5.12,<1.5.13.0a0" python: ">=3.8" starlette: "" uvicorn-standard: "" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-webserver-1.5.11-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-webserver-1.5.12-pyhd8ed1ab_0.conda hash: - md5: 26fc6d8624aa44ad7a27ae376c8c8126 - sha256: d2a0d9a100c353b3489d72832ed2541b128ff548a8b314e00d1259c07795be17 + md5: 92f1a728da0e353b6981455a63ba2523 + sha256: bb72a39afb99dc3d5bcbc9ab723daeb7a1926b3b20153d255f3ae058b1306593 category: dev optional: true - name: dagster-webserver - version: 1.5.11 + version: 1.5.12 manager: conda platform: osx-64 dependencies: @@ -4069,16 +4069,16 @@ package: uvicorn-standard: "" python: ">=3.8" click: ">=7.0,<9.0" - dagster: ">=1.5.11,<1.5.12.0a0" - dagster-graphql: ">=1.5.11,<1.5.12.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-webserver-1.5.11-pyhd8ed1ab_0.conda + dagster: ">=1.5.12,<1.5.13.0a0" + dagster-graphql: ">=1.5.12,<1.5.13.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-webserver-1.5.12-pyhd8ed1ab_0.conda hash: - md5: 26fc6d8624aa44ad7a27ae376c8c8126 - sha256: d2a0d9a100c353b3489d72832ed2541b128ff548a8b314e00d1259c07795be17 + md5: 92f1a728da0e353b6981455a63ba2523 + sha256: bb72a39afb99dc3d5bcbc9ab723daeb7a1926b3b20153d255f3ae058b1306593 category: dev optional: true - name: dagster-webserver - version: 1.5.11 + version: 1.5.12 manager: conda platform: osx-arm64 dependencies: @@ -4086,12 +4086,12 @@ package: uvicorn-standard: "" python: ">=3.8" click: ">=7.0,<9.0" - dagster: ">=1.5.11,<1.5.12.0a0" - dagster-graphql: ">=1.5.11,<1.5.12.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-webserver-1.5.11-pyhd8ed1ab_0.conda + dagster: ">=1.5.12,<1.5.13.0a0" + dagster-graphql: ">=1.5.12,<1.5.13.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-webserver-1.5.12-pyhd8ed1ab_0.conda hash: - md5: 26fc6d8624aa44ad7a27ae376c8c8126 - sha256: d2a0d9a100c353b3489d72832ed2541b128ff548a8b314e00d1259c07795be17 + md5: 92f1a728da0e353b6981455a63ba2523 + sha256: bb72a39afb99dc3d5bcbc9ab723daeb7a1926b3b20153d255f3ae058b1306593 category: dev optional: true - name: dask-core @@ -4470,39 +4470,39 @@ package: category: main optional: false - name: distlib - version: 0.3.7 + version: 0.3.8 manager: conda platform: linux-64 dependencies: python: 2.7|>=3.6 - url: https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.8-pyhd8ed1ab_0.conda hash: - md5: 12d8aae6994f342618443a8f05c652a0 - sha256: 13c887cb4a29e1e853a118cfc0e42b72a7e1d1c50c66c0974885d37f0db30619 + md5: db16c66b759a64dc5183d69cc3745a52 + sha256: 3ff11acdd5cc2f80227682966916e878e45ced94f59c402efb94911a5774e84e category: main optional: false - name: distlib - version: 0.3.7 + version: 0.3.8 manager: conda platform: osx-64 dependencies: python: 2.7|>=3.6 - url: https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.8-pyhd8ed1ab_0.conda hash: - md5: 12d8aae6994f342618443a8f05c652a0 - sha256: 13c887cb4a29e1e853a118cfc0e42b72a7e1d1c50c66c0974885d37f0db30619 + md5: db16c66b759a64dc5183d69cc3745a52 + sha256: 3ff11acdd5cc2f80227682966916e878e45ced94f59c402efb94911a5774e84e category: main optional: false - name: distlib - version: 0.3.7 + version: 0.3.8 manager: conda platform: osx-arm64 dependencies: python: 2.7|>=3.6 - url: https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.8-pyhd8ed1ab_0.conda hash: - md5: 12d8aae6994f342618443a8f05c652a0 - sha256: 13c887cb4a29e1e853a118cfc0e42b72a7e1d1c50c66c0974885d37f0db30619 + md5: db16c66b759a64dc5183d69cc3745a52 + sha256: 3ff11acdd5cc2f80227682966916e878e45ced94f59c402efb94911a5774e84e category: main optional: false - name: dnspython @@ -6617,42 +6617,42 @@ package: category: main optional: false - name: google-cloud-sdk - version: 456.0.0 + version: 457.0.0 manager: conda platform: linux-64 dependencies: python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/google-cloud-sdk-456.0.0-py311h38be061_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/google-cloud-sdk-457.0.0-py311h38be061_0.conda hash: - md5: 09eb149adf3420350bd241bda3d5fafe - sha256: f789db836de3cc6557c9250f5819ada0aaafa2f559c09b8fadd5bda703a2acdf + md5: 6948263c6cdb11b0c423e7fdb609fe9c + sha256: 289e354e0875d9bfef3615bbdacae94010b4fc48085f0c6a18adc1dab1f18023 category: main optional: false - name: google-cloud-sdk - version: 456.0.0 + version: 457.0.0 manager: conda platform: osx-64 dependencies: python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/google-cloud-sdk-456.0.0-py311h6eed73b_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/google-cloud-sdk-457.0.0-py311h6eed73b_0.conda hash: - md5: 287686faa4f60a48dae2884822a232ef - sha256: 9ce703e2c3b9df7f01dee5e21c3b40da1088114670ced4347af9ee368f304d4b + md5: dbbacfc479d3a156ef297edcb93b217c + sha256: fe1141fbb6339163d08c9174838777a9db6c7628d890cf5cff947494768f304b category: main optional: false - name: google-cloud-sdk - version: 456.0.0 + version: 457.0.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/google-cloud-sdk-456.0.0-py311h267d04e_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/google-cloud-sdk-457.0.0-py311h267d04e_0.conda hash: - md5: 321f57034a4eb43fbe44c09d5a270eeb - sha256: 89e0793bafe2d57cf3c656bc22853f7a40eb05b03a34d6c308dcd5ff572ace04 + md5: 7ceca26a434b734268312a5103b40b04 + sha256: fbdb5fd25fa1e7d2e1dcafff647572b63596f5859141a1e6b04159b841b4859d category: main optional: false - name: google-cloud-storage @@ -7355,17 +7355,17 @@ package: manager: conda platform: linux-64 dependencies: - atk-1.0: ">=2.36.0" - cairo: ">=1.16.0,<2.0.0a0" - gdk-pixbuf: ">=2.42.6,<3.0a0" - gettext: ">=0.19.8.1,<1.0a0" - libgcc-ng: ">=9.4.0" - libglib: ">=2.70.2,<3.0a0" - pango: ">=1.50.3,<1.51.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/gtk2-2.24.33-h90689f9_2.tar.bz2 + atk-1.0: ">=2.38.0" + cairo: ">=1.18.0,<2.0a0" + gdk-pixbuf: ">=2.42.10,<3.0a0" + gettext: ">=0.21.1,<1.0a0" + libgcc-ng: ">=12" + libglib: ">=2.78.3,<3.0a0" + pango: ">=1.50.14,<2.0a0" + url: https://conda.anaconda.org/conda-forge/linux-64/gtk2-2.24.33-h7f000aa_3.conda hash: - md5: 957a0255ab58aaf394a91725d73ab422 - sha256: 66d189ec36d67309fa3eb52d14d77b82359c10303c400eecc14f8eaca5939b87 + md5: 0abfa7f9241a0f4fd732bc15773cfb0c + sha256: e659f5eca2a5f21d5fe859d8d1dae132a284800eb017b8b4e2286b252a230527 category: dev optional: true - name: gtk2 @@ -7373,16 +7373,16 @@ package: manager: conda platform: osx-64 dependencies: - atk-1.0: ">=2.36.0" - cairo: ">=1.16.0,<2.0.0a0" - gdk-pixbuf: ">=2.42.6,<3.0a0" - gettext: ">=0.19.8.1,<1.0a0" - libglib: ">=2.70.2,<3.0a0" - pango: ">=1.50.3,<1.51.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/gtk2-2.24.33-h7c1209e_2.tar.bz2 + atk-1.0: ">=2.38.0" + cairo: ">=1.18.0,<2.0a0" + gdk-pixbuf: ">=2.42.10,<3.0a0" + gettext: ">=0.21.1,<1.0a0" + libglib: ">=2.78.3,<3.0a0" + pango: ">=1.50.14,<2.0a0" + url: https://conda.anaconda.org/conda-forge/osx-64/gtk2-2.24.33-h8ca4665_3.conda hash: - md5: 307614630946527e302b7dd042a5cfa2 - sha256: 4f5f5116c5c81a4bfcc01ea9eb9e489346a87d7248eb44963f6552ae0fb3a984 + md5: e13eed1e66893d4e76f9e735536ea2a4 + sha256: f98e984eff98dd69cb1b379a75819ea97c0af737cd147f5e89a671123171dbbb category: dev optional: true - name: gtk2 @@ -7390,16 +7390,16 @@ package: manager: conda platform: osx-arm64 dependencies: - atk-1.0: ">=2.36.0" - cairo: ">=1.16.0,<2.0.0a0" - gdk-pixbuf: ">=2.42.6,<3.0a0" - gettext: ">=0.19.8.1,<1.0a0" - libglib: ">=2.70.2,<3.0a0" - pango: ">=1.50.3,<1.51.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/gtk2-2.24.33-h57013de_2.tar.bz2 + atk-1.0: ">=2.38.0" + cairo: ">=1.18.0,<2.0a0" + gdk-pixbuf: ">=2.42.10,<3.0a0" + gettext: ">=0.21.1,<1.0a0" + libglib: ">=2.78.3,<3.0a0" + pango: ">=1.50.14,<2.0a0" + url: https://conda.anaconda.org/conda-forge/osx-arm64/gtk2-2.24.33-h7895bb2_3.conda hash: - md5: 144fb77338d90012ebe80d3dd13fc725 - sha256: 4bebd9809bb7e76b46af054f594eda5f280a796b7ec7f5870bd185ad5b3da338 + md5: e3d35c8b7a8fdb840c286ccaf0f082b2 + sha256: 63062472f3173991ce521f045f3a5dd5c7e147d127476b0c3a20a2aca03339e6 category: dev optional: true - name: gts @@ -16720,78 +16720,78 @@ package: category: main optional: false - name: prompt-toolkit - version: 3.0.41 + version: 3.0.42 manager: conda platform: linux-64 dependencies: python: ">=3.7" wcwidth: "" - url: https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.41-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.42-pyha770c72_0.conda hash: - md5: f511a993aa4336bef9dd874ee3403e67 - sha256: e26a5554883a0eada3641b6d861d8cb4895e2c7fcc17a587de07b8b1ecbfff0f + md5: 0bf64bf10eee21f46ac83c161917fa86 + sha256: 58525b2a9305fb154b2b0d43a48b9a6495441b80e4fbea44f2a34a597d2cef16 category: main optional: false - name: prompt-toolkit - version: 3.0.41 + version: 3.0.42 manager: conda platform: osx-64 dependencies: wcwidth: "" python: ">=3.7" - url: https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.41-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.42-pyha770c72_0.conda hash: - md5: f511a993aa4336bef9dd874ee3403e67 - sha256: e26a5554883a0eada3641b6d861d8cb4895e2c7fcc17a587de07b8b1ecbfff0f + md5: 0bf64bf10eee21f46ac83c161917fa86 + sha256: 58525b2a9305fb154b2b0d43a48b9a6495441b80e4fbea44f2a34a597d2cef16 category: main optional: false - name: prompt-toolkit - version: 3.0.41 + version: 3.0.42 manager: conda platform: osx-arm64 dependencies: wcwidth: "" python: ">=3.7" - url: https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.41-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.42-pyha770c72_0.conda hash: - md5: f511a993aa4336bef9dd874ee3403e67 - sha256: e26a5554883a0eada3641b6d861d8cb4895e2c7fcc17a587de07b8b1ecbfff0f + md5: 0bf64bf10eee21f46ac83c161917fa86 + sha256: 58525b2a9305fb154b2b0d43a48b9a6495441b80e4fbea44f2a34a597d2cef16 category: main optional: false - name: prompt_toolkit - version: 3.0.41 + version: 3.0.42 manager: conda platform: linux-64 dependencies: - prompt-toolkit: ">=3.0.41,<3.0.42.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.41-hd8ed1ab_0.conda + prompt-toolkit: ">=3.0.42,<3.0.43.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.42-hd8ed1ab_0.conda hash: - md5: b1387bd091fa0420557f801a78587678 - sha256: dd2fea25930d258159441ad4a45e5d3274f0d2f1dea92fe25b44b48c486aa969 + md5: 85a2189ecd2fcdd86e92b2d4ea8fe461 + sha256: fd2185d501bf34cb4c121f2f5ade9157ac75e1644a9da81355c4c8f9c1b82d4d category: main optional: false - name: prompt_toolkit - version: 3.0.41 + version: 3.0.42 manager: conda platform: osx-64 dependencies: - prompt-toolkit: ">=3.0.41,<3.0.42.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.41-hd8ed1ab_0.conda + prompt-toolkit: ">=3.0.42,<3.0.43.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.42-hd8ed1ab_0.conda hash: - md5: b1387bd091fa0420557f801a78587678 - sha256: dd2fea25930d258159441ad4a45e5d3274f0d2f1dea92fe25b44b48c486aa969 + md5: 85a2189ecd2fcdd86e92b2d4ea8fe461 + sha256: fd2185d501bf34cb4c121f2f5ade9157ac75e1644a9da81355c4c8f9c1b82d4d category: main optional: false - name: prompt_toolkit - version: 3.0.41 + version: 3.0.42 manager: conda platform: osx-arm64 dependencies: - prompt-toolkit: ">=3.0.41,<3.0.42.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.41-hd8ed1ab_0.conda + prompt-toolkit: ">=3.0.42,<3.0.43.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.42-hd8ed1ab_0.conda hash: - md5: b1387bd091fa0420557f801a78587678 - sha256: dd2fea25930d258159441ad4a45e5d3274f0d2f1dea92fe25b44b48c486aa969 + md5: 85a2189ecd2fcdd86e92b2d4ea8fe461 + sha256: fd2185d501bf34cb4c121f2f5ade9157ac75e1644a9da81355c4c8f9c1b82d4d category: main optional: false - name: protobuf diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index d9a3d57972..bc9d0f9430 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -129,7 +129,7 @@ dependencies: - anyascii=0.3.2=pyhd8ed1ab_0 - appdirs=1.4.4=pyh9f0ad1d_0 - appnope=0.1.3=pyhd8ed1ab_0 - - astroid=3.0.1=py311h6eed73b_0 + - astroid=3.0.2=py311h6eed73b_0 - attrs=23.1.0=pyh71513ae_1 - aws-c-auth=0.7.7=h9ac2572_1 - aws-c-mqtt=0.9.10=h10c2427_1 @@ -152,12 +152,12 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_0 - crashtest=0.4.1=pyhd8ed1ab_0 - cycler=0.12.1=pyhd8ed1ab_0 - - dagster-pipes=1.5.11=pyhd8ed1ab_0 + - dagster-pipes=1.5.12=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - debugpy=1.8.0=py311hdf8f085_1 - decorator=5.1.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - - distlib=0.3.7=pyhd8ed1ab_0 + - distlib=0.3.8=pyhd8ed1ab_0 - docstring_parser=0.15=pyhd8ed1ab_0 - docutils=0.20.1=py311h6eed73b_3 - entrypoints=0.4=pyhd8ed1ab_0 @@ -168,7 +168,7 @@ dependencies: - filelock=3.13.1=pyhd8ed1ab_0 - frozenlist=1.4.0=py311h2725bcf_1 - fsspec=2023.12.1=pyhca7485f_0 - - google-cloud-sdk=456.0.0=py311h6eed73b_0 + - google-cloud-sdk=457.0.0=py311h6eed73b_0 - greenlet=3.0.2=py311hd39e593_0 - hpack=4.0.0=pyh9f0ad1d_0 - httptools=0.6.1=py311he705e18_0 @@ -348,7 +348,7 @@ dependencies: - poppler=23.12.0=hdd5a5e8_0 - postgresql=16.1=h413614c_7 - proj=9.3.0=h23b96cc_2 - - prompt-toolkit=3.0.41=pyha770c72_0 + - prompt-toolkit=3.0.42=pyha770c72_0 - protobuf=4.24.4=py311h021eaf5_0 - psycopg2=2.9.9=py311h187f0af_0 - pyasn1-modules=0.3.0=pyhd8ed1ab_0 @@ -382,7 +382,7 @@ dependencies: - arrow=1.3.0=pyhd8ed1ab_0 - async-timeout=4.0.3=pyhd8ed1ab_0 - aws-crt-cpp=0.24.7=hf3941dc_6 - - botocore=1.33.11=pyhd8ed1ab_0 + - botocore=1.33.12=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.7=py311h48c7838_1 @@ -406,7 +406,7 @@ dependencies: - pango=1.50.14=h19c1c8a_2 - pbr=6.0.0=pyhd8ed1ab_0 - pendulum=2.1.2=py311h2725bcf_6 - - prompt_toolkit=3.0.41=hd8ed1ab_0 + - prompt_toolkit=3.0.42=hd8ed1ab_0 - psycopg2-binary=2.9.9=pyhd8ed1ab_0 - pybtex=0.24.0=pyhd8ed1ab_2 - pydantic-core=2.14.5=py311h5e0f0e4_0 @@ -441,7 +441,7 @@ dependencies: - google-resumable-media=2.6.0=pyhd8ed1ab_0 - graphene=3.3=pyhd8ed1ab_0 - grpcio-status=1.59.2=pyhd8ed1ab_0 - - gtk2=2.24.33=h7c1209e_2 + - gtk2=2.24.33=h8ca4665_3 - h3-py=3.7.6=py311hdf8f085_1 - httpx=0.25.2=pyhd8ed1ab_0 - identify=2.5.33=pyhd8ed1ab_0 @@ -470,9 +470,9 @@ dependencies: - typeguard=4.1.5=pyhd8ed1ab_1 - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0.post1=h6eed73b_0 - - boto3=1.33.11=pyhd8ed1ab_0 + - boto3=1.33.12=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - - dagster=1.5.11=pyhd8ed1ab_0 + - dagster=1.5.12=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 - doc8=1.1.1=pyhd8ed1ab_0 - email-validator=2.1.0.post1=pyhd8ed1ab_0 @@ -496,8 +496,8 @@ dependencies: - timezonefinder=6.2.0=py311he705e18_2 - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.11=pyhd8ed1ab_0 - - dagster-postgres=0.21.11=pyhd8ed1ab_0 + - dagster-graphql=1.5.12=pyhd8ed1ab_0 + - dagster-postgres=0.21.12=pyhd8ed1ab_0 - fiona=1.9.5=py311h809632c_2 - google-api-core=2.15.0=pyhd8ed1ab_0 - google-auth-oauthlib=1.1.0=pyhd8ed1ab_0 @@ -513,7 +513,7 @@ dependencies: - qtconsole-base=5.5.1=pyha770c72_0 - recordlinkage=0.16=pyhd8ed1ab_0 - tabulator=1.53.5=pyhd8ed1ab_0 - - dagster-webserver=1.5.11=pyhd8ed1ab_0 + - dagster-webserver=1.5.12=pyhd8ed1ab_0 - geopandas=0.14.1=pyhd8ed1ab_0 - google-cloud-core=2.4.1=pyhd8ed1ab_0 - libarrow-dataset=14.0.1=hc222712_3_cpu diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 8637bccd2c..26e4819520 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -129,7 +129,7 @@ dependencies: - anyascii=0.3.2=pyhd8ed1ab_0 - appdirs=1.4.4=pyh9f0ad1d_0 - appnope=0.1.3=pyhd8ed1ab_0 - - astroid=3.0.1=py311h267d04e_0 + - astroid=3.0.2=py311h267d04e_0 - attrs=23.1.0=pyh71513ae_1 - aws-c-auth=0.7.7=h886c30d_1 - aws-c-mqtt=0.9.10=h8d54690_1 @@ -152,12 +152,12 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_0 - crashtest=0.4.1=pyhd8ed1ab_0 - cycler=0.12.1=pyhd8ed1ab_0 - - dagster-pipes=1.5.11=pyhd8ed1ab_0 + - dagster-pipes=1.5.12=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - debugpy=1.8.0=py311ha891d26_1 - decorator=5.1.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - - distlib=0.3.7=pyhd8ed1ab_0 + - distlib=0.3.8=pyhd8ed1ab_0 - docstring_parser=0.15=pyhd8ed1ab_0 - docutils=0.20.1=py311h267d04e_3 - entrypoints=0.4=pyhd8ed1ab_0 @@ -168,7 +168,7 @@ dependencies: - filelock=3.13.1=pyhd8ed1ab_0 - frozenlist=1.4.0=py311heffc1b2_1 - fsspec=2023.12.1=pyhca7485f_0 - - google-cloud-sdk=456.0.0=py311h267d04e_0 + - google-cloud-sdk=457.0.0=py311h267d04e_0 - greenlet=3.0.2=py311hbaf5611_0 - hpack=4.0.0=pyh9f0ad1d_0 - httptools=0.6.1=py311h05b510d_0 @@ -348,7 +348,7 @@ dependencies: - poppler=23.12.0=hcdd998b_0 - postgresql=16.1=hc6ab77f_7 - proj=9.3.0=h52fb9d0_2 - - prompt-toolkit=3.0.41=pyha770c72_0 + - prompt-toolkit=3.0.42=pyha770c72_0 - protobuf=4.24.4=py311h4d1eceb_0 - psycopg2=2.9.9=py311h589e011_0 - pyasn1-modules=0.3.0=pyhd8ed1ab_0 @@ -382,7 +382,7 @@ dependencies: - arrow=1.3.0=pyhd8ed1ab_0 - async-timeout=4.0.3=pyhd8ed1ab_0 - aws-crt-cpp=0.24.7=hba4ac3b_6 - - botocore=1.33.11=pyhd8ed1ab_0 + - botocore=1.33.12=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.7=py311h08c85a6_1 @@ -406,7 +406,7 @@ dependencies: - pango=1.50.14=hcf40dda_2 - pbr=6.0.0=pyhd8ed1ab_0 - pendulum=2.1.2=py311heffc1b2_6 - - prompt_toolkit=3.0.41=hd8ed1ab_0 + - prompt_toolkit=3.0.42=hd8ed1ab_0 - psycopg2-binary=2.9.9=pyhd8ed1ab_0 - pybtex=0.24.0=pyhd8ed1ab_2 - pydantic-core=2.14.5=py311h94f323b_0 @@ -441,7 +441,7 @@ dependencies: - google-resumable-media=2.6.0=pyhd8ed1ab_0 - graphene=3.3=pyhd8ed1ab_0 - grpcio-status=1.59.2=pyhd8ed1ab_0 - - gtk2=2.24.33=h57013de_2 + - gtk2=2.24.33=h7895bb2_3 - h3-py=3.7.6=py311ha891d26_1 - httpx=0.25.2=pyhd8ed1ab_0 - identify=2.5.33=pyhd8ed1ab_0 @@ -470,9 +470,9 @@ dependencies: - typeguard=4.1.5=pyhd8ed1ab_1 - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0.post1=ha1ab1f8_0 - - boto3=1.33.11=pyhd8ed1ab_0 + - boto3=1.33.12=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - - dagster=1.5.11=pyhd8ed1ab_0 + - dagster=1.5.12=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 - doc8=1.1.1=pyhd8ed1ab_0 - email-validator=2.1.0.post1=pyhd8ed1ab_0 @@ -496,8 +496,8 @@ dependencies: - timezonefinder=6.2.0=py311h05b510d_2 - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.11=pyhd8ed1ab_0 - - dagster-postgres=0.21.11=pyhd8ed1ab_0 + - dagster-graphql=1.5.12=pyhd8ed1ab_0 + - dagster-postgres=0.21.12=pyhd8ed1ab_0 - fiona=1.9.5=py311h4760b73_2 - google-api-core=2.15.0=pyhd8ed1ab_0 - google-auth-oauthlib=1.1.0=pyhd8ed1ab_0 @@ -513,7 +513,7 @@ dependencies: - qtconsole-base=5.5.1=pyha770c72_0 - recordlinkage=0.16=pyhd8ed1ab_0 - tabulator=1.53.5=pyhd8ed1ab_0 - - dagster-webserver=1.5.11=pyhd8ed1ab_0 + - dagster-webserver=1.5.12=pyhd8ed1ab_0 - geopandas=0.14.1=pyhd8ed1ab_0 - google-cloud-core=2.4.1=pyhd8ed1ab_0 - libarrow-dataset=14.0.1=had9dd58_3_cpu diff --git a/src/pudl/output/ferc714.py b/src/pudl/output/ferc714.py index 55431238c7..2a6a6bd525 100644 --- a/src/pudl/output/ferc714.py +++ b/src/pudl/output/ferc714.py @@ -1,5 +1,4 @@ """Functions & classes for compiling derived aspects of the FERC Form 714 data.""" -from datetime import datetime from typing import Any import geopandas as gpd @@ -83,41 +82,6 @@ ################################################################################ -def add_dates(rids_ferc714: pd.DataFrame, report_dates: list[datetime]) -> pd.DataFrame: - """Broadcast respondent data across dates. - - Args: - rids_ferc714: A simple FERC 714 Respondent ID dataframe, - without any date information. - report_dates: Dates for which each respondent - should be given a record. - - Raises: - ValueError: if a ``report_date`` column exists in ``rids_ferc714``. - - Returns: - A Dataframe having all the same columns as the input - ``rids_ferc714`` with the addition of a ``report_date`` column, but with all - records associated with each ``respondent_id_ferc714`` duplicated on a per-date - basis. - """ - if "report_date" in rids_ferc714.columns: - raise ValueError("report_date already present, can't be added again!") - # Create DataFrame with all report_date and respondent_id_ferc714 combos - logger.info(f"Got {len(report_dates)} report_dates.") - unique_rids = rids_ferc714.respondent_id_ferc714.unique() - logger.info(f"found {len(unique_rids)} unique FERC-714 respondent IDs.") - dates_rids_df = pd.DataFrame( - index=pd.MultiIndex.from_product( - [report_dates, unique_rids], - names=["report_date", "respondent_id_ferc714"], - ) - ).reset_index() - rids_with_dates = pd.merge(rids_ferc714, dates_rids_df, on="respondent_id_ferc714") - logger.info(f"Generated {len(rids_with_dates)} report_date + respondent_id rows.") - return rids_with_dates - - def categorize_eia_code( eia_codes: list[int], ba_ids: list[int], @@ -370,28 +334,31 @@ def filled_service_territory_eia861( ) -@asset(compute_kind="Python") +@asset( + compute_kind="Python", + required_resource_keys={"dataset_settings"}, +) def annualized_respondents_ferc714( - demand_hourly_pa_ferc714: pd.DataFrame, respondent_id_ferc714: pd.DataFrame + context, respondent_id_ferc714: pd.DataFrame ) -> pd.DataFrame: """Broadcast respondent data across all years with reported demand. The FERC 714 Respondent IDs and names are reported in their own table, without any refence to individual years, but much of the information we are associating with them varies annually. This method creates an annualized version of the respondent - table, with each respondent having an entry corresponding to every year in which - hourly demand was reported in the FERC 714 dataset as a whole -- this necessarily - means that many of the respondents will end up having entries for years in which - they reported no demand, and that's fine. They can be filtered later. + table, with each respondent having an entry corresponding to every year for which + FERC 714 has been processed. This means that many of the respondents will end up + having entries for years in which they reported no demand, and that's fine. + They can be filtered later. """ - # Calculate the total demand per respondent, per year: - report_dates = [ - time for time in demand_hourly_pa_ferc714.report_date.unique() if pd.notna(time) - ] - annualized_respondents_ferc714 = respondent_id_ferc714.pipe( - add_dates, report_dates - ).pipe(apply_pudl_dtypes) - return annualized_respondents_ferc714 + if "report_date" in respondent_id_ferc714.columns: + raise AssertionError("report_date already present, can't be added again!") + + ferc714_settings = context.resources.dataset_settings.ferc714 + report_dates = pd.DataFrame( + {"report_date": pd.to_datetime(sorted(ferc714_settings.years), format="%Y")} + ) + return respondent_id_ferc714.merge(report_dates, how="cross") @asset( From 71e77f96f5c61e4ab77ec9b67bdbd6a5e87cb84f Mon Sep 17 00:00:00 2001 From: zaneselvans Date: Tue, 12 Dec 2023 22:43:22 +0000 Subject: [PATCH 2/2] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 2 +- environments/conda-lock.yml | 24 ++++++++++++------------ environments/conda-osx-64.lock.yml | 2 +- environments/conda-osx-arm64.lock.yml | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index f69593763b..060b8dc2c3 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -520,7 +520,7 @@ dependencies: - dagster-postgres=0.21.12=pyhd8ed1ab_0 - fiona=1.9.5=py311hf8e0aa6_2 - google-api-core=2.15.0=pyhd8ed1ab_0 - - google-auth-oauthlib=1.1.0=pyhd8ed1ab_0 + - google-auth-oauthlib=1.2.0=pyhd8ed1ab_0 - graphviz=9.0.0=h78e8752_1 - jupyter_console=6.6.3=pyhd8ed1ab_0 - jupyter_events=0.9.0=pyhd8ed1ab_0 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index fe8d762f1f..30c112c77d 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -6527,7 +6527,7 @@ package: category: main optional: false - name: google-auth-oauthlib - version: 1.1.0 + version: 1.2.0 manager: conda platform: linux-64 dependencies: @@ -6535,14 +6535,14 @@ package: google-auth: ">=2.15.0" python: ">=3.6" requests-oauthlib: ">=0.7.0" - url: https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.1.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.2.0-pyhd8ed1ab_0.conda hash: - md5: ffa1e2fd52bc00ec0fc5680a2f4bd167 - sha256: fc12c5a06b4d073c855cc2c43edff0b444af7b0db860f578fee1486769af0f21 + md5: 2057f12885a73b4d621c075423cec969 + sha256: 39d031780d9ac2da430ead078a40ff67db3ad57e24ab1e3c68b4e0f2b48a2311 category: main optional: false - name: google-auth-oauthlib - version: 1.1.0 + version: 1.2.0 manager: conda platform: osx-64 dependencies: @@ -6550,14 +6550,14 @@ package: requests-oauthlib: ">=0.7.0" click: ">=6.0.0" google-auth: ">=2.15.0" - url: https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.1.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.2.0-pyhd8ed1ab_0.conda hash: - md5: ffa1e2fd52bc00ec0fc5680a2f4bd167 - sha256: fc12c5a06b4d073c855cc2c43edff0b444af7b0db860f578fee1486769af0f21 + md5: 2057f12885a73b4d621c075423cec969 + sha256: 39d031780d9ac2da430ead078a40ff67db3ad57e24ab1e3c68b4e0f2b48a2311 category: main optional: false - name: google-auth-oauthlib - version: 1.1.0 + version: 1.2.0 manager: conda platform: osx-arm64 dependencies: @@ -6565,10 +6565,10 @@ package: requests-oauthlib: ">=0.7.0" click: ">=6.0.0" google-auth: ">=2.15.0" - url: https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.1.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/google-auth-oauthlib-1.2.0-pyhd8ed1ab_0.conda hash: - md5: ffa1e2fd52bc00ec0fc5680a2f4bd167 - sha256: fc12c5a06b4d073c855cc2c43edff0b444af7b0db860f578fee1486769af0f21 + md5: 2057f12885a73b4d621c075423cec969 + sha256: 39d031780d9ac2da430ead078a40ff67db3ad57e24ab1e3c68b4e0f2b48a2311 category: main optional: false - name: google-cloud-core diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index bc9d0f9430..fa93adfc7c 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -500,7 +500,7 @@ dependencies: - dagster-postgres=0.21.12=pyhd8ed1ab_0 - fiona=1.9.5=py311h809632c_2 - google-api-core=2.15.0=pyhd8ed1ab_0 - - google-auth-oauthlib=1.1.0=pyhd8ed1ab_0 + - google-auth-oauthlib=1.2.0=pyhd8ed1ab_0 - jupyter_console=6.6.3=pyhd8ed1ab_0 - jupyter_events=0.9.0=pyhd8ed1ab_0 - libarrow-acero=14.0.1=hc222712_3_cpu diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 26e4819520..d305810804 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -500,7 +500,7 @@ dependencies: - dagster-postgres=0.21.12=pyhd8ed1ab_0 - fiona=1.9.5=py311h4760b73_2 - google-api-core=2.15.0=pyhd8ed1ab_0 - - google-auth-oauthlib=1.1.0=pyhd8ed1ab_0 + - google-auth-oauthlib=1.2.0=pyhd8ed1ab_0 - jupyter_console=6.6.3=pyhd8ed1ab_0 - jupyter_events=0.9.0=pyhd8ed1ab_0 - libarrow-acero=14.0.1=had9dd58_3_cpu