From 6bf1115a48ef400a9daf50414e574953872559f6 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Sat, 2 Sep 2023 13:34:50 -0300 Subject: [PATCH 01/80] Try etl/integraiton separation in tests. --- .github/workflows/tox-pytest.yml | 120 +++++++++++++++++++++++-------- 1 file changed, 90 insertions(+), 30 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 831ff3f48d..f30c923d46 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -4,7 +4,7 @@ name: tox-pytest on: [pull_request] env: - PUDL_OUTPUT: /home/runner/pudl-work/output + PUDL_OUTPUT: /home/runner/pudl-work/output/ PUDL_INPUT: /home/runner/pudl-work/data/ DAGSTER_HOME: /home/runner/pudl-work/dagster_home/ @@ -97,22 +97,18 @@ jobs: name: coverage-unit path: coverage.xml - ci-integration: + ci-integration-etl: runs-on: ubuntu-latest permissions: contents: read id-token: write strategy: fail-fast: false - defaults: - run: - shell: bash -l {0} - steps: - uses: actions/checkout@v3 with: fetch-depth: 2 - + - name: Install Conda environment using mamba uses: mamba-org/provision-with-micromamba@v16 with: @@ -121,18 +117,9 @@ jobs: channels: conda-forge,defaults channel-priority: strict - - name: Log environment details + - name: Install PUDL and dependencies run: | - conda info - conda list - conda config --show-sources - conda config --show - printenv | sort - - - name: Log SQLite3 version - run: | - which sqlite3 - sqlite3 --version + pip install . - name: Compile Zenodo datastore DOIs for cache invalidation run: @@ -149,9 +136,6 @@ jobs: - name: Make input, output and dagster dirs run: mkdir -p ${{ env.PUDL_OUTPUT }} ${{ env.PUDL_INPUT}} ${{ env.DAGSTER_HOME }} - - name: List workspace contents - run: find /home/runner/pudl-work - - name: Set default GCP credentials id: gcloud-auth continue-on-error: true @@ -160,18 +144,94 @@ jobs: workload_identity_provider: "projects/345950277072/locations/global/workloadIdentityPools/gh-actions-pool/providers/gh-actions-provider" service_account: "tox-pytest-github-action@catalyst-cooperative-pudl.iam.gserviceaccount.com" - - name: Run integration tests, trying to use GCS cache if possible + - name: Run Fast ETL run: | - tox -e integration -- --gcs-cache-path=gs://zenodo-cache.catalyst.coop --durations 0 + pudl_setup + ferc_to_sqlite src/pudl/package_data/settings/etl_fast.yml + pudl_etl --gcs-cache-path=gs://zenodo-cache.catalyst.coop \ + src/pudl/package_data/settings/etl_fast.yml - - name: Upload coverage - uses: actions/upload-artifact@v3 - with: - name: coverage-integration - path: coverage.xml + - name: Run integration pytests + run | + pytest src/pudl/test/integration - - name: Log post-test Zenodo datastore contents - run: find ${{ env.PUDL_INPUT }} +# ci-integration: +# runs-on: ubuntu-latest +# needs: +# - ci-integration-etl +# permissions: +# contents: read +# id-token: write +# strategy: +# fail-fast: false +# defaults: +# run: +# shell: bash -l {0} +# +# steps: +# - uses: actions/checkout@v3 +# with: +# fetch-depth: 2 +# +# - name: Install Conda environment using mamba +# uses: mamba-org/provision-with-micromamba@v16 +# with: +# environment-file: test/test-environment.yml +# cache-env: true +# channels: conda-forge,defaults +# channel-priority: strict +# +# - name: Log environment details +# run: | +# conda info +# conda list +# conda config --show-sources +# conda config --show +# printenv | sort +# +# - name: Log SQLite3 version +# run: | +# which sqlite3 +# sqlite3 --version +# +# - name: Compile Zenodo datastore DOIs for cache invalidation +# run: +# grep -e '.*10\.\(5281\|5072\)/zenodo\..*' src/pudl/workspace/datastore.py +# | sed -e 's/",*$//g' | sed -e 's/^.*"//g' | sort > datastore-dois.txt +# +# - name: Restore Zenodo datastore from cache if possible +# uses: actions/cache@v3 +# id: cache-zenodo-datastore +# with: +# path: ${{ env.PUDL_INPUT }} +# key: zenodo-datastore-${{ hashFiles('datastore-dois.txt') }} +# +# - name: Make input, output and dagster dirs +# run: mkdir -p ${{ env.PUDL_OUTPUT }} ${{ env.PUDL_INPUT}} ${{ env.DAGSTER_HOME }} +# +# - name: List workspace contents +# run: find /home/runner/pudl-work +# +# - name: Set default GCP credentials +# id: gcloud-auth +# continue-on-error: true +# uses: "google-github-actions/auth@v1" +# with: +# workload_identity_provider: "projects/345950277072/locations/global/workloadIdentityPools/gh-actions-pool/providers/gh-actions-provider" +# service_account: "tox-pytest-github-action@catalyst-cooperative-pudl.iam.gserviceaccount.com" +# +# - name: Run integration tests, trying to use GCS cache if possible +# run: | +# tox -e integration -- --gcs-cache-path=gs://zenodo-cache.catalyst.coop --durations 0 +# +# - name: Upload coverage +# uses: actions/upload-artifact@v3 +# with: +# name: coverage-integration +# path: coverage.xml +# +# - name: Log post-test Zenodo datastore contents +# run: find ${{ env.PUDL_INPUT }} ci-coverage: runs-on: ubuntu-latest From d89e1f409c2a33904ac9d4621565e504a9218fa6 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Sun, 3 Sep 2023 13:31:00 -0300 Subject: [PATCH 02/80] fix some formatting in the python thingies --- .github/workflows/tox-pytest.yml | 157 +++++++++++++++---------------- 1 file changed, 78 insertions(+), 79 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index f30c923d46..f41c811593 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -108,7 +108,7 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 2 - + - name: Install Conda environment using mamba uses: mamba-org/provision-with-micromamba@v16 with: @@ -152,86 +152,85 @@ jobs: src/pudl/package_data/settings/etl_fast.yml - name: Run integration pytests - run | + run: | pytest src/pudl/test/integration + ci-integration: + runs-on: ubuntu-latest + needs: + - ci-integration-etl + permissions: + contents: read + id-token: write + strategy: + fail-fast: false + defaults: + run: + shell: bash -l {0} -# ci-integration: -# runs-on: ubuntu-latest -# needs: -# - ci-integration-etl -# permissions: -# contents: read -# id-token: write -# strategy: -# fail-fast: false -# defaults: -# run: -# shell: bash -l {0} -# -# steps: -# - uses: actions/checkout@v3 -# with: -# fetch-depth: 2 -# -# - name: Install Conda environment using mamba -# uses: mamba-org/provision-with-micromamba@v16 -# with: -# environment-file: test/test-environment.yml -# cache-env: true -# channels: conda-forge,defaults -# channel-priority: strict -# -# - name: Log environment details -# run: | -# conda info -# conda list -# conda config --show-sources -# conda config --show -# printenv | sort -# -# - name: Log SQLite3 version -# run: | -# which sqlite3 -# sqlite3 --version -# -# - name: Compile Zenodo datastore DOIs for cache invalidation -# run: -# grep -e '.*10\.\(5281\|5072\)/zenodo\..*' src/pudl/workspace/datastore.py -# | sed -e 's/",*$//g' | sed -e 's/^.*"//g' | sort > datastore-dois.txt -# -# - name: Restore Zenodo datastore from cache if possible -# uses: actions/cache@v3 -# id: cache-zenodo-datastore -# with: -# path: ${{ env.PUDL_INPUT }} -# key: zenodo-datastore-${{ hashFiles('datastore-dois.txt') }} -# -# - name: Make input, output and dagster dirs -# run: mkdir -p ${{ env.PUDL_OUTPUT }} ${{ env.PUDL_INPUT}} ${{ env.DAGSTER_HOME }} -# -# - name: List workspace contents -# run: find /home/runner/pudl-work -# -# - name: Set default GCP credentials -# id: gcloud-auth -# continue-on-error: true -# uses: "google-github-actions/auth@v1" -# with: -# workload_identity_provider: "projects/345950277072/locations/global/workloadIdentityPools/gh-actions-pool/providers/gh-actions-provider" -# service_account: "tox-pytest-github-action@catalyst-cooperative-pudl.iam.gserviceaccount.com" -# -# - name: Run integration tests, trying to use GCS cache if possible -# run: | -# tox -e integration -- --gcs-cache-path=gs://zenodo-cache.catalyst.coop --durations 0 -# -# - name: Upload coverage -# uses: actions/upload-artifact@v3 -# with: -# name: coverage-integration -# path: coverage.xml -# -# - name: Log post-test Zenodo datastore contents -# run: find ${{ env.PUDL_INPUT }} + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 2 + # + # - name: Install Conda environment using mamba + # uses: mamba-org/provision-with-micromamba@v16 + # with: + # environment-file: test/test-environment.yml + # cache-env: true + # channels: conda-forge,defaults + # channel-priority: strict + # + # - name: Log environment details + # run: | + # conda info + # conda list + # conda config --show-sources + # conda config --show + # printenv | sort + # + # - name: Log SQLite3 version + # run: | + # which sqlite3 + # sqlite3 --version + # + # - name: Compile Zenodo datastore DOIs for cache invalidation + # run: + # grep -e '.*10\.\(5281\|5072\)/zenodo\..*' src/pudl/workspace/datastore.py + # | sed -e 's/",*$//g' | sed -e 's/^.*"//g' | sort > datastore-dois.txt + # + # - name: Restore Zenodo datastore from cache if possible + # uses: actions/cache@v3 + # id: cache-zenodo-datastore + # with: + # path: ${{ env.PUDL_INPUT }} + # key: zenodo-datastore-${{ hashFiles('datastore-dois.txt') }} + # + # - name: Make input, output and dagster dirs + # run: mkdir -p ${{ env.PUDL_OUTPUT }} ${{ env.PUDL_INPUT}} ${{ env.DAGSTER_HOME }} + # + # - name: List workspace contents + # run: find /home/runner/pudl-work + # + # - name: Set default GCP credentials + # id: gcloud-auth + # continue-on-error: true + # uses: "google-github-actions/auth@v1" + # with: + # workload_identity_provider: "projects/345950277072/locations/global/workloadIdentityPools/gh-actions-pool/providers/gh-actions-provider" + # service_account: "tox-pytest-github-action@catalyst-cooperative-pudl.iam.gserviceaccount.com" + # + # - name: Run integration tests, trying to use GCS cache if possible + # run: | + # tox -e integration -- --gcs-cache-path=gs://zenodo-cache.catalyst.coop --durations 0 + # + # - name: Upload coverage + # uses: actions/upload-artifact@v3 + # with: + # name: coverage-integration + # path: coverage.xml + # + # - name: Log post-test Zenodo datastore contents + # run: find ${{ env.PUDL_INPUT }} ci-coverage: runs-on: ubuntu-latest From 3b43bef9064377e6893a0f2729997e3a1c9433aa Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Mon, 4 Sep 2023 11:41:15 -0300 Subject: [PATCH 03/80] Minor changes to the tox-pytest setup --- .github/workflows/tox-pytest.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index f41c811593..b8390a8434 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -1,7 +1,7 @@ --- name: tox-pytest -on: [pull_request] +on: [pull_request, workflow_dispatch] env: PUDL_OUTPUT: /home/runner/pudl-work/output/ @@ -97,8 +97,15 @@ jobs: name: coverage-unit path: coverage.xml + # TODO(rousik): the following could simply run docker + # container mounted to specific directory. + # TODO(rousik): run this on larger runners, see dev for + # how to do that. ci-integration-etl: runs-on: ubuntu-latest + defaults: + run: + shell: bash permissions: contents: read id-token: write @@ -108,14 +115,16 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 2 - - name: Install Conda environment using mamba - uses: mamba-org/provision-with-micromamba@v16 + uses: mamba-org/setup-micromamba@v1 with: environment-file: test/test-environment.yml - cache-env: true - channels: conda-forge,defaults - channel-priority: strict + cache-environment: true + condarc: | + channels: + - conda-forge + - defaults + channel_priority: strict - name: Install PUDL and dependencies run: | From a8fb7dc46507b3d65b7af0c1c3136d7b6f39c763 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 6 Sep 2023 12:10:56 -0300 Subject: [PATCH 04/80] Comment out most things to isolate ci-integration-etl --- .github/workflows/tox-pytest.yml | 276 ++++++++++++++++--------------- 1 file changed, 139 insertions(+), 137 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index b8390a8434..0f58310c32 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -9,93 +9,93 @@ env: DAGSTER_HOME: /home/runner/pudl-work/dagster_home/ jobs: - ci-static: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - tox-env: - - linters - - docs - defaults: - run: - shell: bash -l {0} + # ci-static: + # runs-on: ubuntu-latest + # strategy: + # fail-fast: false + # matrix: + # tox-env: + # - linters + # - docs + # defaults: + # run: + # shell: bash -l {0} - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 2 + # steps: + # - uses: actions/checkout@v3 + # with: + # fetch-depth: 2 - - name: Install Conda environment using mamba - uses: mamba-org/provision-with-micromamba@v16 - with: - environment-file: test/test-environment.yml - cache-env: true - channels: conda-forge,defaults - channel-priority: strict + # - name: Install Conda environment using mamba + # uses: mamba-org/provision-with-micromamba@v16 + # with: + # environment-file: test/test-environment.yml + # cache-env: true + # channels: conda-forge,defaults + # channel-priority: strict - - name: Log environment details - run: | - conda info - conda list - conda config --show-sources - conda config --show - printenv | sort + # - name: Log environment details + # run: | + # conda info + # conda list + # conda config --show-sources + # conda config --show + # printenv | sort - - name: Build ${{ matrix.tox-env}} with Tox - run: | - tox -e ${{ matrix.tox-env }} + # - name: Build ${{ matrix.tox-env}} with Tox + # run: | + # tox -e ${{ matrix.tox-env }} - - name: Upload coverage - uses: actions/upload-artifact@v3 - if: ${{ matrix.tox-env == 'docs' }} - with: - name: coverage-docs - path: coverage.xml + # - name: Upload coverage + # uses: actions/upload-artifact@v3 + # if: ${{ matrix.tox-env == 'docs' }} + # with: + # name: coverage-docs + # path: coverage.xml - ci-unit: - runs-on: ubuntu-latest - strategy: - fail-fast: false - defaults: - run: - shell: bash -l {0} + # ci-unit: + # runs-on: ubuntu-latest + # strategy: + # fail-fast: false + # defaults: + # run: + # shell: bash -l {0} - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 2 + # steps: + # - uses: actions/checkout@v3 + # with: + # fetch-depth: 2 - - name: Install Conda environment using mamba - uses: mamba-org/provision-with-micromamba@v16 - with: - environment-file: test/test-environment.yml - cache-env: true - channels: conda-forge,defaults - channel-priority: strict + # - name: Install Conda environment using mamba + # uses: mamba-org/provision-with-micromamba@v16 + # with: + # environment-file: test/test-environment.yml + # cache-env: true + # channels: conda-forge,defaults + # channel-priority: strict - - name: Log environment details - run: | - conda info - conda list - conda config --show-sources - conda config --show - printenv | sort + # - name: Log environment details + # run: | + # conda info + # conda list + # conda config --show-sources + # conda config --show + # printenv | sort - - name: Log SQLite3 version - run: | - which sqlite3 - sqlite3 --version + # - name: Log SQLite3 version + # run: | + # which sqlite3 + # sqlite3 --version - - name: Run unit tests with Tox - run: | - tox -e unit -- --durations 0 + # - name: Run unit tests with Tox + # run: | + # tox -e unit -- --durations 0 - - name: Upload coverage - uses: actions/upload-artifact@v3 - with: - name: coverage-unit - path: coverage.xml + # - name: Upload coverage + # uses: actions/upload-artifact@v3 + # with: + # name: coverage-unit + # path: coverage.xml # TODO(rousik): the following could simply run docker # container mounted to specific directory. @@ -128,6 +128,7 @@ jobs: - name: Install PUDL and dependencies run: | + ls -l pip install . - name: Compile Zenodo datastore DOIs for cache invalidation @@ -163,23 +164,24 @@ jobs: - name: Run integration pytests run: | pytest src/pudl/test/integration - ci-integration: - runs-on: ubuntu-latest - needs: - - ci-integration-etl - permissions: - contents: read - id-token: write - strategy: - fail-fast: false - defaults: - run: - shell: bash -l {0} - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 2 + # ci-integration: + # runs-on: ubuntu-latest + # needs: + # - ci-integration-etl + # permissions: + # contents: read + # id-token: write + # strategy: + # fail-fast: false + # defaults: + # run: + # shell: bash -l {0} + + # steps: + # - uses: actions/checkout@v3 + # with: + # fetch-depth: 2 # # - name: Install Conda environment using mamba # uses: mamba-org/provision-with-micromamba@v16 @@ -241,50 +243,50 @@ jobs: # - name: Log post-test Zenodo datastore contents # run: find ${{ env.PUDL_INPUT }} - ci-coverage: - runs-on: ubuntu-latest - needs: - - ci-unit - - ci-integration - - ci-static - steps: - - uses: actions/checkout@v3 - - name: Download coverage - id: download-unit - uses: actions/download-artifact@v3 - with: - path: coverage - - name: List downloaded files - run: | - ls -R - - name: Upload test coverage report to CodeCov - uses: codecov/codecov-action@v3 - with: - directory: coverage + # ci-coverage: + # runs-on: ubuntu-latest + # needs: + # - ci-unit + # - ci-integration + # - ci-static + # steps: + # - uses: actions/checkout@v3 + # - name: Download coverage + # id: download-unit + # uses: actions/download-artifact@v3 + # with: + # path: coverage + # - name: List downloaded files + # run: | + # ls -R + # - name: Upload test coverage report to CodeCov + # uses: codecov/codecov-action@v3 + # with: + # directory: coverage - ci-notify: - runs-on: ubuntu-latest - if: ${{ always() }} - needs: - - ci-unit - - ci-integration - steps: - - name: Inform the Codemonkeys - uses: 8398a7/action-slack@v3 - continue-on-error: true - with: - status: custom - fields: workflow,job,commit,repo,ref,author,took - custom_payload: | - { - username: 'action-slack', - icon_emoji: ':octocat:', - attachments: [{ - color: '${{ needs.ci-test.result }}' === 'success' ? 'good' : '${{ needs.ci-test.result }}' === 'failure' ? 'danger' : 'warning', - text: `${process.env.AS_REPO}@${process.env.AS_REF}\n ${process.env.AS_WORKFLOW} (${process.env.AS_COMMIT})\n by ${process.env.AS_AUTHOR}\n Status: ${{ needs.ci-test.result }}`, - }] - } - env: - GITHUB_TOKEN: ${{ github.token }} # required - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} # required - MATRIX_CONTEXT: ${{ toJson(matrix) }} # required + # ci-notify: + # runs-on: ubuntu-latest + # if: ${{ always() }} + # needs: + # - ci-unit + # - ci-integration + # steps: + # - name: Inform the Codemonkeys + # uses: 8398a7/action-slack@v3 + # continue-on-error: true + # with: + # status: custom + # fields: workflow,job,commit,repo,ref,author,took + # custom_payload: | + # { + # username: 'action-slack', + # icon_emoji: ':octocat:', + # attachments: [{ + # color: '${{ needs.ci-test.result }}' === 'success' ? 'good' : '${{ needs.ci-test.result }}' === 'failure' ? 'danger' : 'warning', + # text: `${process.env.AS_REPO}@${process.env.AS_REF}\n ${process.env.AS_WORKFLOW} (${process.env.AS_COMMIT})\n by ${process.env.AS_AUTHOR}\n Status: ${{ needs.ci-test.result }}`, + # }] + # } + # env: + # GITHUB_TOKEN: ${{ github.token }} # required + # SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} # required + # MATRIX_CONTEXT: ${{ toJson(matrix) }} # required From 8587dc7bcec3da8c26819075578444c6b3e04404 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 6 Sep 2023 12:16:51 -0300 Subject: [PATCH 05/80] fix few things --- .github/workflows/tox-pytest.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 0f58310c32..2b2b7e4281 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -115,6 +115,10 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 2 + - uses: actions/setup-python@v4 + with: + python-version: '3.11' + cache: 'pip' - name: Install Conda environment using mamba uses: mamba-org/setup-micromamba@v1 with: @@ -125,7 +129,12 @@ jobs: - conda-forge - defaults channel_priority: strict - + - name: Bash + - shell: bash -el {0} + run: | + conda info + conda list + - name: Install PUDL and dependencies run: | ls -l From a5b2867503174006dd8f81b80e2e30a258887782 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 6 Sep 2023 12:18:10 -0300 Subject: [PATCH 06/80] fix condarc --- .github/workflows/tox-pytest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 2b2b7e4281..0cf9fbb273 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -129,7 +129,6 @@ jobs: - conda-forge - defaults channel_priority: strict - - name: Bash - shell: bash -el {0} run: | conda info From 49163207088d46e98f1cf815b7dd2f49d4aba810 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 6 Sep 2023 12:24:13 -0300 Subject: [PATCH 07/80] install snappy before pudl --- .github/workflows/tox-pytest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 0cf9fbb273..5b271435dd 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -137,6 +137,7 @@ jobs: - name: Install PUDL and dependencies run: | ls -l + sudo apt-get install libsnappy-dev pip install . - name: Compile Zenodo datastore DOIs for cache invalidation From 2b1a116859f68b2509f430ad1ea56f59154fed40 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 6 Sep 2023 12:58:18 -0300 Subject: [PATCH 08/80] Fix up integration tests, run on the large machine. --- .github/workflows/tox-pytest.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 5b271435dd..784ba92cec 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -102,7 +102,9 @@ jobs: # TODO(rousik): run this on larger runners, see dev for # how to do that. ci-integration-etl: - runs-on: ubuntu-latest + runs-on: + group: large-runner-group + labels: ubuntu-22.04-4core defaults: run: shell: bash @@ -170,9 +172,8 @@ jobs: pudl_etl --gcs-cache-path=gs://zenodo-cache.catalyst.coop \ src/pudl/package_data/settings/etl_fast.yml - - name: Run integration pytests - run: | - pytest src/pudl/test/integration + - name: Run integration tests on live data + run: pytest src/pudl/test/integration --live-dbs # ci-integration: # runs-on: ubuntu-latest From bb623afbfa73ba85020fb76efa071df5e67398e3 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 6 Sep 2023 13:04:00 -0300 Subject: [PATCH 09/80] add alembic setup --- .github/workflows/tox-pytest.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 784ba92cec..816f6cf1f6 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -167,13 +167,14 @@ jobs: - name: Run Fast ETL run: | - pudl_setup - ferc_to_sqlite src/pudl/package_data/settings/etl_fast.yml + alembic upgrade head + ferc_to_sqlite --gcs-cache-path=gs://zenodo-cache.catalyst.coop \ + src/pudl/package_data/settings/etl_fast.yml pudl_etl --gcs-cache-path=gs://zenodo-cache.catalyst.coop \ src/pudl/package_data/settings/etl_fast.yml - name: Run integration tests on live data - run: pytest src/pudl/test/integration --live-dbs + run: pytest --live-dbs src/pudl/test/integration # ci-integration: # runs-on: ubuntu-latest From da078196dc633cb66066d001d7b312f2334c64c9 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 6 Sep 2023 13:06:08 -0300 Subject: [PATCH 10/80] run conda info ahead of running the etl --- .github/workflows/tox-pytest.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 816f6cf1f6..44dc3e8010 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -117,6 +117,7 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 2 + # TODO(rousik): setup-python may be redundant with micromamba - uses: actions/setup-python@v4 with: python-version: '3.11' @@ -167,6 +168,7 @@ jobs: - name: Run Fast ETL run: | + conda info alembic upgrade head ferc_to_sqlite --gcs-cache-path=gs://zenodo-cache.catalyst.coop \ src/pudl/package_data/settings/etl_fast.yml From 7dc86aa41db39bde66b55b54e9ecfcf43589502c Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 6 Sep 2023 13:07:42 -0300 Subject: [PATCH 11/80] Log conda env --- .github/workflows/tox-pytest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 44dc3e8010..19123b4580 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -140,6 +140,7 @@ jobs: - name: Install PUDL and dependencies run: | ls -l + conda info sudo apt-get install libsnappy-dev pip install . From 162f62aaa129e9312736af575b96d1cd1adebb3a Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 6 Sep 2023 13:09:31 -0300 Subject: [PATCH 12/80] Disable large runners for now --- .github/workflows/tox-pytest.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 19123b4580..0cb0652dd8 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -102,9 +102,10 @@ jobs: # TODO(rousik): run this on larger runners, see dev for # how to do that. ci-integration-etl: - runs-on: - group: large-runner-group - labels: ubuntu-22.04-4core + runs-on: ubuntu-latest + # runs-on: + # group: large-runner-group + # labels: ubuntu-22.04-4core defaults: run: shell: bash From 68c6dee8639318075e96f15f180b74b4ec5b5165 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 6 Sep 2023 13:14:29 -0300 Subject: [PATCH 13/80] fix exec shell for the action --- .github/workflows/tox-pytest.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 0cb0652dd8..598a85f933 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -106,12 +106,12 @@ jobs: # runs-on: # group: large-runner-group # labels: ubuntu-22.04-4core - defaults: - run: - shell: bash permissions: contents: read id-token: write + defaults: + run: + shell: bash -l {0} strategy: fail-fast: false steps: @@ -133,16 +133,13 @@ jobs: - conda-forge - defaults channel_priority: strict - - shell: bash -el {0} - run: | + - run: | conda info conda list - name: Install PUDL and dependencies run: | - ls -l conda info - sudo apt-get install libsnappy-dev pip install . - name: Compile Zenodo datastore DOIs for cache invalidation From 09fb56d97389e2f865c804c50dc6d55a250936f1 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 6 Sep 2023 13:19:01 -0300 Subject: [PATCH 14/80] fix exec shell for the action --- .github/workflows/tox-pytest.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 598a85f933..81d45018ac 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -101,11 +101,10 @@ jobs: # container mounted to specific directory. # TODO(rousik): run this on larger runners, see dev for # how to do that. - ci-integration-etl: - runs-on: ubuntu-latest - # runs-on: - # group: large-runner-group - # labels: ubuntu-22.04-4core + ci-integration: + runs-on: + group: large-runner-group + labels: ubuntu-22.04-4core permissions: contents: read id-token: write From f05fcd3b5604b80b8436f644b6fed4898260e40d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 6 Sep 2023 16:20:59 +0000 Subject: [PATCH 15/80] [pre-commit.ci] auto fixes from pre-commit.com hooks For more information, see https://pre-commit.ci --- .github/workflows/tox-pytest.yml | 80 ++++++++++++++++---------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 81d45018ac..2cc470983d 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -10,48 +10,48 @@ env: jobs: # ci-static: - # runs-on: ubuntu-latest - # strategy: - # fail-fast: false - # matrix: - # tox-env: - # - linters - # - docs - # defaults: - # run: - # shell: bash -l {0} + # runs-on: ubuntu-latest + # strategy: + # fail-fast: false + # matrix: + # tox-env: + # - linters + # - docs + # defaults: + # run: + # shell: bash -l {0} - # steps: - # - uses: actions/checkout@v3 - # with: - # fetch-depth: 2 + # steps: + # - uses: actions/checkout@v3 + # with: + # fetch-depth: 2 - # - name: Install Conda environment using mamba - # uses: mamba-org/provision-with-micromamba@v16 - # with: - # environment-file: test/test-environment.yml - # cache-env: true - # channels: conda-forge,defaults - # channel-priority: strict + # - name: Install Conda environment using mamba + # uses: mamba-org/provision-with-micromamba@v16 + # with: + # environment-file: test/test-environment.yml + # cache-env: true + # channels: conda-forge,defaults + # channel-priority: strict - # - name: Log environment details - # run: | - # conda info - # conda list - # conda config --show-sources - # conda config --show - # printenv | sort + # - name: Log environment details + # run: | + # conda info + # conda list + # conda config --show-sources + # conda config --show + # printenv | sort - # - name: Build ${{ matrix.tox-env}} with Tox - # run: | - # tox -e ${{ matrix.tox-env }} + # - name: Build ${{ matrix.tox-env}} with Tox + # run: | + # tox -e ${{ matrix.tox-env }} - # - name: Upload coverage - # uses: actions/upload-artifact@v3 - # if: ${{ matrix.tox-env == 'docs' }} - # with: - # name: coverage-docs - # path: coverage.xml + # - name: Upload coverage + # uses: actions/upload-artifact@v3 + # if: ${{ matrix.tox-env == 'docs' }} + # with: + # name: coverage-docs + # path: coverage.xml # ci-unit: # runs-on: ubuntu-latest @@ -120,8 +120,8 @@ jobs: # TODO(rousik): setup-python may be redundant with micromamba - uses: actions/setup-python@v4 with: - python-version: '3.11' - cache: 'pip' + python-version: "3.11" + cache: "pip" - name: Install Conda environment using mamba uses: mamba-org/setup-micromamba@v1 with: @@ -135,7 +135,7 @@ jobs: - run: | conda info conda list - + - name: Install PUDL and dependencies run: | conda info From 173ad8c984d5173009cf4bf6c7371e3f4bec7a1c Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Wed, 6 Sep 2023 10:39:08 -0600 Subject: [PATCH 16/80] Fix path to integration tests. --- .github/workflows/tox-pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 2cc470983d..91f5cf1a93 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -174,7 +174,7 @@ jobs: src/pudl/package_data/settings/etl_fast.yml - name: Run integration tests on live data - run: pytest --live-dbs src/pudl/test/integration + run: pytest --live-dbs test/integration # ci-integration: # runs-on: ubuntu-latest From c9b83abf414b4c7bff54eba7127bef55a980e617 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 6 Sep 2023 13:39:23 -0300 Subject: [PATCH 17/80] Add concurrency to cancel previous runs --- .github/workflows/tox-pytest.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 81d45018ac..68df2aaf32 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -3,6 +3,10 @@ name: tox-pytest on: [pull_request, workflow_dispatch] +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + env: PUDL_OUTPUT: /home/runner/pudl-work/output/ PUDL_INPUT: /home/runner/pudl-work/data/ From a81ebf07cf68bb2e8a6a88e2878fe6dac9d27118 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 6 Sep 2023 13:41:07 -0300 Subject: [PATCH 18/80] Fix path to integration tests --- .github/workflows/tox-pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 4cb75344ca..eaeefe02fc 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -178,7 +178,7 @@ jobs: src/pudl/package_data/settings/etl_fast.yml - name: Run integration tests on live data - run: pytest --live-dbs test/integration + run: pytest --live-dbs src/pudl/test/integration # ci-integration: # runs-on: ubuntu-latest From 364b0537cee5fa4c627022532fb4990472e7f461 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 6 Sep 2023 13:50:56 -0300 Subject: [PATCH 19/80] fix pytest paths --- .github/workflows/tox-pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index eaeefe02fc..4cb75344ca 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -178,7 +178,7 @@ jobs: src/pudl/package_data/settings/etl_fast.yml - name: Run integration tests on live data - run: pytest --live-dbs src/pudl/test/integration + run: pytest --live-dbs test/integration # ci-integration: # runs-on: ubuntu-latest From d4b46fcd0eac370129de321774b85706b0617b07 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 6 Sep 2023 14:56:33 -0300 Subject: [PATCH 20/80] restructure etl steps --- .github/workflows/tox-pytest.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 4cb75344ca..7b662dc39a 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -136,14 +136,9 @@ jobs: - conda-forge - defaults channel_priority: strict - - run: | - conda info - conda list - name: Install PUDL and dependencies - run: | - conda info - pip install . + run: pip install . - name: Compile Zenodo datastore DOIs for cache invalidation run: @@ -168,18 +163,18 @@ jobs: workload_identity_provider: "projects/345950277072/locations/global/workloadIdentityPools/gh-actions-pool/providers/gh-actions-provider" service_account: "tox-pytest-github-action@catalyst-cooperative-pudl.iam.gserviceaccount.com" - - name: Run Fast ETL + - name: Prepare for ETL execution + run: almebic upgrade head + - name: Run ferc_to_sqlite run: | - conda info - alembic upgrade head ferc_to_sqlite --gcs-cache-path=gs://zenodo-cache.catalyst.coop \ src/pudl/package_data/settings/etl_fast.yml + - name: Run pudl_etl + run: | pudl_etl --gcs-cache-path=gs://zenodo-cache.catalyst.coop \ src/pudl/package_data/settings/etl_fast.yml - - - name: Run integration tests on live data - run: pytest --live-dbs test/integration - + - name: Run integration tests + run: tox -e validate -- --live-dbs # ci-integration: # runs-on: ubuntu-latest # needs: From ffd56e03058cdd0e3bcdcc18b70dcdde794b9c6f Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 6 Sep 2023 15:23:34 -0300 Subject: [PATCH 21/80] fix typo in alembic setup --- .github/workflows/tox-pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 7b662dc39a..038533a646 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -164,7 +164,7 @@ jobs: service_account: "tox-pytest-github-action@catalyst-cooperative-pudl.iam.gserviceaccount.com" - name: Prepare for ETL execution - run: almebic upgrade head + run: alembic upgrade head - name: Run ferc_to_sqlite run: | ferc_to_sqlite --gcs-cache-path=gs://zenodo-cache.catalyst.coop \ From 2edea32a6f6c5928308e8ae23c993b51586d0660 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 6 Sep 2023 16:12:08 -0300 Subject: [PATCH 22/80] uncomment steps and fix mamba setup --- .github/workflows/tox-pytest.yml | 260 ++++++++++++++++--------------- 1 file changed, 138 insertions(+), 122 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 038533a646..9cb4079dd4 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -13,99 +13,107 @@ env: DAGSTER_HOME: /home/runner/pudl-work/dagster_home/ jobs: - # ci-static: - # runs-on: ubuntu-latest - # strategy: - # fail-fast: false - # matrix: - # tox-env: - # - linters - # - docs - # defaults: - # run: - # shell: bash -l {0} + ci-static: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + tox-env: + - linters + - docs + defaults: + run: + shell: bash -l {0} - # steps: - # - uses: actions/checkout@v3 - # with: - # fetch-depth: 2 + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 2 - # - name: Install Conda environment using mamba - # uses: mamba-org/provision-with-micromamba@v16 - # with: - # environment-file: test/test-environment.yml - # cache-env: true - # channels: conda-forge,defaults - # channel-priority: strict + - name: Install Conda environment using mamba + uses: mamba-org/setup-micromamba@v1 + with: + environment-file: test/test-environment.yml + cache-environment: true + condarc: | + channels: + - conda-forge + - defaults + channel_priority: strict - # - name: Log environment details - # run: | - # conda info - # conda list - # conda config --show-sources - # conda config --show - # printenv | sort + - name: Log environment details + run: | + conda info + conda list + conda config --show-sources + conda config --show + printenv | sort - # - name: Build ${{ matrix.tox-env}} with Tox - # run: | - # tox -e ${{ matrix.tox-env }} + - name: Build ${{ matrix.tox-env}} with Tox + run: | + tox -e ${{ matrix.tox-env }} - # - name: Upload coverage - # uses: actions/upload-artifact@v3 - # if: ${{ matrix.tox-env == 'docs' }} - # with: - # name: coverage-docs - # path: coverage.xml + - name: Upload coverage + uses: actions/upload-artifact@v3 + if: ${{ matrix.tox-env == 'docs' }} + with: + name: coverage-docs + path: coverage.xml - # ci-unit: - # runs-on: ubuntu-latest - # strategy: - # fail-fast: false - # defaults: - # run: - # shell: bash -l {0} + ci-unit: + runs-on: ubuntu-latest + strategy: + fail-fast: false + defaults: + run: + shell: bash -l {0} - # steps: - # - uses: actions/checkout@v3 - # with: - # fetch-depth: 2 + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 2 - # - name: Install Conda environment using mamba - # uses: mamba-org/provision-with-micromamba@v16 - # with: - # environment-file: test/test-environment.yml - # cache-env: true - # channels: conda-forge,defaults - # channel-priority: strict + - name: Install Conda environment using mamba + uses: mamba-org/setup-micromamba@v1 + with: + environment-file: test/test-environment.yml + cache-environment: true + condarc: | + channels: + - conda-forge + - defaults + channel_priority: strict - # - name: Log environment details - # run: | - # conda info - # conda list - # conda config --show-sources - # conda config --show - # printenv | sort + - name: Log environment details + run: | + conda info + conda list + conda config --show-sources + conda config --show + printenv | sort - # - name: Log SQLite3 version - # run: | - # which sqlite3 - # sqlite3 --version + - name: Log SQLite3 version + run: | + which sqlite3 + sqlite3 --version - # - name: Run unit tests with Tox - # run: | - # tox -e unit -- --durations 0 + - name: Run unit tests with Tox + run: | + tox -e unit -- --durations 0 - # - name: Upload coverage - # uses: actions/upload-artifact@v3 - # with: - # name: coverage-unit - # path: coverage.xml + - name: Upload coverage + uses: actions/upload-artifact@v3 + with: + name: coverage-unit + path: coverage.xml # TODO(rousik): the following could simply run docker # container mounted to specific directory. # TODO(rousik): run this on larger runners, see dev for # how to do that. ci-integration: + needs: + - ci-unit runs-on: group: large-runner-group labels: ubuntu-22.04-4core @@ -174,7 +182,15 @@ jobs: pudl_etl --gcs-cache-path=gs://zenodo-cache.catalyst.coop \ src/pudl/package_data/settings/etl_fast.yml - name: Run integration tests - run: tox -e validate -- --live-dbs + run: tox -e integration -- --live-dbs + + # TODO(rousik): upload coverage reports, need to find out how to best do so + # - name: Upload coverage + # uses: actions/upload-artifact@v3 + # with: + # name: coverage-integration + # path: coverage.xml + # ci-integration: # runs-on: ubuntu-latest # needs: @@ -253,50 +269,50 @@ jobs: # - name: Log post-test Zenodo datastore contents # run: find ${{ env.PUDL_INPUT }} - # ci-coverage: - # runs-on: ubuntu-latest - # needs: - # - ci-unit - # - ci-integration - # - ci-static - # steps: - # - uses: actions/checkout@v3 - # - name: Download coverage - # id: download-unit - # uses: actions/download-artifact@v3 - # with: - # path: coverage - # - name: List downloaded files - # run: | - # ls -R - # - name: Upload test coverage report to CodeCov - # uses: codecov/codecov-action@v3 - # with: - # directory: coverage + ci-coverage: + runs-on: ubuntu-latest + needs: + - ci-unit + - ci-integration + - ci-static + steps: + - uses: actions/checkout@v3 + - name: Download coverage + id: download-unit + uses: actions/download-artifact@v3 + with: + path: coverage + - name: List downloaded files + run: | + ls -R + - name: Upload test coverage report to CodeCov + uses: codecov/codecov-action@v3 + with: + directory: coverage - # ci-notify: - # runs-on: ubuntu-latest - # if: ${{ always() }} - # needs: - # - ci-unit - # - ci-integration - # steps: - # - name: Inform the Codemonkeys - # uses: 8398a7/action-slack@v3 - # continue-on-error: true - # with: - # status: custom - # fields: workflow,job,commit,repo,ref,author,took - # custom_payload: | - # { - # username: 'action-slack', - # icon_emoji: ':octocat:', - # attachments: [{ - # color: '${{ needs.ci-test.result }}' === 'success' ? 'good' : '${{ needs.ci-test.result }}' === 'failure' ? 'danger' : 'warning', - # text: `${process.env.AS_REPO}@${process.env.AS_REF}\n ${process.env.AS_WORKFLOW} (${process.env.AS_COMMIT})\n by ${process.env.AS_AUTHOR}\n Status: ${{ needs.ci-test.result }}`, - # }] - # } - # env: - # GITHUB_TOKEN: ${{ github.token }} # required - # SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} # required - # MATRIX_CONTEXT: ${{ toJson(matrix) }} # required + ci-notify: + runs-on: ubuntu-latest + if: ${{ always() }} + needs: + - ci-unit + - ci-integration + steps: + - name: Inform the Codemonkeys + uses: 8398a7/action-slack@v3 + continue-on-error: true + with: + status: custom + fields: workflow,job,commit,repo,ref,author,took + custom_payload: | + { + username: 'action-slack', + icon_emoji: ':octocat:', + attachments: [{ + color: '${{ needs.ci-test.result }}' === 'success' ? 'good' : '${{ needs.ci-test.result }}' === 'failure' ? 'danger' : 'warning', + text: `${process.env.AS_REPO}@${process.env.AS_REF}\n ${process.env.AS_WORKFLOW} (${process.env.AS_COMMIT})\n by ${process.env.AS_AUTHOR}\n Status: ${{ needs.ci-test.result }}`, + }] + } + env: + GITHUB_TOKEN: ${{ github.token }} # required + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} # required + MATRIX_CONTEXT: ${{ toJson(matrix) }} # required From d5fcc73e2dfe70b545fec487b3634cc0897c6b10 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Wed, 6 Sep 2023 17:18:18 -0600 Subject: [PATCH 23/80] Install test dependencies with pip --- .github/workflows/tox-pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 9cb4079dd4..420d98fb9d 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -146,7 +146,7 @@ jobs: channel_priority: strict - name: Install PUDL and dependencies - run: pip install . + run: pip install "./[test]" - name: Compile Zenodo datastore DOIs for cache invalidation run: From fb2892fa4feaf55cc85e16a4781d6caa86875234 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Mon, 25 Sep 2023 16:01:26 -0700 Subject: [PATCH 24/80] Add test deps to ci steps that use coverage. --- tox.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tox.ini b/tox.ini index 5e5c3ffb32..e97c3e6855 100644 --- a/tox.ini +++ b/tox.ini @@ -96,6 +96,8 @@ commands = description = Run ferc_to_sqlite script in the CI environment. envdir = {toxworkdir}/.ci_env runner = ignore_env_name_mismatch +extras = + test commands = bash -c 'coverage run --concurrency=multiprocessing src/pudl/ferc_to_sqlite/cli.py {gcs_cache} src/pudl/package_data/settings/etl_fast.yml' bash -c 'coverage combine --append' @@ -104,6 +106,8 @@ commands = description = Run the ETL script in the CI environment. envdir = {toxworkdir}/.ci_env runner = ignore_env_name_mismatch +extras = + test commands = bash -c 'alembic upgrade head' bash -c 'coverage run --concurrency=multiprocessing src/pudl/etl/cli.py {gcs_cache} src/pudl/package_data/settings/etl_fast.yml' From 678d54e0ea1241ff2d2a2fba9ce936158ff666c2 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Mon, 25 Sep 2023 20:55:56 -0700 Subject: [PATCH 25/80] I don't understand tox substitution :-/ --- tox.ini | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index e97c3e6855..805474ffb0 100644 --- a/tox.ini +++ b/tox.ini @@ -26,7 +26,6 @@ passenv = PUDL_OUTPUT SQLALCHEMY_WARN_20 covargs = --cov={envsitepackagesdir}/pudl --cov-report=xml -gcs_cache = --gcs-cache-path=gs://zenodo-cache.catalyst.coop covreport = coverage report --sort=cover ########################################################################### @@ -99,7 +98,7 @@ runner = ignore_env_name_mismatch extras = test commands = - bash -c 'coverage run --concurrency=multiprocessing src/pudl/ferc_to_sqlite/cli.py {gcs_cache} src/pudl/package_data/settings/etl_fast.yml' + bash -c 'coverage run --concurrency=multiprocessing src/pudl/ferc_to_sqlite/cli.py --gcs-cache-path=gs://zenodo-cache.catalyst.coop src/pudl/package_data/settings/etl_fast.yml' bash -c 'coverage combine --append' [testenv:ci_pudl_etl] @@ -110,7 +109,7 @@ extras = test commands = bash -c 'alembic upgrade head' - bash -c 'coverage run --concurrency=multiprocessing src/pudl/etl/cli.py {gcs_cache} src/pudl/package_data/settings/etl_fast.yml' + bash -c 'coverage run --concurrency=multiprocessing src/pudl/etl/cli.py --gcs-cache-path=gs://zenodo-cache.catalyst.coop src/pudl/package_data/settings/etl_fast.yml' bash -c 'coverage combine --append' [testenv:ci_integration] description = Run the ETL script in the CI environment. From 6ec7d995035cbfa464b77cd9515da0adcaf45ca7 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Mon, 25 Sep 2023 21:23:31 -0700 Subject: [PATCH 26/80] Fix ETL command to run. Ugh. --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 805474ffb0..4c98b1e7db 100644 --- a/tox.ini +++ b/tox.ini @@ -109,7 +109,7 @@ extras = test commands = bash -c 'alembic upgrade head' - bash -c 'coverage run --concurrency=multiprocessing src/pudl/etl/cli.py --gcs-cache-path=gs://zenodo-cache.catalyst.coop src/pudl/package_data/settings/etl_fast.yml' + bash -c 'coverage run --concurrency=multiprocessing src/pudl/cli/etl.py --gcs-cache-path=gs://zenodo-cache.catalyst.coop src/pudl/package_data/settings/etl_fast.yml' bash -c 'coverage combine --append' [testenv:ci_integration] description = Run the ETL script in the CI environment. From 2f434059e6a3ef0bb0b8651821f7905bb79099d0 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Mon, 25 Sep 2023 23:01:30 -0700 Subject: [PATCH 27/80] Include datasette as tox dependency. --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 4c98b1e7db..3c4cc54718 100644 --- a/tox.ini +++ b/tox.ini @@ -117,6 +117,7 @@ envdir = {toxworkdir}/.ci_env runner = ignore_env_name_mismatch extras = test + datasette commands = pytest {tty:--color=yes} --live-dbs {posargs} --cov-append {[testenv]covargs} test/integration From 66f5f549dd63d5dea1730a8315ee10d5bb1d85f9 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Tue, 26 Sep 2023 09:07:32 -0700 Subject: [PATCH 28/80] Fix the input/output path override behavior when running in gha context. --- test/conftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/conftest.py b/test/conftest.py index 5bc5e4b733..8125641d92 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -373,8 +373,8 @@ def configure_paths_for_tests(tmp_path_factory, request): gha_override_input = False gha_override_output = False if os.environ.get("GITHUB_ACTIONS", False): - gha_override_input = "PUDL_INPUTS" not in os.environ - gha_override_output = "PUDL_OUTPUTS" not in os.environ + gha_override_input = "PUDL_INPUT" not in os.environ + gha_override_output = "PUDL_OUTPUT" not in os.environ logger.info( "Running in GitHub Actions environment, using" f" temporary input dir: {gha_override_input}, and" From 28af7873d5a28f925b187fee07b95cd993f73542 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 18 Oct 2023 13:49:15 -0400 Subject: [PATCH 29/80] Rename github_ tox steps, make them fail unless GITHUB_ACTIONS env exists. --- .github/workflows/tox-pytest.yml | 7 +++---- tox.ini | 16 ++++++++++------ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 708e30c812..f9a3d1a232 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -166,13 +166,12 @@ jobs: service_account: "tox-pytest-github-action@catalyst-cooperative-pudl.iam.gserviceaccount.com" - name: Run ferc_to_sqlite - run: tox -e ci_ferc_to_sqlite + run: tox -e github_ferc_to_sqlite - name: Run pudl_etl - run: tox -e ci_pudl_etl - + run: tox -e github_pudl_etl - name: Run integration tests - run: tox -e ci_integration + run: tox -e github_integration - name: Upload coverage uses: actions/upload-artifact@v3 diff --git a/tox.ini b/tox.ini index 3c4cc54718..8d43851229 100644 --- a/tox.ini +++ b/tox.ini @@ -91,34 +91,38 @@ commands = # The following steps are run in sequence as part of the CI workflows on # github to run the ETL and integration tests in a modular fashion. ########################################################################### -[testenv:ci_ferc_to_sqlite] +[testenv:github_ferc_to_sqlite] description = Run ferc_to_sqlite script in the CI environment. -envdir = {toxworkdir}/.ci_env +envdir = {toxworkdir}/.github_env runner = ignore_env_name_mismatch extras = test commands = + bash -c 'printenv GITHUB_ACTIONS' bash -c 'coverage run --concurrency=multiprocessing src/pudl/ferc_to_sqlite/cli.py --gcs-cache-path=gs://zenodo-cache.catalyst.coop src/pudl/package_data/settings/etl_fast.yml' bash -c 'coverage combine --append' -[testenv:ci_pudl_etl] +[testenv:github_pudl_etl] description = Run the ETL script in the CI environment. -envdir = {toxworkdir}/.ci_env +envdir = {toxworkdir}/.github_env runner = ignore_env_name_mismatch extras = test commands = + bash -c 'printenv GITHUB_ACTIONS' bash -c 'alembic upgrade head' bash -c 'coverage run --concurrency=multiprocessing src/pudl/cli/etl.py --gcs-cache-path=gs://zenodo-cache.catalyst.coop src/pudl/package_data/settings/etl_fast.yml' bash -c 'coverage combine --append' -[testenv:ci_integration] + +[testenv:github_integration] description = Run the ETL script in the CI environment. -envdir = {toxworkdir}/.ci_env +envdir = {toxworkdir}/.github_env runner = ignore_env_name_mismatch extras = test datasette commands = + bash -c 'printenv GITHUB_ACTIONS' pytest {tty:--color=yes} --live-dbs {posargs} --cov-append {[testenv]covargs} test/integration ########################################################################### From 051d2b110eaa5065bbd6b4943d13a567e34a9012 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Fri, 20 Oct 2023 20:33:53 -0400 Subject: [PATCH 30/80] Explicitly demand tox>=4.3.3 for the env reuse. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 691e04a184..315a3da534 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -124,7 +124,7 @@ dev = [ "jedi>=0.18,<0.20", "lxml>=4.6,<4.10", "ruff>=0.1,<0.2", - "tox>=4,<4.12", + "tox>=4.3.3,<4.12", "twine>=4,<4.1", ] doc = [ From 58597e443913fe71fa2c32eec88d1919f8610505 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Tue, 24 Oct 2023 23:43:58 -0600 Subject: [PATCH 31/80] Drop usage of tox in the new ci-integration test. We decided that involving tox here doesn't really add much value, and keeping the entire logic in GHA might make it a bit more readable. --- .coveragerc | 1 + .github/workflows/tox-pytest.yml | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.coveragerc b/.coveragerc index 6bf97eb778..459575f199 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,4 +1,5 @@ [run] +concurrency = multiprocessing omit = *__main__.py *__init__.py diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index f9a3d1a232..b4b7b9d928 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -17,6 +17,8 @@ env: PUDL_OUTPUT: /home/runner/pudl-work/output/ PUDL_INPUT: /home/runner/pudl-work/data/ DAGSTER_HOME: /home/runner/pudl-work/dagster_home/ + ETL_CONFIG: src/pudl/package_data/settings/etl_fast.yml + ETL_COMMANDLINE_OPTIONS: --gcs-cache-path=gs://zenodo-cache.catalyst.coop jobs: ci-static: @@ -166,13 +168,20 @@ jobs: service_account: "tox-pytest-github-action@catalyst-cooperative-pudl.iam.gserviceaccount.com" - name: Run ferc_to_sqlite - run: tox -e github_ferc_to_sqlite - + run: | + coverage --concurrency=multiprocessing run \ + src/pudl/ferc_to_sqlite/cli.py --clobber ${{ env.ETL_COMMANDLINE_OPTIONS }} ${{ env.ETL_CONFIG }} - name: Run pudl_etl - run: tox -e github_pudl_etl + run: | + coverage --concurrency=multiprocessing run \ + src/pudl/etl/cli.py ${{ env.ETL_COMMANDLINE_OPTIONS }} ${{ env.ETL_CONFIG }} - name: Run integration tests - run: tox -e github_integration - + run: | + coverage run --paralell-mode -m pytest --live-dbs test/integration + - name: Generate coverage + run: | + coverage combine + coverage xml - name: Upload coverage uses: actions/upload-artifact@v3 with: From 5b162bd26bae972179b56e6c609ad1fff72b822f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 05:45:03 +0000 Subject: [PATCH 32/80] [pre-commit.ci] auto fixes from pre-commit.com hooks For more information, see https://pre-commit.ci --- .github/workflows/tox-pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index b4b7b9d928..9c99976763 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -168,7 +168,7 @@ jobs: service_account: "tox-pytest-github-action@catalyst-cooperative-pudl.iam.gserviceaccount.com" - name: Run ferc_to_sqlite - run: | + run: | coverage --concurrency=multiprocessing run \ src/pudl/ferc_to_sqlite/cli.py --clobber ${{ env.ETL_COMMANDLINE_OPTIONS }} ${{ env.ETL_CONFIG }} - name: Run pudl_etl From b7afb1eaec842f423bd04dc4afa45f41b898b143 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 25 Oct 2023 00:07:00 -0600 Subject: [PATCH 33/80] Put back diagnostic steps and install PUDL dependencies. --- .github/workflows/tox-pytest.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 9c99976763..e70a839c4e 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -144,6 +144,21 @@ jobs: - conda-forge - defaults channel_priority: strict + - name: Install PUDL and its dependencies + run: pip install .[test] + - name: Log environment details + run: | + conda info + conda list + conda config --show-sources + conda config --show + printenv | sort + + - name: Log SQLite3 version + run: | + which sqlite3 + sqlite3 --version + - name: Compile Zenodo datastore DOIs for cache invalidation run: grep -e '.*10\.\(5281\|5072\)/zenodo\..*' src/pudl/workspace/datastore.py @@ -159,6 +174,9 @@ jobs: - name: Make input, output and dagster dirs run: mkdir -p ${{ env.PUDL_OUTPUT }} ${{ env.PUDL_INPUT}} ${{ env.DAGSTER_HOME }} + - name: List workspace contents + run: find /home/runner/pudl-work + - name: Set default GCP credentials id: gcloud-auth continue-on-error: true From e17f35c25568bbdda671b40c09074d0d8b3832dd Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 25 Oct 2023 00:15:49 -0600 Subject: [PATCH 34/80] Few cleanup tasks. 1. disable ci-notify, it's severely broken 2. give human-friendly names to jobs and this workflow --- .github/workflows/tox-pytest.yml | 64 ++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index e70a839c4e..86082713dc 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -1,5 +1,7 @@ --- -name: tox-pytest +name: Code validation +# TODO(rousik): We could name this "Code tests", as that would +# better represent what it does. Maybe even migrate yml file. on: workflow_dispatch: @@ -22,6 +24,7 @@ env: jobs: ci-static: + name: Static tests runs-on: ubuntu-latest strategy: fail-fast: false @@ -69,6 +72,7 @@ jobs: path: coverage.xml ci-unit: + name: Unit tests runs-on: ubuntu-latest strategy: fail-fast: false @@ -116,6 +120,7 @@ jobs: path: coverage.xml ci-integration: + name: Integration (fast ETL run) needs: - ci-unit runs-on: @@ -207,6 +212,7 @@ jobs: path: coverage.xml ci-coverage: + name: Upload coverage to CodeCov runs-on: ubuntu-latest needs: - ci-unit @@ -227,29 +233,33 @@ jobs: with: directory: coverage - ci-notify: - runs-on: ubuntu-latest - if: ${{ always() }} - needs: - - ci-unit - - ci-integration - steps: - - name: Inform the Codemonkeys - uses: 8398a7/action-slack@v3 - continue-on-error: true - with: - status: custom - fields: workflow,job,commit,repo,ref,author,took - custom_payload: | - { - username: 'action-slack', - icon_emoji: ':octocat:', - attachments: [{ - color: '${{ needs.ci-test.result }}' === 'success' ? 'good' : '${{ needs.ci-test.result }}' === 'failure' ? 'danger' : 'warning', - text: `${process.env.AS_REPO}@${process.env.AS_REF}\n ${process.env.AS_WORKFLOW} (${process.env.AS_COMMIT})\n by ${process.env.AS_AUTHOR}\n Status: ${{ needs.ci-test.result }}`, - }] - } - env: - GITHUB_TOKEN: ${{ github.token }} # required - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} # required - MATRIX_CONTEXT: ${{ toJson(matrix) }} # required + # TODO(rousik): The following slack notification gives no value and + # needs to be fixed. Until then, it might be better to do nothing + # at all. + # ci-notify: + # name: Notify slack + # runs-on: ubuntu-latest + # if: ${{ always() }} + # needs: + # - ci-unit + # - ci-integration + # steps: + # - name: Inform the Codemonkeys + # uses: 8398a7/action-slack@v3 + # continue-on-error: true + # with: + # status: custom + # fields: workflow,job,commit,repo,ref,author,took + # custom_payload: | + # { + # username: 'action-slack', + # icon_emoji: ':octocat:', + # attachments: [{ + # color: '${{ needs.ci-test.result }}' === 'success' ? 'good' : '${{ needs.ci-test.result }}' === 'failure' ? 'danger' : 'warning', + # text: `${process.env.AS_REPO}@${process.env.AS_REF}\n ${process.env.AS_WORKFLOW} (${process.env.AS_COMMIT})\n by ${process.env.AS_AUTHOR}\n Status: ${{ needs.ci-test.result }}`, + # }] + # } + # env: + # GITHUB_TOKEN: ${{ github.token }} # required + # SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} # required + # MATRIX_CONTEXT: ${{ toJson(matrix) }} # required From 64500b7e9835f5235ede17b5e884b0fba5a57d17 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 25 Oct 2023 00:19:53 -0600 Subject: [PATCH 35/80] Fix up the coverage commands. --- .github/workflows/tox-pytest.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 86082713dc..4f335c3de5 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -21,6 +21,7 @@ env: DAGSTER_HOME: /home/runner/pudl-work/dagster_home/ ETL_CONFIG: src/pudl/package_data/settings/etl_fast.yml ETL_COMMANDLINE_OPTIONS: --gcs-cache-path=gs://zenodo-cache.catalyst.coop + COVERAGE_OPTIONS: --concurrency=multiprocessing --parallel-mode jobs: ci-static: @@ -192,15 +193,17 @@ jobs: - name: Run ferc_to_sqlite run: | - coverage --concurrency=multiprocessing run \ + coverage run ${{ env.COVERAGE_OPTIONS }} \ src/pudl/ferc_to_sqlite/cli.py --clobber ${{ env.ETL_COMMANDLINE_OPTIONS }} ${{ env.ETL_CONFIG }} - name: Run pudl_etl run: | - coverage --concurrency=multiprocessing run \ + coverage run ${{ env.COVERAGE_OPTIONS }} \ src/pudl/etl/cli.py ${{ env.ETL_COMMANDLINE_OPTIONS }} ${{ env.ETL_CONFIG }} - name: Run integration tests run: | - coverage run --paralell-mode -m pytest --live-dbs test/integration + coverage run ${{ env.COVERAGE_OPTIONS }} \ + \ + -m pytest --live-dbs test/integration - name: Generate coverage run: | coverage combine From 3a7b30a565e9f7a9169246f08ba41754199d4c17 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 06:20:23 +0000 Subject: [PATCH 36/80] [pre-commit.ci] auto fixes from pre-commit.com hooks For more information, see https://pre-commit.ci --- .github/workflows/tox-pytest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 4f335c3de5..16fcf748e3 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -1,6 +1,6 @@ --- name: Code validation -# TODO(rousik): We could name this "Code tests", as that would +# TODO(rousik): We could name this "Code tests", as that would # better represent what it does. Maybe even migrate yml file. on: @@ -238,7 +238,7 @@ jobs: # TODO(rousik): The following slack notification gives no value and # needs to be fixed. Until then, it might be better to do nothing - # at all. + # at all. # ci-notify: # name: Notify slack # runs-on: ubuntu-latest From 2a9f5a2a382bdd01ddef168680ebc6b28caefb23 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 25 Oct 2023 01:25:24 -0600 Subject: [PATCH 37/80] Fix the path to etl.py. The divergence between cli/etl.py vs ferc_to_sqlite/cli.py drives me bonkers. --- .github/workflows/tox-pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 16fcf748e3..cd879f709e 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -198,7 +198,7 @@ jobs: - name: Run pudl_etl run: | coverage run ${{ env.COVERAGE_OPTIONS }} \ - src/pudl/etl/cli.py ${{ env.ETL_COMMANDLINE_OPTIONS }} ${{ env.ETL_CONFIG }} + src/pudl/cli/etl.py ${{ env.ETL_COMMANDLINE_OPTIONS }} ${{ env.ETL_CONFIG }} - name: Run integration tests run: | coverage run ${{ env.COVERAGE_OPTIONS }} \ From f226f38cf476db7edce4c92cdac33f74d1da0f26 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 25 Oct 2023 01:29:33 -0600 Subject: [PATCH 38/80] Run alembic before ETL. --- .github/workflows/tox-pytest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index cd879f709e..5865cb47a5 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -197,6 +197,7 @@ jobs: src/pudl/ferc_to_sqlite/cli.py --clobber ${{ env.ETL_COMMANDLINE_OPTIONS }} ${{ env.ETL_CONFIG }} - name: Run pudl_etl run: | + alembic upgrade head coverage run ${{ env.COVERAGE_OPTIONS }} \ src/pudl/cli/etl.py ${{ env.ETL_COMMANDLINE_OPTIONS }} ${{ env.ETL_CONFIG }} - name: Run integration tests From 0590f2929b89b50abecd4dc99c939411c1908d50 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 25 Oct 2023 01:35:04 -0600 Subject: [PATCH 39/80] Revert changes to other files. --- pyproject.toml | 2 +- tox.ini | 43 ------------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0d786b277d..063f26d6a5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -124,7 +124,7 @@ dev = [ "jedi>=0.18,<0.20", "lxml>=4.6,<4.10", "ruff>=0.1,<0.2", - "tox>=4.3.3,<4.12", + "tox>=4,<4.12", "twine>=4,<4.1", ] doc = [ diff --git a/tox.ini b/tox.ini index 5e4a7e2a65..b547c307af 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,4 @@ [tox] -min_version = 4.3.3 -requires = - tox-ignore-env-name-mismatch ~= 0.2.0 envlist = ci [testenv] @@ -85,45 +82,6 @@ commands = bash -c 'coverage run --source={envsitepackagesdir}/pudl -- $(which sphinx-build) -W -b html docs docs/_build/html' coverage xml -########################################################################### -# Continuous integration tests. -# -# The following steps are run in sequence as part of the CI workflows on -# github to run the ETL and integration tests in a modular fashion. -########################################################################### -[testenv:github_ferc_to_sqlite] -description = Run ferc_to_sqlite script in the CI environment. -envdir = {toxworkdir}/.github_env -runner = ignore_env_name_mismatch -extras = - test -commands = - bash -c 'printenv GITHUB_ACTIONS' - bash -c 'coverage run --concurrency=multiprocessing src/pudl/ferc_to_sqlite/cli.py --gcs-cache-path=gs://zenodo-cache.catalyst.coop src/pudl/package_data/settings/etl_fast.yml' - bash -c 'coverage combine --append' - -[testenv:github_pudl_etl] -description = Run the ETL script in the CI environment. -envdir = {toxworkdir}/.github_env -runner = ignore_env_name_mismatch -extras = - test -commands = - bash -c 'printenv GITHUB_ACTIONS' - bash -c 'alembic upgrade head' - bash -c 'coverage run --concurrency=multiprocessing src/pudl/cli/etl.py --gcs-cache-path=gs://zenodo-cache.catalyst.coop src/pudl/package_data/settings/etl_fast.yml' - bash -c 'coverage combine --append' - -[testenv:github_integration] -description = Run the ETL script in the CI environment. -envdir = {toxworkdir}/.github_env -runner = ignore_env_name_mismatch -extras = - test - datasette -commands = - bash -c 'printenv GITHUB_ACTIONS' - pytest {tty:--color=yes} --live-dbs {posargs} --cov-append {[testenv]covargs} test/integration ########################################################################### # Test the code and validate data @@ -151,7 +109,6 @@ skip_install = false recreate = true extras = test - commands = pytest {tty:--color=yes} --live-dbs \ test/validate/epacamd_eia_test.py::test_minmax_rows \ From fa814ea51a77df71fb66db0245fd7cf46fedf168 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Sat, 28 Oct 2023 08:11:56 -0600 Subject: [PATCH 40/80] Also install datasette dependencies. --- .github/workflows/tox-pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 5865cb47a5..d7b8054add 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -151,7 +151,7 @@ jobs: - defaults channel_priority: strict - name: Install PUDL and its dependencies - run: pip install .[test] + run: pip install .[test,datasette] - name: Log environment details run: | conda info From c3da09ee3da5b6e0abca19b6ab91f3edb1b721dc Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Sat, 28 Oct 2023 22:03:56 -0600 Subject: [PATCH 41/80] Revert changes to .coveragerc --- .coveragerc | 1 - 1 file changed, 1 deletion(-) diff --git a/.coveragerc b/.coveragerc index 459575f199..6bf97eb778 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,5 +1,4 @@ [run] -concurrency = multiprocessing omit = *__main__.py *__init__.py From 666f1e942f76d5cb07b9a0b642c8619238eaf23f Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Sun, 5 Nov 2023 22:05:26 -0700 Subject: [PATCH 42/80] add option to pick runner when running from dispatch Also, modify the concurrency group to allow concurrent execution when kicked off manually and when running on different runner sizes. --- .github/workflows/tox-pytest.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index d7b8054add..35d58ddec8 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -5,6 +5,15 @@ name: Code validation on: workflow_dispatch: + inputs: + runner_shape: + description: 'GitHub runner to use' + type: choice + options: + - ubuntu-latest + - ubuntu-22.04-4core + - ubuntu-22.04-8core + default: ubuntu-22.04-4core pull_request: types: - created @@ -12,7 +21,7 @@ on: - synchronize - ready_for_review concurrency: - group: ${{ github.workflow }}-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}-${{ github.event.inputs.runner_shape }} cancel-in-progress: true env: @@ -124,9 +133,7 @@ jobs: name: Integration (fast ETL run) needs: - ci-unit - runs-on: - group: large-runner-group - labels: ubuntu-22.04-4core + runs-on: ${{ github.event_name == "workflow_dispatch" && github.event.inputs.runner_shape || "ubuntu-22.04-4core" }} if: github.event.pull_request.draft == false permissions: contents: read From 31dde4352f4f12f4e44bbdde44ed57b886288af0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 05:06:48 +0000 Subject: [PATCH 43/80] [pre-commit.ci] auto fixes from pre-commit.com hooks For more information, see https://pre-commit.ci --- .github/workflows/tox-pytest.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 35d58ddec8..902447643f 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -7,12 +7,12 @@ on: workflow_dispatch: inputs: runner_shape: - description: 'GitHub runner to use' + description: "GitHub runner to use" type: choice - options: - - ubuntu-latest - - ubuntu-22.04-4core - - ubuntu-22.04-8core + options: + - ubuntu-latest + - ubuntu-22.04-4core + - ubuntu-22.04-8core default: ubuntu-22.04-4core pull_request: types: From fb30bd5123a22433fea2cd807ff94a351df34c1f Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Mon, 6 Nov 2023 17:35:42 -0700 Subject: [PATCH 44/80] Fix workflow for runner size determination. --- .github/workflows/tox-pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 902447643f..bd3ef42a50 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -133,7 +133,7 @@ jobs: name: Integration (fast ETL run) needs: - ci-unit - runs-on: ${{ github.event_name == "workflow_dispatch" && github.event.inputs.runner_shape || "ubuntu-22.04-4core" }} + runs-on: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.runner_shape || 'ubuntu-22.04-4core' }} if: github.event.pull_request.draft == false permissions: contents: read From 6ff74f52f184bfc52dc3e045bab69d311433f11f Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Mon, 6 Nov 2023 18:38:19 -0700 Subject: [PATCH 45/80] Run matrix of integration tests to check scaling. --- .github/workflows/tox-pytest.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index bd3ef42a50..474b0fe9a3 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -4,16 +4,6 @@ name: Code validation # better represent what it does. Maybe even migrate yml file. on: - workflow_dispatch: - inputs: - runner_shape: - description: "GitHub runner to use" - type: choice - options: - - ubuntu-latest - - ubuntu-22.04-4core - - ubuntu-22.04-8core - default: ubuntu-22.04-4core pull_request: types: - created @@ -130,10 +120,16 @@ jobs: path: coverage.xml ci-integration: + strategy: + matrix: + runner_shape: + - ubuntu-latest + - ubuntu-22.04-4core + - ubuntu-22.04-8core name: Integration (fast ETL run) needs: - ci-unit - runs-on: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.runner_shape || 'ubuntu-22.04-4core' }} + runs-on: ${{ matrix.runner_shape }} if: github.event.pull_request.draft == false permissions: contents: read From 567da80e0b8282d1b1d1efe917ee705439d43aba Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Mon, 6 Nov 2023 18:47:57 -0700 Subject: [PATCH 46/80] Fix integration workflow file. --- .github/workflows/tox-pytest.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 474b0fe9a3..87c152051a 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -121,6 +121,7 @@ jobs: ci-integration: strategy: + fail-fast: false matrix: runner_shape: - ubuntu-latest @@ -137,8 +138,6 @@ jobs: defaults: run: shell: bash -l {0} - strategy: - fail-fast: false steps: - uses: actions/checkout@v4 with: From ca9854e33870ef8bc9ec60dc3414ddaa3e44afb1 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Tue, 7 Nov 2023 12:28:59 -0700 Subject: [PATCH 47/80] Drop support for matrix evaluation of ci-integration --- .github/workflows/tox-pytest.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index 87c152051a..9c521fadcc 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -11,7 +11,7 @@ on: - synchronize - ready_for_review concurrency: - group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}-${{ github.event.inputs.runner_shape }} + group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }} cancel-in-progress: true env: @@ -79,7 +79,6 @@ jobs: defaults: run: shell: bash -l {0} - steps: - uses: actions/checkout@v4 with: @@ -120,17 +119,10 @@ jobs: path: coverage.xml ci-integration: - strategy: - fail-fast: false - matrix: - runner_shape: - - ubuntu-latest - - ubuntu-22.04-4core - - ubuntu-22.04-8core name: Integration (fast ETL run) needs: - ci-unit - runs-on: ${{ matrix.runner_shape }} + runs-on: ubuntu-22.04-4core if: github.event.pull_request.draft == false permissions: contents: read From e834f03fb60c4f90bb28e15430aca17f6fd0aacf Mon Sep 17 00:00:00 2001 From: rousik Date: Mon, 27 Nov 2023 17:19:38 +0000 Subject: [PATCH 48/80] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 14 +- environments/conda-lock.yml | 200 +++++++++++++------------- environments/conda-osx-64.lock.yml | 14 +- environments/conda-osx-arm64.lock.yml | 14 +- 4 files changed, 120 insertions(+), 122 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index 51fcfa7b9d..15e3660e13 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -284,7 +284,7 @@ dependencies: - toolz=0.12.0=pyhd8ed1ab_0 - toposort=1.10=pyhd8ed1ab_0 - tornado=6.3.3=py311h459d7ec_1 - - traitlets=5.13.0=pyhd8ed1ab_0 + - traitlets=5.14.0=pyhd8ed1ab_0 - types-python-dateutil=2.8.19.14=pyhd8ed1ab_0 - types-pyyaml=6.0.12.12=pyhd8ed1ab_0 - typing_extensions=4.8.0=pyha770c72_0 @@ -399,7 +399,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.32.6=pyhd8ed1ab_0 + - botocore=1.32.7=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.5=py311h63ff55d_0 @@ -463,7 +463,7 @@ dependencies: - h3-py=3.7.6=py311hb755f60_1 - httpx=0.25.2=pyhd8ed1ab_0 - identify=2.5.32=pyhd8ed1ab_0 - - ipython=8.18.0=pyh0d859eb_0 + - ipython=8.18.1=pyh31011fe_1 - isoduration=20.11.0=pyhd8ed1ab_0 - jsonschema=4.20.0=pyhd8ed1ab_0 - jupyter_client=8.6.0=pyhd8ed1ab_0 @@ -478,7 +478,7 @@ dependencies: - readthedocs-sphinx-ext=2.2.3=pyhd8ed1ab_0 - requests-toolbelt=0.10.1=pyhd8ed1ab_0 - responses=0.24.1=pyhd8ed1ab_0 - - s3transfer=0.7.0=pyhd8ed1ab_1 + - s3transfer=0.8.0=pyhd8ed1ab_0 - scipy=1.11.4=py311h64a7726_0 - secretstorage=3.3.3=py311h38be061_2 - shapely=2.0.2=py311h2032efe_1 @@ -487,7 +487,7 @@ dependencies: - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0=h38be061_0 - aws-sdk-cpp=1.11.182=h8beafcf_7 - - boto3=1.29.6=pyhd8ed1ab_0 + - boto3=1.29.7=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - dagster=1.5.9=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 @@ -539,12 +539,12 @@ dependencies: - tableschema=1.19.3=pyh9f0ad1d_0 - datapackage=1.15.2=pyh44b312d_0 - google-cloud-storage=2.13.0=pyhca7485f_0 - - jupyter_server=2.10.1=pyhd8ed1ab_0 + - jupyter_server=2.11.1=pyhd8ed1ab_0 - libarrow-dataset=14.0.1=h59595ed_3_cpu - libarrow-flight-sql=14.0.1=h61ff412_3_cpu - nbconvert-pandoc=7.11.0=pyhd8ed1ab_0 - gcsfs=2023.10.0=pyhd8ed1ab_0 - - jupyter-lsp=2.2.0=pyhd8ed1ab_0 + - jupyter-lsp=2.2.1=pyhd8ed1ab_0 - jupyter-resource-usage=1.0.1=pyhd8ed1ab_0 - jupyterlab_server=2.25.2=pyhd8ed1ab_0 - libarrow-substrait=14.0.1=h61ff412_3_cpu diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index d34e1fc258..6d702424a2 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -1875,52 +1875,52 @@ package: category: main optional: false - name: boto3 - version: 1.29.6 + version: 1.29.7 manager: conda platform: linux-64 dependencies: - botocore: ">=1.32.6,<1.33.0" + botocore: ">=1.32.7,<1.33.0" jmespath: ">=0.7.1,<2.0.0" python: ">=3.7" - s3transfer: ">=0.7.0,<0.8.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.29.6-pyhd8ed1ab_0.conda + s3transfer: ">=0.8.0,<0.9.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.29.7-pyhd8ed1ab_0.conda hash: - md5: 0cbc42e6f9557edfea7f552c644027d7 - sha256: 7e3c31d99afff810f0d68b4d7c957be34917d1d4bfc76a34620dee0bc35eec1d + md5: f20e114fa86dbdca7534aa0af7664c0e + sha256: 44fe95ed89d0db0c421968d1e79c8372a15136a9146b9a9bd0c66795194eb81d category: main optional: false - name: boto3 - version: 1.29.6 + version: 1.29.7 manager: conda platform: osx-64 dependencies: python: ">=3.7" jmespath: ">=0.7.1,<2.0.0" - s3transfer: ">=0.7.0,<0.8.0" - botocore: ">=1.32.6,<1.33.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.29.6-pyhd8ed1ab_0.conda + botocore: ">=1.32.7,<1.33.0" + s3transfer: ">=0.8.0,<0.9.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.29.7-pyhd8ed1ab_0.conda hash: - md5: 0cbc42e6f9557edfea7f552c644027d7 - sha256: 7e3c31d99afff810f0d68b4d7c957be34917d1d4bfc76a34620dee0bc35eec1d + md5: f20e114fa86dbdca7534aa0af7664c0e + sha256: 44fe95ed89d0db0c421968d1e79c8372a15136a9146b9a9bd0c66795194eb81d category: main optional: false - name: boto3 - version: 1.29.6 + version: 1.29.7 manager: conda platform: osx-arm64 dependencies: python: ">=3.7" jmespath: ">=0.7.1,<2.0.0" - s3transfer: ">=0.7.0,<0.8.0" - botocore: ">=1.32.6,<1.33.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.29.6-pyhd8ed1ab_0.conda + botocore: ">=1.32.7,<1.33.0" + s3transfer: ">=0.8.0,<0.9.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.29.7-pyhd8ed1ab_0.conda hash: - md5: 0cbc42e6f9557edfea7f552c644027d7 - sha256: 7e3c31d99afff810f0d68b4d7c957be34917d1d4bfc76a34620dee0bc35eec1d + md5: f20e114fa86dbdca7534aa0af7664c0e + sha256: 44fe95ed89d0db0c421968d1e79c8372a15136a9146b9a9bd0c66795194eb81d category: main optional: false - name: botocore - version: 1.32.6 + version: 1.32.7 manager: conda platform: linux-64 dependencies: @@ -1928,14 +1928,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.32.6-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.32.7-pyhd8ed1ab_0.conda hash: - md5: a6747e9f4cb2ca858735017cf783fe08 - sha256: 534d61c7d2c2184d59b828dc582600482ed12c08922125f07f454f5d91d85573 + md5: 9e5a1d24c1fcd8017ac713c28dffc871 + sha256: cf405020da251ff2007d5fbc5f1ee61966e925e8d7e9a12525a7ac042afb038d category: main optional: false - name: botocore - version: 1.32.6 + version: 1.32.7 manager: conda platform: osx-64 dependencies: @@ -1943,14 +1943,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.32.6-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.32.7-pyhd8ed1ab_0.conda hash: - md5: a6747e9f4cb2ca858735017cf783fe08 - sha256: 534d61c7d2c2184d59b828dc582600482ed12c08922125f07f454f5d91d85573 + md5: 9e5a1d24c1fcd8017ac713c28dffc871 + sha256: cf405020da251ff2007d5fbc5f1ee61966e925e8d7e9a12525a7ac042afb038d category: main optional: false - name: botocore - version: 1.32.6 + version: 1.32.7 manager: conda platform: osx-arm64 dependencies: @@ -1958,10 +1958,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.32.6-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.32.7-pyhd8ed1ab_0.conda hash: - md5: a6747e9f4cb2ca858735017cf783fe08 - sha256: 534d61c7d2c2184d59b828dc582600482ed12c08922125f07f454f5d91d85573 + md5: 9e5a1d24c1fcd8017ac713c28dffc871 + sha256: cf405020da251ff2007d5fbc5f1ee61966e925e8d7e9a12525a7ac042afb038d category: main optional: false - name: bottleneck @@ -8428,77 +8428,75 @@ package: category: main optional: false - name: ipython - version: 8.18.0 + version: 8.18.1 manager: conda platform: linux-64 dependencies: - __linux: "" + __unix: "" decorator: "" exceptiongroup: "" jedi: ">=0.16" matplotlib-inline: "" pexpect: ">4.3" pickleshare: "" - prompt_toolkit: ">=3.0.30,<3.1.0,!=3.0.37" + prompt-toolkit: ">=3.0.30,<3.1.0,!=3.0.37" pygments: ">=2.4.0" python: ">=3.9" stack_data: "" traitlets: ">=5" typing_extensions: "" - url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.0-pyh0d859eb_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_1.conda hash: - md5: ee60af04bb7046ffdcbf2f1d2e8b0567 - sha256: 06f190aee3d0e6a9080389c093dc3a94a02fae6a2dab5fe7e14c0bb17196cea3 + md5: ac2f9c2e10c2e90e8d135cef51f9753a + sha256: 67490e640faa372d663a5c5cd2d61f417cce22a019a4de82a9e5ddb1cf2ee181 category: main optional: false - name: ipython - version: 8.18.0 + version: 8.18.1 manager: conda platform: osx-64 dependencies: typing_extensions: "" + __unix: "" decorator: "" - __osx: "" exceptiongroup: "" stack_data: "" matplotlib-inline: "" pickleshare: "" - appnope: "" python: ">=3.9" pygments: ">=2.4.0" traitlets: ">=5" jedi: ">=0.16" pexpect: ">4.3" - prompt_toolkit: ">=3.0.30,<3.1.0,!=3.0.37" - url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.0-pyh31c8845_0.conda + prompt-toolkit: ">=3.0.30,<3.1.0,!=3.0.37" + url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_1.conda hash: - md5: 78015fdf0aea454db0b0630c40c094d6 - sha256: 50c4f9b78d4448812e1af8f678075fa5f65fe4170986b506ac87a4208e6460b1 + md5: ac2f9c2e10c2e90e8d135cef51f9753a + sha256: 67490e640faa372d663a5c5cd2d61f417cce22a019a4de82a9e5ddb1cf2ee181 category: main optional: false - name: ipython - version: 8.18.0 + version: 8.18.1 manager: conda platform: osx-arm64 dependencies: typing_extensions: "" + __unix: "" decorator: "" - __osx: "" exceptiongroup: "" stack_data: "" matplotlib-inline: "" pickleshare: "" - appnope: "" python: ">=3.9" pygments: ">=2.4.0" traitlets: ">=5" jedi: ">=0.16" pexpect: ">4.3" - prompt_toolkit: ">=3.0.30,<3.1.0,!=3.0.37" - url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.0-pyh31c8845_0.conda + prompt-toolkit: ">=3.0.30,<3.1.0,!=3.0.37" + url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_1.conda hash: - md5: 78015fdf0aea454db0b0630c40c094d6 - sha256: 50c4f9b78d4448812e1af8f678075fa5f65fe4170986b506ac87a4208e6460b1 + md5: ac2f9c2e10c2e90e8d135cef51f9753a + sha256: 67490e640faa372d663a5c5cd2d61f417cce22a019a4de82a9e5ddb1cf2ee181 category: main optional: false - name: ipywidgets @@ -9314,45 +9312,45 @@ package: category: main optional: false - name: jupyter-lsp - version: 2.2.0 + version: 2.2.1 manager: conda platform: linux-64 dependencies: importlib-metadata: ">=4.8.3" jupyter_server: ">=1.1.2" python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/jupyter-lsp-2.2.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter-lsp-2.2.1-pyhd8ed1ab_0.conda hash: - md5: 38589f4104d11f2a59ff01a9f4e3bfb3 - sha256: 16fc7b40024adece716ba7227e5c123a2deccc13f946a10d9a3270493908d11c + md5: d1a5efc65bfabc3bfebf4d3a204da897 + sha256: 0f995f60609fb50db74bed3637165ad202cf091ec0804519c11b6cffce901e88 category: main optional: false - name: jupyter-lsp - version: 2.2.0 + version: 2.2.1 manager: conda platform: osx-64 dependencies: python: ">=3.8" importlib-metadata: ">=4.8.3" jupyter_server: ">=1.1.2" - url: https://conda.anaconda.org/conda-forge/noarch/jupyter-lsp-2.2.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter-lsp-2.2.1-pyhd8ed1ab_0.conda hash: - md5: 38589f4104d11f2a59ff01a9f4e3bfb3 - sha256: 16fc7b40024adece716ba7227e5c123a2deccc13f946a10d9a3270493908d11c + md5: d1a5efc65bfabc3bfebf4d3a204da897 + sha256: 0f995f60609fb50db74bed3637165ad202cf091ec0804519c11b6cffce901e88 category: main optional: false - name: jupyter-lsp - version: 2.2.0 + version: 2.2.1 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" importlib-metadata: ">=4.8.3" jupyter_server: ">=1.1.2" - url: https://conda.anaconda.org/conda-forge/noarch/jupyter-lsp-2.2.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter-lsp-2.2.1-pyhd8ed1ab_0.conda hash: - md5: 38589f4104d11f2a59ff01a9f4e3bfb3 - sha256: 16fc7b40024adece716ba7227e5c123a2deccc13f946a10d9a3270493908d11c + md5: d1a5efc65bfabc3bfebf4d3a204da897 + sha256: 0f995f60609fb50db74bed3637165ad202cf091ec0804519c11b6cffce901e88 category: main optional: false - name: jupyter-resource-usage @@ -9617,7 +9615,7 @@ package: category: main optional: false - name: jupyter_server - version: 2.10.1 + version: 2.11.1 manager: conda platform: linux-64 dependencies: @@ -9640,14 +9638,14 @@ package: tornado: ">=6.2.0" traitlets: ">=5.6.0" websocket-client: "" - url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.10.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.11.1-pyhd8ed1ab_0.conda hash: - md5: 7d15498584d83de3b357425e37086397 - sha256: b8b55ee57785b39a9096884bfd1da3858da8f27764572321d51a3dd0a990de86 + md5: 0699b715659c026f7f81c27d0e744205 + sha256: 605825c0e2d5af7935b37319b9a46ff39e081e7a0f4dc973f0dd583f41c69ce5 category: main optional: false - name: jupyter_server - version: 2.10.1 + version: 2.11.1 manager: conda platform: osx-64 dependencies: @@ -9670,14 +9668,14 @@ package: anyio: ">=3.1.0" send2trash: ">=1.8.2" jupyter_events: ">=0.9.0" - url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.10.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.11.1-pyhd8ed1ab_0.conda hash: - md5: 7d15498584d83de3b357425e37086397 - sha256: b8b55ee57785b39a9096884bfd1da3858da8f27764572321d51a3dd0a990de86 + md5: 0699b715659c026f7f81c27d0e744205 + sha256: 605825c0e2d5af7935b37319b9a46ff39e081e7a0f4dc973f0dd583f41c69ce5 category: main optional: false - name: jupyter_server - version: 2.10.1 + version: 2.11.1 manager: conda platform: osx-arm64 dependencies: @@ -9700,10 +9698,10 @@ package: anyio: ">=3.1.0" send2trash: ">=1.8.2" jupyter_events: ">=0.9.0" - url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.10.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.11.1-pyhd8ed1ab_0.conda hash: - md5: 7d15498584d83de3b357425e37086397 - sha256: b8b55ee57785b39a9096884bfd1da3858da8f27764572321d51a3dd0a990de86 + md5: 0699b715659c026f7f81c27d0e744205 + sha256: 605825c0e2d5af7935b37319b9a46ff39e081e7a0f4dc973f0dd583f41c69ce5 category: main optional: false - name: jupyter_server_terminals @@ -19688,42 +19686,42 @@ package: category: main optional: false - name: s3transfer - version: 0.7.0 + version: 0.8.0 manager: conda platform: linux-64 dependencies: - botocore: ">=1.12.36,<2.0a.0" + botocore: ">=1.32.7,<2.0a.0" python: ">=3.7" - url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.7.0-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.0-pyhd8ed1ab_0.conda hash: - md5: 6cda17fe7eb0fd45bf8a72cb917c9711 - sha256: c2ae0c88a402e7154999c7917693f024603d9f4c7b0adbb629982e3ff5ea4961 + md5: 9d4e095f2a2e84d0a3f54e3d9f13f9b2 + sha256: cedf5d2e5da3dcd14d7da767a0cee8ef18938af724fdcf2fec682d44024cc2e8 category: main optional: false - name: s3transfer - version: 0.7.0 + version: 0.8.0 manager: conda platform: osx-64 dependencies: python: ">=3.7" - botocore: ">=1.12.36,<2.0a.0" - url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.7.0-pyhd8ed1ab_1.conda + botocore: ">=1.32.7,<2.0a.0" + url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.0-pyhd8ed1ab_0.conda hash: - md5: 6cda17fe7eb0fd45bf8a72cb917c9711 - sha256: c2ae0c88a402e7154999c7917693f024603d9f4c7b0adbb629982e3ff5ea4961 + md5: 9d4e095f2a2e84d0a3f54e3d9f13f9b2 + sha256: cedf5d2e5da3dcd14d7da767a0cee8ef18938af724fdcf2fec682d44024cc2e8 category: main optional: false - name: s3transfer - version: 0.7.0 + version: 0.8.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.7" - botocore: ">=1.12.36,<2.0a.0" - url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.7.0-pyhd8ed1ab_1.conda + botocore: ">=1.32.7,<2.0a.0" + url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.0-pyhd8ed1ab_0.conda hash: - md5: 6cda17fe7eb0fd45bf8a72cb917c9711 - sha256: c2ae0c88a402e7154999c7917693f024603d9f4c7b0adbb629982e3ff5ea4961 + md5: 9d4e095f2a2e84d0a3f54e3d9f13f9b2 + sha256: cedf5d2e5da3dcd14d7da767a0cee8ef18938af724fdcf2fec682d44024cc2e8 category: main optional: false - name: scikit-learn @@ -21848,39 +21846,39 @@ package: category: main optional: false - name: traitlets - version: 5.13.0 + version: 5.14.0 manager: conda platform: linux-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/traitlets-5.13.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/traitlets-5.14.0-pyhd8ed1ab_0.conda hash: - md5: 8a9953c15e1e5a7c1baddbbf4511a567 - sha256: 7ac67960ba2e8c16818043cc65ac6190fa4fd95f5b24357df58e4f73d5e60a10 + md5: 886f4a84ddb49b943b1697ac314e85b3 + sha256: c32412029033264140926be474d327d7fd57c0d11db9b1745396b3d4db78a799 category: main optional: false - name: traitlets - version: 5.13.0 + version: 5.14.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/traitlets-5.13.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/traitlets-5.14.0-pyhd8ed1ab_0.conda hash: - md5: 8a9953c15e1e5a7c1baddbbf4511a567 - sha256: 7ac67960ba2e8c16818043cc65ac6190fa4fd95f5b24357df58e4f73d5e60a10 + md5: 886f4a84ddb49b943b1697ac314e85b3 + sha256: c32412029033264140926be474d327d7fd57c0d11db9b1745396b3d4db78a799 category: main optional: false - name: traitlets - version: 5.13.0 + version: 5.14.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/traitlets-5.13.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/traitlets-5.14.0-pyhd8ed1ab_0.conda hash: - md5: 8a9953c15e1e5a7c1baddbbf4511a567 - sha256: 7ac67960ba2e8c16818043cc65ac6190fa4fd95f5b24357df58e4f73d5e60a10 + md5: 886f4a84ddb49b943b1697ac314e85b3 + sha256: c32412029033264140926be474d327d7fd57c0d11db9b1745396b3d4db78a799 category: main optional: false - name: typeguard diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index 0f89499876..e0846b7133 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -267,7 +267,7 @@ dependencies: - toolz=0.12.0=pyhd8ed1ab_0 - toposort=1.10=pyhd8ed1ab_0 - tornado=6.3.3=py311h2725bcf_1 - - traitlets=5.13.0=pyhd8ed1ab_0 + - traitlets=5.14.0=pyhd8ed1ab_0 - types-python-dateutil=2.8.19.14=pyhd8ed1ab_0 - types-pyyaml=6.0.12.12=pyhd8ed1ab_0 - typing_extensions=4.8.0=pyha770c72_0 @@ -379,7 +379,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.32.6=pyhd8ed1ab_0 + - botocore=1.32.7=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.5=py311hd51016d_0 @@ -444,7 +444,7 @@ dependencies: - h3-py=3.7.6=py311hdf8f085_1 - httpx=0.25.2=pyhd8ed1ab_0 - identify=2.5.32=pyhd8ed1ab_0 - - ipython=8.18.0=pyh31c8845_0 + - ipython=8.18.1=pyh31011fe_1 - isoduration=20.11.0=pyhd8ed1ab_0 - jsonschema=4.20.0=pyhd8ed1ab_0 - jupyter_client=8.6.0=pyhd8ed1ab_0 @@ -460,7 +460,7 @@ dependencies: - readthedocs-sphinx-ext=2.2.3=pyhd8ed1ab_0 - requests-toolbelt=0.10.1=pyhd8ed1ab_0 - responses=0.24.1=pyhd8ed1ab_0 - - s3transfer=0.7.0=pyhd8ed1ab_1 + - s3transfer=0.8.0=pyhd8ed1ab_0 - scipy=1.11.4=py311he0bea55_0 - send2trash=1.8.2=pyhd1c38e8_0 - shapely=2.0.2=py311h4c12f3d_1 @@ -468,7 +468,7 @@ dependencies: - typeguard=4.1.5=pyhd8ed1ab_1 - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0=h6eed73b_0 - - boto3=1.29.6=pyhd8ed1ab_0 + - boto3=1.29.7=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - dagster=1.5.9=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 @@ -519,11 +519,11 @@ dependencies: - tableschema=1.19.3=pyh9f0ad1d_0 - datapackage=1.15.2=pyh44b312d_0 - google-cloud-storage=2.13.0=pyhca7485f_0 - - jupyter_server=2.10.1=pyhd8ed1ab_0 + - jupyter_server=2.11.1=pyhd8ed1ab_0 - libarrow-substrait=14.0.1=h2cc6c1c_3_cpu - nbconvert-pandoc=7.11.0=pyhd8ed1ab_0 - gcsfs=2023.10.0=pyhd8ed1ab_0 - - jupyter-lsp=2.2.0=pyhd8ed1ab_0 + - jupyter-lsp=2.2.1=pyhd8ed1ab_0 - jupyter-resource-usage=1.0.1=pyhd8ed1ab_0 - jupyterlab_server=2.25.2=pyhd8ed1ab_0 - nbconvert=7.11.0=pyhd8ed1ab_0 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 61863e036c..b53bec2fc8 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -267,7 +267,7 @@ dependencies: - toolz=0.12.0=pyhd8ed1ab_0 - toposort=1.10=pyhd8ed1ab_0 - tornado=6.3.3=py311heffc1b2_1 - - traitlets=5.13.0=pyhd8ed1ab_0 + - traitlets=5.14.0=pyhd8ed1ab_0 - types-python-dateutil=2.8.19.14=pyhd8ed1ab_0 - types-pyyaml=6.0.12.12=pyhd8ed1ab_0 - typing_extensions=4.8.0=pyha770c72_0 @@ -379,7 +379,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.32.6=pyhd8ed1ab_0 + - botocore=1.32.7=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.5=py311h71175c2_0 @@ -444,7 +444,7 @@ dependencies: - h3-py=3.7.6=py311ha891d26_1 - httpx=0.25.2=pyhd8ed1ab_0 - identify=2.5.32=pyhd8ed1ab_0 - - ipython=8.18.0=pyh31c8845_0 + - ipython=8.18.1=pyh31011fe_1 - isoduration=20.11.0=pyhd8ed1ab_0 - jsonschema=4.20.0=pyhd8ed1ab_0 - jupyter_client=8.6.0=pyhd8ed1ab_0 @@ -460,7 +460,7 @@ dependencies: - readthedocs-sphinx-ext=2.2.3=pyhd8ed1ab_0 - requests-toolbelt=0.10.1=pyhd8ed1ab_0 - responses=0.24.1=pyhd8ed1ab_0 - - s3transfer=0.7.0=pyhd8ed1ab_1 + - s3transfer=0.8.0=pyhd8ed1ab_0 - scipy=1.11.4=py311h2b215a9_0 - send2trash=1.8.2=pyhd1c38e8_0 - shapely=2.0.2=py311h0815064_1 @@ -468,7 +468,7 @@ dependencies: - typeguard=4.1.5=pyhd8ed1ab_1 - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0=ha1ab1f8_0 - - boto3=1.29.6=pyhd8ed1ab_0 + - boto3=1.29.7=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - dagster=1.5.9=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 @@ -519,11 +519,11 @@ dependencies: - tableschema=1.19.3=pyh9f0ad1d_0 - datapackage=1.15.2=pyh44b312d_0 - google-cloud-storage=2.13.0=pyhca7485f_0 - - jupyter_server=2.10.1=pyhd8ed1ab_0 + - jupyter_server=2.11.1=pyhd8ed1ab_0 - libarrow-substrait=14.0.1=h594d712_3_cpu - nbconvert-pandoc=7.11.0=pyhd8ed1ab_0 - gcsfs=2023.10.0=pyhd8ed1ab_0 - - jupyter-lsp=2.2.0=pyhd8ed1ab_0 + - jupyter-lsp=2.2.1=pyhd8ed1ab_0 - jupyter-resource-usage=1.0.1=pyhd8ed1ab_0 - jupyterlab_server=2.25.2=pyhd8ed1ab_0 - nbconvert=7.11.0=pyhd8ed1ab_0 From 65aaa60600156f05139d2fc712126357f86d7db8 Mon Sep 17 00:00:00 2001 From: zaneselvans Date: Tue, 28 Nov 2023 18:29:22 +0000 Subject: [PATCH 49/80] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 8 +- environments/conda-lock.yml | 102 +++++++++++++------------- environments/conda-osx-64.lock.yml | 8 +- environments/conda-osx-arm64.lock.yml | 8 +- 4 files changed, 63 insertions(+), 63 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index e4d4ff9840..e0d4d3c401 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -392,7 +392,7 @@ dependencies: - urllib3=1.26.18=pyhd8ed1ab_0 - watchdog=3.0.0=py311h38be061_1 - xerces-c=3.2.4=hac6953d_3 - - yarl=1.9.2=py311h459d7ec_1 + - yarl=1.9.3=py311h459d7ec_0 - addfips=0.4.0=pyhd8ed1ab_1 - aniso8601=9.0.1=pyhd8ed1ab_0 - annotated-types=0.6.0=pyhd8ed1ab_0 @@ -400,7 +400,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.0=pyhd8ed1ab_0 + - botocore=1.33.1=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.5=py311h63ff55d_0 @@ -448,7 +448,7 @@ dependencies: - watchfiles=0.21.0=py311h46250e7_0 - aiohttp=3.8.6=py311h459d7ec_1 - alembic=1.12.1=pyhd8ed1ab_0 - - arelle-release=2.17.6=pyhd8ed1ab_0 + - arelle-release=2.17.7=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - aws-crt-cpp=0.24.7=h97e63c7_6 - bottleneck=1.3.7=py311h1f0f07a_1 @@ -489,7 +489,7 @@ dependencies: - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0=h38be061_0 - aws-sdk-cpp=1.11.182=h8beafcf_7 - - boto3=1.33.0=pyhd8ed1ab_0 + - boto3=1.33.1=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - dagster=1.5.9=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 5512397a05..cb8907edbe 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -536,7 +536,7 @@ package: category: main optional: false - name: arelle-release - version: 2.17.6 + version: 2.17.7 manager: conda platform: linux-64 dependencies: @@ -549,14 +549,14 @@ package: python: ">=3.8" python-dateutil: 2.* regex: "" - url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.17.6-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.17.7-pyhd8ed1ab_0.conda hash: - md5: abbc31cff3faff06a9734e98a0d61ea1 - sha256: f9d27fd8bf19b11b679715bbd26349901dd2306548c4c6f7eb555458a48065a0 + md5: b42bbf2e318b6bbbd9de2d81ecf8ed50 + sha256: 3094446e601ad9160677c2bb5b75b9946c81b679bebf42bf52c126e71d76fb43 category: main optional: false - name: arelle-release - version: 2.17.6 + version: 2.17.7 manager: conda platform: osx-64 dependencies: @@ -569,14 +569,14 @@ package: lxml: 4.* openpyxl: 3.* pyparsing: 3.* - url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.17.6-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.17.7-pyhd8ed1ab_0.conda hash: - md5: abbc31cff3faff06a9734e98a0d61ea1 - sha256: f9d27fd8bf19b11b679715bbd26349901dd2306548c4c6f7eb555458a48065a0 + md5: b42bbf2e318b6bbbd9de2d81ecf8ed50 + sha256: 3094446e601ad9160677c2bb5b75b9946c81b679bebf42bf52c126e71d76fb43 category: main optional: false - name: arelle-release - version: 2.17.6 + version: 2.17.7 manager: conda platform: osx-arm64 dependencies: @@ -589,10 +589,10 @@ package: lxml: 4.* openpyxl: 3.* pyparsing: 3.* - url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.17.6-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.17.7-pyhd8ed1ab_0.conda hash: - md5: abbc31cff3faff06a9734e98a0d61ea1 - sha256: f9d27fd8bf19b11b679715bbd26349901dd2306548c4c6f7eb555458a48065a0 + md5: b42bbf2e318b6bbbd9de2d81ecf8ed50 + sha256: 3094446e601ad9160677c2bb5b75b9946c81b679bebf42bf52c126e71d76fb43 category: main optional: false - name: argon2-cffi @@ -1914,52 +1914,52 @@ package: category: main optional: false - name: boto3 - version: 1.33.0 + version: 1.33.1 manager: conda platform: linux-64 dependencies: - botocore: ">=1.33.0,<1.34.0" + botocore: ">=1.33.1,<1.34.0" jmespath: ">=0.7.1,<2.0.0" python: ">=3.7" s3transfer: ">=0.8.0,<0.9.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.1-pyhd8ed1ab_0.conda hash: - md5: d308c65184cef05b98cb4461d220e5af - sha256: c9f512549b95ff0db24b2727ccf6822520e1ee0544b6d4769bb6db1645f40765 + md5: 8580b17cd0420d40f901314f92df8ed9 + sha256: eb948581f4f90c814c698eeb1cfcbfd2bc0a6eeeb961a67bb572fc576bc30bcb category: main optional: false - name: boto3 - version: 1.33.0 + version: 1.33.1 manager: conda platform: osx-64 dependencies: python: ">=3.7" jmespath: ">=0.7.1,<2.0.0" s3transfer: ">=0.8.0,<0.9.0" - botocore: ">=1.33.0,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.0-pyhd8ed1ab_0.conda + botocore: ">=1.33.1,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.1-pyhd8ed1ab_0.conda hash: - md5: d308c65184cef05b98cb4461d220e5af - sha256: c9f512549b95ff0db24b2727ccf6822520e1ee0544b6d4769bb6db1645f40765 + md5: 8580b17cd0420d40f901314f92df8ed9 + sha256: eb948581f4f90c814c698eeb1cfcbfd2bc0a6eeeb961a67bb572fc576bc30bcb category: main optional: false - name: boto3 - version: 1.33.0 + version: 1.33.1 manager: conda platform: osx-arm64 dependencies: python: ">=3.7" jmespath: ">=0.7.1,<2.0.0" s3transfer: ">=0.8.0,<0.9.0" - botocore: ">=1.33.0,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.0-pyhd8ed1ab_0.conda + botocore: ">=1.33.1,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.1-pyhd8ed1ab_0.conda hash: - md5: d308c65184cef05b98cb4461d220e5af - sha256: c9f512549b95ff0db24b2727ccf6822520e1ee0544b6d4769bb6db1645f40765 + md5: 8580b17cd0420d40f901314f92df8ed9 + sha256: eb948581f4f90c814c698eeb1cfcbfd2bc0a6eeeb961a67bb572fc576bc30bcb category: main optional: false - name: botocore - version: 1.33.0 + version: 1.33.1 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.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.1-pyhd8ed1ab_0.conda hash: - md5: 8c33d5b6003262d71c73383b04813d59 - sha256: 705517443318c269a7a78b30f4df14755636b0e799ac91af19857b4849eb9a78 + md5: b40066840291a0406bffe70e0334de62 + sha256: c9d214ae266f03797b3c06129b1a173593fc573affc09cfd02bba3bdd36c4827 category: main optional: false - name: botocore - version: 1.33.0 + version: 1.33.1 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.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.1-pyhd8ed1ab_0.conda hash: - md5: 8c33d5b6003262d71c73383b04813d59 - sha256: 705517443318c269a7a78b30f4df14755636b0e799ac91af19857b4849eb9a78 + md5: b40066840291a0406bffe70e0334de62 + sha256: c9d214ae266f03797b3c06129b1a173593fc573affc09cfd02bba3bdd36c4827 category: main optional: false - name: botocore - version: 1.33.0 + version: 1.33.1 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.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.1-pyhd8ed1ab_0.conda hash: - md5: 8c33d5b6003262d71c73383b04813d59 - sha256: 705517443318c269a7a78b30f4df14755636b0e799ac91af19857b4849eb9a78 + md5: b40066840291a0406bffe70e0334de62 + sha256: c9d214ae266f03797b3c06129b1a173593fc573affc09cfd02bba3bdd36c4827 category: main optional: false - name: bottleneck @@ -23656,7 +23656,7 @@ package: category: main optional: false - name: yarl - version: 1.9.2 + version: 1.9.3 manager: conda platform: linux-64 dependencies: @@ -23665,14 +23665,14 @@ package: multidict: ">=4.0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/yarl-1.9.2-py311h459d7ec_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/yarl-1.9.3-py311h459d7ec_0.conda hash: - md5: 132637a291f818a0e99c8ca468e92eb8 - sha256: f25893b4c4e4432cdfa1c19631dd503e5f197704d2b9d09624520ece9a6845f0 + md5: 96f995652440b0a9266d66a691d9eff9 + sha256: 1e35fa508899965e2ed7866b6147330dd4e51407ce5359b74f050b0e2ef8e4d0 category: main optional: false - name: yarl - version: 1.9.2 + version: 1.9.3 manager: conda platform: osx-64 dependencies: @@ -23680,14 +23680,14 @@ package: multidict: ">=4.0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/yarl-1.9.2-py311he705e18_1.conda + url: https://conda.anaconda.org/conda-forge/osx-64/yarl-1.9.3-py311he705e18_0.conda hash: - md5: ac4f2406c36c333c12544f6605563188 - sha256: 2f2a68c01850a0406e2ef71c07f8f4d7a338e6a98e906a042b5b7de48ba4a558 + md5: 9e496c26a50c1bd31ec870ec26c17115 + sha256: c774eecd3a122d5f4f75be527f1f6d5031e74496ec9d34c91165169f2ef892c5 category: main optional: false - name: yarl - version: 1.9.2 + version: 1.9.3 manager: conda platform: osx-arm64 dependencies: @@ -23695,10 +23695,10 @@ package: multidict: ">=4.0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/yarl-1.9.2-py311h05b510d_1.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/yarl-1.9.3-py311h05b510d_0.conda hash: - md5: ada6c2013b3616c82f8f090871aaecdc - sha256: eccb5dc2e3c6cf23ec7ca94f591cb7ab1bd362e5eba546a4d7e2bb8c219a93ec + md5: 1de51d3ce020a415f34ba5c678c3abcc + sha256: 723e809326eccda01b2704d8c2708de901a90f720528654b8c8f298dadaad700 category: main optional: false - name: zeromq diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index 514b9fc3c5..3bc5736187 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -372,7 +372,7 @@ dependencies: - urllib3=1.26.18=pyhd8ed1ab_0 - watchdog=3.0.0=py311h5ef12f2_1 - xerces-c=3.2.4=h6314983_3 - - yarl=1.9.2=py311he705e18_1 + - yarl=1.9.3=py311he705e18_0 - addfips=0.4.0=pyhd8ed1ab_1 - aniso8601=9.0.1=pyhd8ed1ab_0 - annotated-types=0.6.0=pyhd8ed1ab_0 @@ -380,7 +380,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.0=pyhd8ed1ab_0 + - botocore=1.33.1=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.5=py311hd51016d_0 @@ -428,7 +428,7 @@ dependencies: - watchfiles=0.21.0=py311h5e0f0e4_0 - aiohttp=3.8.6=py311he705e18_1 - alembic=1.12.1=pyhd8ed1ab_0 - - arelle-release=2.17.6=pyhd8ed1ab_0 + - arelle-release=2.17.7=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - aws-sdk-cpp=1.11.182=h28d282b_7 - bottleneck=1.3.7=py311h4a70a88_1 @@ -470,7 +470,7 @@ dependencies: - typeguard=4.1.5=pyhd8ed1ab_1 - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0=h6eed73b_0 - - boto3=1.33.0=pyhd8ed1ab_0 + - boto3=1.33.1=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - dagster=1.5.9=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 5c9fc9fe93..fd1b7ee095 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -372,7 +372,7 @@ dependencies: - urllib3=1.26.18=pyhd8ed1ab_0 - watchdog=3.0.0=py311heffc1b2_1 - xerces-c=3.2.4=hd886eac_3 - - yarl=1.9.2=py311h05b510d_1 + - yarl=1.9.3=py311h05b510d_0 - addfips=0.4.0=pyhd8ed1ab_1 - aniso8601=9.0.1=pyhd8ed1ab_0 - annotated-types=0.6.0=pyhd8ed1ab_0 @@ -380,7 +380,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.0=pyhd8ed1ab_0 + - botocore=1.33.1=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.5=py311h71175c2_0 @@ -428,7 +428,7 @@ dependencies: - watchfiles=0.21.0=py311h94f323b_0 - aiohttp=3.8.6=py311h05b510d_1 - alembic=1.12.1=pyhd8ed1ab_0 - - arelle-release=2.17.6=pyhd8ed1ab_0 + - arelle-release=2.17.7=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - aws-sdk-cpp=1.11.182=h31542fa_7 - bottleneck=1.3.7=py311hb49d859_1 @@ -470,7 +470,7 @@ dependencies: - typeguard=4.1.5=pyhd8ed1ab_1 - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0=ha1ab1f8_0 - - boto3=1.33.0=pyhd8ed1ab_0 + - boto3=1.33.1=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - dagster=1.5.9=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 From 48726c07a6f22e4ed7cae35db91dbf292bade291 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Mon, 27 Nov 2023 16:29:59 -0700 Subject: [PATCH 50/80] Replace ls -R with find -type f. This will result in a nicer more compact output. --- .github/workflows/pytest.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 6ea517ef10..f4d99c7f00 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -215,8 +215,7 @@ jobs: with: path: coverage - name: List downloaded files - run: | - ls -R + run: find -type f - name: Upload test coverage report to CodeCov uses: codecov/codecov-action@v3 with: From cc1f6a93a9e25c8e3c60a736d58978f7e6cebbdd Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Tue, 28 Nov 2023 17:29:42 -0700 Subject: [PATCH 51/80] Revert renames to be more friendly. --- .github/workflows/pytest.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index f4d99c7f00..3d5bb6d918 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -1,5 +1,5 @@ --- -name: Code validation +name: pytest on: pull_request: @@ -64,7 +64,6 @@ jobs: path: coverage.xml ci-unit: - name: Unit tests runs-on: ubuntu-latest strategy: fail-fast: false @@ -111,7 +110,6 @@ jobs: path: coverage.xml ci-integration: - name: Integration (fast ETL run) needs: - ci-unit runs-on: ubuntu-22.04-4core From 14d9a4a82f1bba8567569daec3f567ae6122b0a6 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Tue, 28 Nov 2023 17:32:16 -0700 Subject: [PATCH 52/80] Fix some more code review comments. --- .github/workflows/pytest.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 3d5bb6d918..1658f4dc16 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -133,7 +133,7 @@ jobs: cache-environment: true - name: Install PUDL and its dependencies - run: pip install --no-deps --editable .[test,datasette] + run: pip install --no-deps --no-cache-dir . - name: Log environment details run: | @@ -186,8 +186,7 @@ jobs: - name: Run integration tests run: | coverage run ${{ env.COVERAGE_OPTIONS }} \ - \ - -m pytest --live-dbs test/integration + -n auto -m pytest --live-dbs test/integration - name: Generate coverage run: | coverage combine From 1c8dd9c62b22ade16dcd8f9cd3a4fe7db9156fe4 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Tue, 28 Nov 2023 22:38:07 -0600 Subject: [PATCH 53/80] Fix error in call to pytest -n auto --- .github/workflows/pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 1658f4dc16..ca7ca299be 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -186,7 +186,7 @@ jobs: - name: Run integration tests run: | coverage run ${{ env.COVERAGE_OPTIONS }} \ - -n auto -m pytest --live-dbs test/integration + -m pytest -n auto --live-dbs test/integration - name: Generate coverage run: | coverage combine From 04812b5a58eccf055ea71b42e87d086b4ce71d23 Mon Sep 17 00:00:00 2001 From: zaneselvans Date: Wed, 29 Nov 2023 04:43:08 +0000 Subject: [PATCH 54/80] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 4 +- environments/conda-lock.yml | 70 +++++++++++++-------------- environments/conda-osx-64.lock.yml | 6 +-- environments/conda-osx-arm64.lock.yml | 6 +-- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index 05ffe7bd2a..670a57d853 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -401,7 +401,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.1=pyhd8ed1ab_0 + - botocore=1.33.2=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.5=py311h63ff55d_0 @@ -515,7 +515,7 @@ dependencies: - requests-oauthlib=1.3.1=pyhd8ed1ab_0 - scikit-learn=1.3.2=py311hc009520_1 - timezonefinder=6.2.0=py311h459d7ec_2 - - catalystcoop.ferc_xbrl_extractor=1.2.1=pyhd8ed1ab_0 + - catalystcoop.ferc_xbrl_extractor=1.3.0=pyhd8ed1ab_1 - conda-lock=2.5.1=pyhd8ed1ab_0 - dagster-graphql=1.5.9=pyhd8ed1ab_0 - dagster-postgres=0.21.9=pyhd8ed1ab_0 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index e6b6191131..dc877914b8 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -1959,7 +1959,7 @@ package: category: main optional: false - name: botocore - version: 1.33.1 + version: 1.33.2 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.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.2-pyhd8ed1ab_0.conda hash: - md5: b40066840291a0406bffe70e0334de62 - sha256: c9d214ae266f03797b3c06129b1a173593fc573affc09cfd02bba3bdd36c4827 + md5: 40348da60b8d2e53619ef16966cc18b8 + sha256: 3c221bec785d2d7e9940bb0c57261f1dcacc7e906a4955ed88390f554881bdf3 category: main optional: false - name: botocore - version: 1.33.1 + version: 1.33.2 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.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.2-pyhd8ed1ab_0.conda hash: - md5: b40066840291a0406bffe70e0334de62 - sha256: c9d214ae266f03797b3c06129b1a173593fc573affc09cfd02bba3bdd36c4827 + md5: 40348da60b8d2e53619ef16966cc18b8 + sha256: 3c221bec785d2d7e9940bb0c57261f1dcacc7e906a4955ed88390f554881bdf3 category: main optional: false - name: botocore - version: 1.33.1 + version: 1.33.2 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.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.2-pyhd8ed1ab_0.conda hash: - md5: b40066840291a0406bffe70e0334de62 - sha256: c9d214ae266f03797b3c06129b1a173593fc573affc09cfd02bba3bdd36c4827 + md5: 40348da60b8d2e53619ef16966cc18b8 + sha256: 3c221bec785d2d7e9940bb0c57261f1dcacc7e906a4955ed88390f554881bdf3 category: main optional: false - name: bottleneck @@ -2649,7 +2649,7 @@ package: category: main optional: false - name: catalystcoop.ferc_xbrl_extractor - version: 1.2.1 + version: 1.3.0 manager: conda platform: linux-64 dependencies: @@ -2659,56 +2659,56 @@ package: lxml: ">=4.9.1,<5" numpy: ">=1.16,<2" pandas: ">=1.5,<2.2" - pydantic: ">=1.9,<3" + pydantic: ">=2,<3" python: ">=3.10,<3.13" sqlalchemy: ">=1.4,<3" stringcase: ">=1.2,<2" - url: https://conda.anaconda.org/conda-forge/noarch/catalystcoop.ferc_xbrl_extractor-1.2.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/catalystcoop.ferc_xbrl_extractor-1.3.0-pyhd8ed1ab_1.conda hash: - md5: 901c0be7848920eeaeb14bce747c589c - sha256: f70614208da7b61b41ead6d2260ca3b0d6c0785388b09f7aa4615b56fbf3ce37 + md5: 15b51bdc077cf3050ab69a1e6313e1a4 + sha256: 9d6c1c7219b2744210125178de0ebe1961b7523b132672ba870c585da9746dbe category: main optional: false - name: catalystcoop.ferc_xbrl_extractor - version: 1.2.1 + version: 1.3.0 manager: conda platform: osx-64 dependencies: sqlalchemy: ">=1.4,<3" lxml: ">=4.9.1,<5" + pydantic: ">=2,<3" python: ">=3.10,<3.13" coloredlogs: ">=14.0,<15.1" frictionless: ">=4.4,<5" numpy: ">=1.16,<2" arelle-release: ">=2.3,<3" pandas: ">=1.5,<2.2" - pydantic: ">=1.9,<3" stringcase: ">=1.2,<2" - url: https://conda.anaconda.org/conda-forge/noarch/catalystcoop.ferc_xbrl_extractor-1.2.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/catalystcoop.ferc_xbrl_extractor-1.3.0-pyhd8ed1ab_1.conda hash: - md5: 901c0be7848920eeaeb14bce747c589c - sha256: f70614208da7b61b41ead6d2260ca3b0d6c0785388b09f7aa4615b56fbf3ce37 + md5: 15b51bdc077cf3050ab69a1e6313e1a4 + sha256: 9d6c1c7219b2744210125178de0ebe1961b7523b132672ba870c585da9746dbe category: main optional: false - name: catalystcoop.ferc_xbrl_extractor - version: 1.2.1 + version: 1.3.0 manager: conda platform: osx-arm64 dependencies: sqlalchemy: ">=1.4,<3" lxml: ">=4.9.1,<5" + pydantic: ">=2,<3" python: ">=3.10,<3.13" coloredlogs: ">=14.0,<15.1" frictionless: ">=4.4,<5" numpy: ">=1.16,<2" arelle-release: ">=2.3,<3" pandas: ">=1.5,<2.2" - pydantic: ">=1.9,<3" stringcase: ">=1.2,<2" - url: https://conda.anaconda.org/conda-forge/noarch/catalystcoop.ferc_xbrl_extractor-1.2.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/catalystcoop.ferc_xbrl_extractor-1.3.0-pyhd8ed1ab_1.conda hash: - md5: 901c0be7848920eeaeb14bce747c589c - sha256: f70614208da7b61b41ead6d2260ca3b0d6c0785388b09f7aa4615b56fbf3ce37 + md5: 15b51bdc077cf3050ab69a1e6313e1a4 + sha256: 9d6c1c7219b2744210125178de0ebe1961b7523b132672ba870c585da9746dbe category: main optional: false - name: cchardet @@ -13388,25 +13388,25 @@ package: category: main optional: false - name: llvm-openmp - version: 17.0.5 + version: 17.0.6 manager: conda platform: osx-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/osx-64/llvm-openmp-17.0.5-hb6ac08f_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/llvm-openmp-17.0.6-hb6ac08f_0.conda hash: - md5: 8ca3784280b7cb54163a46e8a918fb43 - sha256: 8ad5acab5d5fb38785c6f41e17e5e1729f305f4838cc3a4470688c6cf942c0da + md5: f260ab897df05f729fc3e65dbb0850ef + sha256: 9ea2f7018f335fdc55bc9b21a388eb94ea47a243d9cbf6ec3d8862d4df9fb49b category: main optional: false - name: llvm-openmp - version: 17.0.5 + version: 17.0.6 manager: conda platform: osx-arm64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/osx-arm64/llvm-openmp-17.0.5-hcd81f8e_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/llvm-openmp-17.0.6-hcd81f8e_0.conda hash: - md5: 7307ed345b859c2d6680d277dfc13bdd - sha256: d6ac131d98df60c85206455f49fe1921a9eeef9962bbe1f06ada22573c09b0e6 + md5: 52019d2fa0eddbbc4e6dcd30fae0c0a4 + sha256: 0c217326c5931c1416b82f98169b8a8a52139f6f5f299dbb2efa7b21f65f225a category: main optional: false - name: llvmlite diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index f587c70524..92854a7799 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -32,7 +32,7 @@ dependencies: - libuv=1.46.0=h0c2f820_0 - libwebp-base=1.3.2=h0dc2134_0 - libzlib=1.2.13=h8a1eda9_5 - - llvm-openmp=17.0.5=hb6ac08f_0 + - llvm-openmp=17.0.6=hb6ac08f_0 - lzo=2.10=haf1e3a3_1000 - poppler-data=0.4.12=hd8ed1ab_0 - pthread-stubs=0.4=hc929b4f_1001 @@ -381,7 +381,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.1=pyhd8ed1ab_0 + - botocore=1.33.2=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.5=py311hd51016d_0 @@ -495,7 +495,7 @@ dependencies: - requests-oauthlib=1.3.1=pyhd8ed1ab_0 - scikit-learn=1.3.2=py311h66081b9_1 - timezonefinder=6.2.0=py311he705e18_2 - - catalystcoop.ferc_xbrl_extractor=1.2.1=pyhd8ed1ab_0 + - catalystcoop.ferc_xbrl_extractor=1.3.0=pyhd8ed1ab_1 - conda-lock=2.5.1=pyhd8ed1ab_0 - dagster-graphql=1.5.9=pyhd8ed1ab_0 - dagster-postgres=0.21.9=pyhd8ed1ab_0 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index c3193b3885..f8f1a858ac 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -32,7 +32,7 @@ dependencies: - libuv=1.46.0=hb547adb_0 - libwebp-base=1.3.2=hb547adb_0 - libzlib=1.2.13=h53f4e23_5 - - llvm-openmp=17.0.5=hcd81f8e_0 + - llvm-openmp=17.0.6=hcd81f8e_0 - lzo=2.10=h642e427_1000 - pandoc=3.1.3=hce30654_0 - poppler-data=0.4.12=hd8ed1ab_0 @@ -381,7 +381,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.1=pyhd8ed1ab_0 + - botocore=1.33.2=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.5=py311h71175c2_0 @@ -495,7 +495,7 @@ dependencies: - requests-oauthlib=1.3.1=pyhd8ed1ab_0 - scikit-learn=1.3.2=py311ha25ca4d_1 - timezonefinder=6.2.0=py311h05b510d_2 - - catalystcoop.ferc_xbrl_extractor=1.2.1=pyhd8ed1ab_0 + - catalystcoop.ferc_xbrl_extractor=1.3.0=pyhd8ed1ab_1 - conda-lock=2.5.1=pyhd8ed1ab_0 - dagster-graphql=1.5.9=pyhd8ed1ab_0 - dagster-postgres=0.21.9=pyhd8ed1ab_0 From fc023db52445b61966a4bee9147438d6e4acff20 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 29 Nov 2023 09:39:21 -0700 Subject: [PATCH 55/80] Fail gha step if coverage fails to upload. --- .github/workflows/pytest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index ca7ca299be..bd4a7a6f1b 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -217,6 +217,7 @@ jobs: uses: codecov/codecov-action@v3 with: directory: coverage + fail_ci_if_error: true # TODO(rousik): The following slack notification gives no value and # needs to be fixed. Until then, it might be better to do nothing From 1ea46f5ff159a5f0f364aafb1136988034010246 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 29 Nov 2023 15:41:56 -0700 Subject: [PATCH 56/80] Use specific coverage file names to aid the process. --- .github/workflows/pytest.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index bd4a7a6f1b..8f0be3830c 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -18,7 +18,7 @@ env: DAGSTER_HOME: /home/runner/pudl-work/dagster_home/ ETL_CONFIG: src/pudl/package_data/settings/etl_fast.yml ETL_COMMANDLINE_OPTIONS: --gcs-cache-path=gs://zenodo-cache.catalyst.coop - COVERAGE_OPTIONS: --concurrency=multiprocessing --parallel-mode + COVERAGE_OPTIONS: --concurrency=multiprocessing jobs: ci-docs: @@ -175,15 +175,21 @@ jobs: service_account: "tox-pytest-github-action@catalyst-cooperative-pudl.iam.gserviceaccount.com" - name: Run ferc_to_sqlite + env: + COVERAGE_FILE: .coverage.ferc_to_sqlite run: | coverage run ${{ env.COVERAGE_OPTIONS }} \ src/pudl/ferc_to_sqlite/cli.py --clobber ${{ env.ETL_COMMANDLINE_OPTIONS }} ${{ env.ETL_CONFIG }} - name: Run pudl_etl + env: + COVERAGE_FILE: .coverage.pudl_etl run: | alembic upgrade head coverage run ${{ env.COVERAGE_OPTIONS }} \ src/pudl/cli/etl.py ${{ env.ETL_COMMANDLINE_OPTIONS }} ${{ env.ETL_CONFIG }} - name: Run integration tests + env: + COVERAGE_FILE: .coverage.pytest run: | coverage run ${{ env.COVERAGE_OPTIONS }} \ -m pytest -n auto --live-dbs test/integration From ba40c9bac4df3d2ff797e71c851f67a503388b4e Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Fri, 1 Dec 2023 12:00:32 -0700 Subject: [PATCH 57/80] add some debug options for coverage --- .github/workflows/pytest.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 8f0be3830c..09f8f3bc45 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -195,8 +195,9 @@ jobs: -m pytest -n auto --live-dbs test/integration - name: Generate coverage run: | - coverage combine + coverage combine --append coverage xml + coverage report - name: Upload coverage uses: actions/upload-artifact@v3 with: From 5fa6f5a22eee877553690a0f2df219119a0de99e Mon Sep 17 00:00:00 2001 From: rousik Date: Fri, 1 Dec 2023 19:19:20 +0000 Subject: [PATCH 58/80] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 42 +-- environments/conda-lock.yml | 512 +++++++++++++------------- environments/conda-osx-64.lock.yml | 38 +- environments/conda-osx-arm64.lock.yml | 38 +- 4 files changed, 315 insertions(+), 315 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index 670a57d853..d3798403b8 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 74460703322c458f7185502b360325ceaa57699985898e73cfba0fe85b343112 +# input_hash: 566bcbefc936d18bbf3a48ce8800e5d3209d9925447fc48984c419514bfaa6f6 channels: - conda-forge @@ -26,7 +26,7 @@ dependencies: - libgcc-ng=13.2.0=h807b86a_3 - aws-c-common=0.9.8=hd590300_0 - bzip2=1.0.8=hd590300_5 - - c-ares=1.22.1=hd590300_0 + - c-ares=1.23.0=hd590300_0 - fribidi=1.0.10=h36c2ea0_0 - geos=3.12.1=h59595ed_0 - gettext=0.21.1=h27087fc_0 @@ -65,7 +65,7 @@ dependencies: - openssl=3.1.4=hd590300_0 - pixman=0.42.2=h59595ed_0 - pthread-stubs=0.4=h36c2ea0_1001 - - rdma-core=28.9=h59595ed_1 + - rdma-core=49.0=hd3aeb46_1 - snappy=1.1.10=h9fff704_0 - tzcode=2023c=h0b41bf4_0 - uriparser=0.9.7=hcb278e6_1 @@ -106,7 +106,7 @@ dependencies: - readline=8.2=h8228510_1 - s2n=1.3.56=h06160fa_0 - tk=8.6.13=noxft_h4845f30_101 - - ucx=1.15.0=h64cca9d_0 + - ucx=1.15.0=hae80064_1 - xorg-libsm=1.2.4=h7391055_0 - zeromq=4.3.5=h59595ed_0 - zlib=1.2.13=hd590300_5 @@ -160,7 +160,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_0 - crashtest=0.4.1=pyhd8ed1ab_0 - cycler=0.12.1=pyhd8ed1ab_0 - - dagster-pipes=1.5.9=pyhd8ed1ab_0 + - dagster-pipes=1.5.10=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - dbus=1.13.6=h5008d03_3 - debugpy=1.8.0=py311hb755f60_1 @@ -238,7 +238,7 @@ dependencies: - psutil=5.9.5=py311h459d7ec_1 - ptyprocess=0.7.0=pyhd3deb0d_0 - pure_eval=0.2.2=pyhd8ed1ab_0 - - pyasn1=0.5.0=pyhd8ed1ab_0 + - pyasn1=0.5.1=pyhd8ed1ab_0 - pycparser=2.21=pyhd8ed1ab_0 - pygments=2.17.2=pyhd8ed1ab_0 - pyjwt=2.8.0=pyhd8ed1ab_0 @@ -259,7 +259,7 @@ dependencies: - regex=2023.10.3=py311h459d7ec_0 - rfc3986=2.0.0=pyhd8ed1ab_0 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 - - rpds-py=0.13.1=py311h46250e7_0 + - rpds-py=0.13.2=py311h46250e7_0 - rtree=1.1.0=py311h3bb2b0f_0 - ruamel.yaml.clib=0.2.7=py311h459d7ec_2 - ruff=0.1.6=py311h7145743_0 @@ -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.31.1=pyhd8ed1ab_0 - restructuredtext_lint=1.4.0=pyhd8ed1ab_0 - rfc3339-validator=0.1.4=pyhd8ed1ab_0 - rsa=4.9=pyhd8ed1ab_0 @@ -401,7 +401,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.2=pyhd8ed1ab_0 + - botocore=1.33.5=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.5=py311h63ff55d_0 @@ -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.11.2=pyhd8ed1ab_0 - jupyter_core=5.5.0=py311h38be061_0 - jupyter_server_terminals=0.4.4=pyhd8ed1ab_1 - kealib=1.5.2=hcd42e92_1 @@ -441,10 +441,10 @@ dependencies: - rich=13.7.0=pyhd8ed1ab_0 - sqlalchemy=2.0.23=py311h459d7ec_0 - stack_data=0.6.2=pyhd8ed1ab_0 - - starlette=0.32.0.post1=pyhd8ed1ab_0 + - starlette=0.33.0=pyhd8ed1ab_0 - tiledb=2.16.3=h8c794c1_3 - ukkonen=1.0.1=py311h9547e67_4 - - uvicorn=0.24.0=py311h38be061_0 + - uvicorn=0.24.0.post1=py311h38be061_0 - virtualenv=20.24.7=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h46250e7_0 - aiohttp=3.8.6=py311h459d7ec_1 @@ -481,25 +481,25 @@ dependencies: - readthedocs-sphinx-ext=2.2.3=pyhd8ed1ab_0 - requests-toolbelt=0.10.1=pyhd8ed1ab_0 - responses=0.24.1=pyhd8ed1ab_0 - - s3transfer=0.8.0=pyhd8ed1ab_0 + - s3transfer=0.8.2=pyhd8ed1ab_0 - scipy=1.11.4=py311h64a7726_0 - secretstorage=3.3.3=py311h38be061_2 - shapely=2.0.2=py311h2032efe_1 - stevedore=5.1.0=pyhd8ed1ab_0 - typeguard=4.1.5=pyhd8ed1ab_1 - typer=0.9.0=pyhd8ed1ab_0 - - uvicorn-standard=0.24.0=h38be061_0 + - uvicorn-standard=0.24.0.post1=h38be061_0 - aws-sdk-cpp=1.11.182=h8beafcf_7 - - boto3=1.33.1=pyhd8ed1ab_0 + - boto3=1.33.5=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - - dagster=1.5.9=pyhd8ed1ab_0 + - dagster=1.5.10=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_6 - geopandas-base=0.14.1=pyha770c72_0 - - google-auth=2.23.4=pyhca7485f_0 + - google-auth=2.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 - gtk2=2.24.33=h90689f9_2 - ipykernel=6.26.0=pyhf8b6a83_0 @@ -515,10 +515,10 @@ dependencies: - requests-oauthlib=1.3.1=pyhd8ed1ab_0 - scikit-learn=1.3.2=py311hc009520_1 - timezonefinder=6.2.0=py311h459d7ec_2 - - catalystcoop.ferc_xbrl_extractor=1.3.0=pyhd8ed1ab_1 + - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.9=pyhd8ed1ab_0 - - dagster-postgres=0.21.9=pyhd8ed1ab_0 + - dagster-graphql=1.5.10=pyhd8ed1ab_0 + - dagster-postgres=0.21.10=pyhd8ed1ab_0 - fiona=1.9.5=py311hf8e0aa6_1 - google-api-core=2.14.0=pyhd8ed1ab_0 - google-auth-oauthlib=1.1.0=pyhd8ed1ab_0 @@ -531,7 +531,7 @@ dependencies: - qtconsole-base=5.5.1=pyha770c72_0 - recordlinkage=0.16=pyhd8ed1ab_0 - tabulator=1.53.5=pyhd8ed1ab_0 - - dagster-webserver=1.5.9=pyhd8ed1ab_0 + - dagster-webserver=1.5.10=pyhd8ed1ab_0 - geopandas=0.14.1=pyhd8ed1ab_0 - google-cloud-core=2.3.3=pyhd8ed1ab_0 - libarrow-acero=14.0.1=h59595ed_3_cpu diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index dc877914b8..6bb24c94d9 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -15,9 +15,9 @@ version: 1 metadata: content_hash: - linux-64: 74460703322c458f7185502b360325ceaa57699985898e73cfba0fe85b343112 - osx-64: 84d829289bcc9447b519b5ef1003de9a87b33c825aefe64c768630f2b560d152 - osx-arm64: 4af60a188a5341a583519edb866207f4e68583e87831447441cb1088e6d9349a + linux-64: 566bcbefc936d18bbf3a48ce8800e5d3209d9925447fc48984c419514bfaa6f6 + osx-64: 39e56673d0def5503b315f36cec2b3e4bfd804758ec3bcea79dad417c6b146a2 + osx-arm64: c275fe8ff3012ad83a98252ba570f9b278f142720b73f42abfd4c4a1107f67e2 channels: - url: conda-forge used_env_vars: [] @@ -1914,52 +1914,52 @@ package: category: main optional: false - name: boto3 - version: 1.33.1 + version: 1.33.5 manager: conda platform: linux-64 dependencies: - botocore: ">=1.33.1,<1.34.0" + botocore: ">=1.33.5,<1.34.0" jmespath: ">=0.7.1,<2.0.0" python: ">=3.7" - s3transfer: ">=0.8.0,<0.9.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.1-pyhd8ed1ab_0.conda + s3transfer: ">=0.8.2,<0.9.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.5-pyhd8ed1ab_0.conda hash: - md5: 8580b17cd0420d40f901314f92df8ed9 - sha256: eb948581f4f90c814c698eeb1cfcbfd2bc0a6eeeb961a67bb572fc576bc30bcb + md5: 7485d3ee00269cd33baa2ad64a0923ee + sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 category: main optional: false - name: boto3 - version: 1.33.1 + version: 1.33.5 manager: conda platform: osx-64 dependencies: python: ">=3.7" jmespath: ">=0.7.1,<2.0.0" - s3transfer: ">=0.8.0,<0.9.0" - botocore: ">=1.33.1,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.1-pyhd8ed1ab_0.conda + s3transfer: ">=0.8.2,<0.9.0" + botocore: ">=1.33.5,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.5-pyhd8ed1ab_0.conda hash: - md5: 8580b17cd0420d40f901314f92df8ed9 - sha256: eb948581f4f90c814c698eeb1cfcbfd2bc0a6eeeb961a67bb572fc576bc30bcb + md5: 7485d3ee00269cd33baa2ad64a0923ee + sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 category: main optional: false - name: boto3 - version: 1.33.1 + version: 1.33.5 manager: conda platform: osx-arm64 dependencies: python: ">=3.7" jmespath: ">=0.7.1,<2.0.0" - s3transfer: ">=0.8.0,<0.9.0" - botocore: ">=1.33.1,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.1-pyhd8ed1ab_0.conda + s3transfer: ">=0.8.2,<0.9.0" + botocore: ">=1.33.5,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.5-pyhd8ed1ab_0.conda hash: - md5: 8580b17cd0420d40f901314f92df8ed9 - sha256: eb948581f4f90c814c698eeb1cfcbfd2bc0a6eeeb961a67bb572fc576bc30bcb + md5: 7485d3ee00269cd33baa2ad64a0923ee + sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 category: main optional: false - name: botocore - version: 1.33.2 + version: 1.33.5 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.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.5-pyhd8ed1ab_0.conda hash: - md5: 40348da60b8d2e53619ef16966cc18b8 - sha256: 3c221bec785d2d7e9940bb0c57261f1dcacc7e906a4955ed88390f554881bdf3 + md5: 352c39ba5cd9ea01996358f0748e102e + sha256: 56566ea8f3a48c24190c1dcf50681c0a84b26821c335c21b5c3c5d238e4bdb14 category: main optional: false - name: botocore - version: 1.33.2 + version: 1.33.5 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.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.5-pyhd8ed1ab_0.conda hash: - md5: 40348da60b8d2e53619ef16966cc18b8 - sha256: 3c221bec785d2d7e9940bb0c57261f1dcacc7e906a4955ed88390f554881bdf3 + md5: 352c39ba5cd9ea01996358f0748e102e + sha256: 56566ea8f3a48c24190c1dcf50681c0a84b26821c335c21b5c3c5d238e4bdb14 category: main optional: false - name: botocore - version: 1.33.2 + version: 1.33.5 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.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.5-pyhd8ed1ab_0.conda hash: - md5: 40348da60b8d2e53619ef16966cc18b8 - sha256: 3c221bec785d2d7e9940bb0c57261f1dcacc7e906a4955ed88390f554881bdf3 + md5: 352c39ba5cd9ea01996358f0748e102e + sha256: 56566ea8f3a48c24190c1dcf50681c0a84b26821c335c21b5c3c5d238e4bdb14 category: main optional: false - name: bottleneck @@ -2246,37 +2246,37 @@ package: category: main optional: false - name: c-ares - version: 1.22.1 + version: 1.23.0 manager: conda platform: linux-64 dependencies: libgcc-ng: ">=12" - url: https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.22.1-hd590300_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.23.0-hd590300_0.conda hash: - md5: 8430bd266c7b2cfbda403f7585d5ee86 - sha256: d41cf87938ba66de538b91afed3ece9b4cf5ed082a7d1c1add46b70f482f34b9 + md5: d459949bc10f64dee1595c176c2e6291 + sha256: 6b0eee827bade11c2964a05867499a50ad2a9d1b14dfe18fb867a3bc9357f56f category: main optional: false - name: c-ares - version: 1.22.1 + version: 1.23.0 manager: conda platform: osx-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/osx-64/c-ares-1.22.1-h10d778d_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/c-ares-1.23.0-h10d778d_0.conda hash: - md5: 7040d0624b78a81c8d52f22b662d7c35 - sha256: e52123d4d1e880ad883da1fa6301fa318e87cf42b6228833177d41053f7288b4 + md5: 8da823fabbad661eefc48b779d89a4ac + sha256: d1080366254a32bd1ff23f10fcfe61bfb91e2af19e71047fc2ffddd062a59033 category: main optional: false - name: c-ares - version: 1.22.1 + version: 1.23.0 manager: conda platform: osx-arm64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/osx-arm64/c-ares-1.22.1-h93a5062_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/c-ares-1.23.0-h93a5062_0.conda hash: - md5: f9d38cc3908c066e50b184cdcab12929 - sha256: 75f0222f76c9848ef9c3892300d057cb8285f28341d2f149d1fc10373242969c + md5: b187f2b99e52905042d661f824666964 + sha256: de5385280dcad805428068adb1f4a7eb1e6ec8987e2f25c4ff5766e3fec3b4a2 category: main optional: false - name: ca-certificates @@ -2649,7 +2649,7 @@ package: category: main optional: false - name: catalystcoop.ferc_xbrl_extractor - version: 1.3.0 + version: 1.3.1 manager: conda platform: linux-64 dependencies: @@ -2663,14 +2663,14 @@ package: python: ">=3.10,<3.13" sqlalchemy: ">=1.4,<3" stringcase: ">=1.2,<2" - url: https://conda.anaconda.org/conda-forge/noarch/catalystcoop.ferc_xbrl_extractor-1.3.0-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/catalystcoop.ferc_xbrl_extractor-1.3.1-pyhd8ed1ab_0.conda hash: - md5: 15b51bdc077cf3050ab69a1e6313e1a4 - sha256: 9d6c1c7219b2744210125178de0ebe1961b7523b132672ba870c585da9746dbe + md5: 223cdad8b8eee98aae17835e4e34103d + sha256: d0588a3009fd8d2fbde979f3a518f7a1383f052f01a46022c541551adc413da8 category: main optional: false - name: catalystcoop.ferc_xbrl_extractor - version: 1.3.0 + version: 1.3.1 manager: conda platform: osx-64 dependencies: @@ -2684,14 +2684,14 @@ package: arelle-release: ">=2.3,<3" pandas: ">=1.5,<2.2" stringcase: ">=1.2,<2" - url: https://conda.anaconda.org/conda-forge/noarch/catalystcoop.ferc_xbrl_extractor-1.3.0-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/catalystcoop.ferc_xbrl_extractor-1.3.1-pyhd8ed1ab_0.conda hash: - md5: 15b51bdc077cf3050ab69a1e6313e1a4 - sha256: 9d6c1c7219b2744210125178de0ebe1961b7523b132672ba870c585da9746dbe + md5: 223cdad8b8eee98aae17835e4e34103d + sha256: d0588a3009fd8d2fbde979f3a518f7a1383f052f01a46022c541551adc413da8 category: main optional: false - name: catalystcoop.ferc_xbrl_extractor - version: 1.3.0 + version: 1.3.1 manager: conda platform: osx-arm64 dependencies: @@ -2705,10 +2705,10 @@ package: arelle-release: ">=2.3,<3" pandas: ">=1.5,<2.2" stringcase: ">=1.2,<2" - url: https://conda.anaconda.org/conda-forge/noarch/catalystcoop.ferc_xbrl_extractor-1.3.0-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/catalystcoop.ferc_xbrl_extractor-1.3.1-pyhd8ed1ab_0.conda hash: - md5: 15b51bdc077cf3050ab69a1e6313e1a4 - sha256: 9d6c1c7219b2744210125178de0ebe1961b7523b132672ba870c585da9746dbe + md5: 223cdad8b8eee98aae17835e4e34103d + sha256: d0588a3009fd8d2fbde979f3a518f7a1383f052f01a46022c541551adc413da8 category: main optional: false - name: cchardet @@ -3792,7 +3792,7 @@ package: category: main optional: false - name: dagster - version: 1.5.9 + version: 1.5.10 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.9,<1.5.10.0a0" + dagster-pipes: ">=1.5.10,<1.5.11.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.9-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.10-pyhd8ed1ab_0.conda hash: - md5: d8ab27112f82687ffcd456a3b88092e5 - sha256: 238b08bf9afbc98405cb0c8c9845514da7b4b21aac5817c2b5f0de04e3a19b1b + md5: bcf42b675edb2999669116bc3b1ed789 + sha256: dcee8473cbd1823005285f5fc82fbb16d9d1b2b46bcdf8371ee4fe2fdb0ad50c category: main optional: false - name: dagster - version: 1.5.9 + version: 1.5.10 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.9,<1.5.10.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.9-pyhd8ed1ab_0.conda + dagster-pipes: ">=1.5.10,<1.5.11.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.10-pyhd8ed1ab_0.conda hash: - md5: d8ab27112f82687ffcd456a3b88092e5 - sha256: 238b08bf9afbc98405cb0c8c9845514da7b4b21aac5817c2b5f0de04e3a19b1b + md5: bcf42b675edb2999669116bc3b1ed789 + sha256: dcee8473cbd1823005285f5fc82fbb16d9d1b2b46bcdf8371ee4fe2fdb0ad50c category: main optional: false - name: dagster - version: 1.5.9 + version: 1.5.10 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.9,<1.5.10.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.9-pyhd8ed1ab_0.conda + dagster-pipes: ">=1.5.10,<1.5.11.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.10-pyhd8ed1ab_0.conda hash: - md5: d8ab27112f82687ffcd456a3b88092e5 - sha256: 238b08bf9afbc98405cb0c8c9845514da7b4b21aac5817c2b5f0de04e3a19b1b + md5: bcf42b675edb2999669116bc3b1ed789 + sha256: dcee8473cbd1823005285f5fc82fbb16d9d1b2b46bcdf8371ee4fe2fdb0ad50c category: main optional: false - name: dagster-graphql - version: 1.5.9 + version: 1.5.10 manager: conda platform: linux-64 dependencies: - dagster: ">=1.5.9,<1.5.10.0a0" + dagster: ">=1.5.10,<1.5.11.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.9-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.10-pyhd8ed1ab_0.conda hash: - md5: 7dcd105a5451f9800aa6de278d86db72 - sha256: 8484c6b0db1a3505fc7d16e83e0da75b9c886ae3d497266fd06f72fcd3246786 + md5: fd3569582db65a0c88fbc7d1bb803853 + sha256: a142f082da2b7905713b09e0ad19eef971a5d4f66063ba7a2b19247e3932e129 category: dev optional: true - name: dagster-graphql - version: 1.5.9 + version: 1.5.10 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.9,<1.5.10.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.9-pyhd8ed1ab_0.conda + dagster: ">=1.5.10,<1.5.11.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.10-pyhd8ed1ab_0.conda hash: - md5: 7dcd105a5451f9800aa6de278d86db72 - sha256: 8484c6b0db1a3505fc7d16e83e0da75b9c886ae3d497266fd06f72fcd3246786 + md5: fd3569582db65a0c88fbc7d1bb803853 + sha256: a142f082da2b7905713b09e0ad19eef971a5d4f66063ba7a2b19247e3932e129 category: dev optional: true - name: dagster-graphql - version: 1.5.9 + version: 1.5.10 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.9,<1.5.10.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.9-pyhd8ed1ab_0.conda + dagster: ">=1.5.10,<1.5.11.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.10-pyhd8ed1ab_0.conda hash: - md5: 7dcd105a5451f9800aa6de278d86db72 - sha256: 8484c6b0db1a3505fc7d16e83e0da75b9c886ae3d497266fd06f72fcd3246786 + md5: fd3569582db65a0c88fbc7d1bb803853 + sha256: a142f082da2b7905713b09e0ad19eef971a5d4f66063ba7a2b19247e3932e129 category: dev optional: true - name: dagster-pipes - version: 1.5.9 + version: 1.5.10 manager: conda platform: linux-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-pipes-1.5.9-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-pipes-1.5.10-pyhd8ed1ab_0.conda hash: - md5: 0a9787859365c4d2425e589ac53c462b - sha256: eebc7dca517350678ebfb8b3fff7ec47c60aff62dae2e69b8c4845b6080ec3e8 + md5: 69600c68efc23fb84c05c2e9c1c05947 + sha256: a98a8b2501af4bc112d5b2f5e3edea6c22a084651cc720786c405877b8507630 category: main optional: false - name: dagster-pipes - version: 1.5.9 + version: 1.5.10 manager: conda platform: osx-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-pipes-1.5.9-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-pipes-1.5.10-pyhd8ed1ab_0.conda hash: - md5: 0a9787859365c4d2425e589ac53c462b - sha256: eebc7dca517350678ebfb8b3fff7ec47c60aff62dae2e69b8c4845b6080ec3e8 + md5: 69600c68efc23fb84c05c2e9c1c05947 + sha256: a98a8b2501af4bc112d5b2f5e3edea6c22a084651cc720786c405877b8507630 category: main optional: false - name: dagster-pipes - version: 1.5.9 + version: 1.5.10 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-pipes-1.5.9-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-pipes-1.5.10-pyhd8ed1ab_0.conda hash: - md5: 0a9787859365c4d2425e589ac53c462b - sha256: eebc7dca517350678ebfb8b3fff7ec47c60aff62dae2e69b8c4845b6080ec3e8 + md5: 69600c68efc23fb84c05c2e9c1c05947 + sha256: a98a8b2501af4bc112d5b2f5e3edea6c22a084651cc720786c405877b8507630 category: main optional: false - name: dagster-postgres - version: 0.21.9 + version: 0.21.10 manager: conda platform: linux-64 dependencies: - dagster: 1.5.9.* + dagster: 1.5.10.* psycopg2-binary: "" python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.9-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.10-pyhd8ed1ab_0.conda hash: - md5: 18c5dd009bd4d99ec38003583134c9fc - sha256: 83ad5a4eca4698b1258398bcd405665bbd8e41464124221cf477bb78bdc22100 + md5: ec155b3a7172590ccbc89f461427b5aa + sha256: 4eb986655ef547d4dc72cd34b60687c9c3c390806493c15187c4d26d89d58fc0 category: main optional: false - name: dagster-postgres - version: 0.21.9 + version: 0.21.10 manager: conda platform: osx-64 dependencies: psycopg2-binary: "" python: ">=3.8" - dagster: 1.5.9.* - url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.9-pyhd8ed1ab_0.conda + dagster: 1.5.10.* + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.10-pyhd8ed1ab_0.conda hash: - md5: 18c5dd009bd4d99ec38003583134c9fc - sha256: 83ad5a4eca4698b1258398bcd405665bbd8e41464124221cf477bb78bdc22100 + md5: ec155b3a7172590ccbc89f461427b5aa + sha256: 4eb986655ef547d4dc72cd34b60687c9c3c390806493c15187c4d26d89d58fc0 category: main optional: false - name: dagster-postgres - version: 0.21.9 + version: 0.21.10 manager: conda platform: osx-arm64 dependencies: psycopg2-binary: "" python: ">=3.8" - dagster: 1.5.9.* - url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.9-pyhd8ed1ab_0.conda + dagster: 1.5.10.* + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.10-pyhd8ed1ab_0.conda hash: - md5: 18c5dd009bd4d99ec38003583134c9fc - sha256: 83ad5a4eca4698b1258398bcd405665bbd8e41464124221cf477bb78bdc22100 + md5: ec155b3a7172590ccbc89f461427b5aa + sha256: 4eb986655ef547d4dc72cd34b60687c9c3c390806493c15187c4d26d89d58fc0 category: main optional: false - name: dagster-webserver - version: 1.5.9 + version: 1.5.10 manager: conda platform: linux-64 dependencies: click: ">=7.0,<9.0" - dagster: ">=1.5.9,<1.5.10.0a0" - dagster-graphql: ">=1.5.9,<1.5.10.0a0" + dagster: ">=1.5.10,<1.5.11.0a0" + dagster-graphql: ">=1.5.10,<1.5.11.0a0" python: ">=3.8" starlette: "" uvicorn-standard: "" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-webserver-1.5.9-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-webserver-1.5.10-pyhd8ed1ab_0.conda hash: - md5: 880fa7acdbf3494cef45759bb866bb63 - sha256: 2fce08b607d97f72d7452350a0c917d96419074381bf8791ebe116ec3a57b8f4 + md5: 6161623733c03c21098dce0af904ea6b + sha256: 975173f6a39f40d5fa505354007200741689714bb1eaf1cba8e52fab1a2bfc88 category: dev optional: true - name: dagster-webserver - version: 1.5.9 + version: 1.5.10 manager: conda platform: osx-64 dependencies: @@ -4069,16 +4069,16 @@ package: uvicorn-standard: "" python: ">=3.8" click: ">=7.0,<9.0" - dagster: ">=1.5.9,<1.5.10.0a0" - dagster-graphql: ">=1.5.9,<1.5.10.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-webserver-1.5.9-pyhd8ed1ab_0.conda + dagster: ">=1.5.10,<1.5.11.0a0" + dagster-graphql: ">=1.5.10,<1.5.11.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-webserver-1.5.10-pyhd8ed1ab_0.conda hash: - md5: 880fa7acdbf3494cef45759bb866bb63 - sha256: 2fce08b607d97f72d7452350a0c917d96419074381bf8791ebe116ec3a57b8f4 + md5: 6161623733c03c21098dce0af904ea6b + sha256: 975173f6a39f40d5fa505354007200741689714bb1eaf1cba8e52fab1a2bfc88 category: dev optional: true - name: dagster-webserver - version: 1.5.9 + version: 1.5.10 manager: conda platform: osx-arm64 dependencies: @@ -4086,12 +4086,12 @@ package: uvicorn-standard: "" python: ">=3.8" click: ">=7.0,<9.0" - dagster: ">=1.5.9,<1.5.10.0a0" - dagster-graphql: ">=1.5.9,<1.5.10.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-webserver-1.5.9-pyhd8ed1ab_0.conda + dagster: ">=1.5.10,<1.5.11.0a0" + dagster-graphql: ">=1.5.10,<1.5.11.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-webserver-1.5.10-pyhd8ed1ab_0.conda hash: - md5: 880fa7acdbf3494cef45759bb866bb63 - sha256: 2fce08b607d97f72d7452350a0c917d96419074381bf8791ebe116ec3a57b8f4 + md5: 6161623733c03c21098dce0af904ea6b + sha256: 975173f6a39f40d5fa505354007200741689714bb1eaf1cba8e52fab1a2bfc88 category: dev optional: true - name: dask-core @@ -6470,7 +6470,7 @@ package: category: main optional: false - name: google-auth - version: 2.23.4 + version: 2.24.0 manager: conda platform: linux-64 dependencies: @@ -6483,14 +6483,14 @@ package: pyu2f: ">=0.1.5" requests: ">=2.20.0,<3.0.0" rsa: ">=3.1.4,<5" - url: https://conda.anaconda.org/conda-forge/noarch/google-auth-2.23.4-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/google-auth-2.24.0-pyhca7485f_0.conda hash: - md5: 9ad01e23627db9def3104ba78fd19229 - sha256: 1319ebc61518025e3bd7de38d27d254d8dcc61cc3b7d9fd1f62148ae614c8657 + md5: 5c80374ea4c24d3bd6822108d43715d0 + sha256: c270d1866bd01f3fa97e5c65496b853af6b1c8d58479132c8b3397534fbb2919 category: main optional: false - name: google-auth - version: 2.23.4 + version: 2.24.0 manager: conda platform: osx-64 dependencies: @@ -6503,14 +6503,14 @@ package: cachetools: ">=2.0.0,<6.0" aiohttp: ">=3.6.2,<4.0.0" cryptography: ">=38.0.3" - url: https://conda.anaconda.org/conda-forge/noarch/google-auth-2.23.4-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/google-auth-2.24.0-pyhca7485f_0.conda hash: - md5: 9ad01e23627db9def3104ba78fd19229 - sha256: 1319ebc61518025e3bd7de38d27d254d8dcc61cc3b7d9fd1f62148ae614c8657 + md5: 5c80374ea4c24d3bd6822108d43715d0 + sha256: c270d1866bd01f3fa97e5c65496b853af6b1c8d58479132c8b3397534fbb2919 category: main optional: false - name: google-auth - version: 2.23.4 + version: 2.24.0 manager: conda platform: osx-arm64 dependencies: @@ -6523,10 +6523,10 @@ package: cachetools: ">=2.0.0,<6.0" aiohttp: ">=3.6.2,<4.0.0" cryptography: ">=38.0.3" - url: https://conda.anaconda.org/conda-forge/noarch/google-auth-2.23.4-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/google-auth-2.24.0-pyhca7485f_0.conda hash: - md5: 9ad01e23627db9def3104ba78fd19229 - sha256: 1319ebc61518025e3bd7de38d27d254d8dcc61cc3b7d9fd1f62148ae614c8657 + md5: 5c80374ea4c24d3bd6822108d43715d0 + sha256: c270d1866bd01f3fa97e5c65496b853af6b1c8d58479132c8b3397534fbb2919 category: main optional: false - name: google-auth-oauthlib @@ -9244,45 +9244,45 @@ package: category: main optional: false - name: jsonschema-specifications - version: 2023.11.1 + version: 2023.11.2 manager: conda platform: linux-64 dependencies: importlib_resources: ">=1.4.0" python: ">=3.8" referencing: ">=0.31.0" - url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-specifications-2023.11.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-specifications-2023.11.2-pyhd8ed1ab_0.conda hash: - md5: 094ff9cf36957f95bb74cee42ab140b2 - sha256: 17ac31b620a7bb81c6468b4ba9ad4aeb1c6c6669e9dd7e4ad909da48702a6091 + md5: 73884ca36d6d96cbce498cde99fab40f + sha256: e26115d02dc208a05b557c8dd670923270803b9b3b8af4e22b93d659d1ec77ec category: main optional: false - name: jsonschema-specifications - version: 2023.11.1 + version: 2023.11.2 manager: conda platform: osx-64 dependencies: python: ">=3.8" importlib_resources: ">=1.4.0" referencing: ">=0.31.0" - url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-specifications-2023.11.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-specifications-2023.11.2-pyhd8ed1ab_0.conda hash: - md5: 094ff9cf36957f95bb74cee42ab140b2 - sha256: 17ac31b620a7bb81c6468b4ba9ad4aeb1c6c6669e9dd7e4ad909da48702a6091 + md5: 73884ca36d6d96cbce498cde99fab40f + sha256: e26115d02dc208a05b557c8dd670923270803b9b3b8af4e22b93d659d1ec77ec category: main optional: false - name: jsonschema-specifications - version: 2023.11.1 + version: 2023.11.2 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" importlib_resources: ">=1.4.0" referencing: ">=0.31.0" - url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-specifications-2023.11.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jsonschema-specifications-2023.11.2-pyhd8ed1ab_0.conda hash: - md5: 094ff9cf36957f95bb74cee42ab140b2 - sha256: 17ac31b620a7bb81c6468b4ba9ad4aeb1c6c6669e9dd7e4ad909da48702a6091 + md5: 73884ca36d6d96cbce498cde99fab40f + sha256: e26115d02dc208a05b557c8dd670923270803b9b3b8af4e22b93d659d1ec77ec category: main optional: false - name: jsonschema-with-format-nongpl @@ -14502,8 +14502,8 @@ package: entrypoints: ">=0.2.2" traitlets: ">=5.0" markupsafe: ">=2.0" - pandocfilters: ">=1.4.1" jupyter_core: ">=4.7" + pandocfilters: ">=1.4.1" nbformat: ">=5.1" pygments: ">=2.4.1" nbclient: ">=0.5.0" @@ -14530,8 +14530,8 @@ package: entrypoints: ">=0.2.2" traitlets: ">=5.0" markupsafe: ">=2.0" - pandocfilters: ">=1.4.1" jupyter_core: ">=4.7" + pandocfilters: ">=1.4.1" nbformat: ">=5.1" pygments: ">=2.4.1" nbclient: ">=0.5.0" @@ -17197,39 +17197,39 @@ package: category: main optional: false - name: pyasn1 - version: 0.5.0 + version: 0.5.1 manager: conda platform: linux-64 dependencies: python: "!=3.0,!=3.1,!=3.2,!=3.3,!=3.4,!=3.5" - url: https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.5.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.5.1-pyhd8ed1ab_0.conda hash: - md5: 4b1c0db24e212190be1969b0aa490ad8 - sha256: 259b1107ae7d6983a8fdebe1717b67005fdf5328e827f33d38a9df43dee5ef82 + md5: fb1a800972b072aa4d16450983c81418 + sha256: 8b116da9acbb471e107203c11acaffcb259aca2367aa7e83e796e43ed5d381b3 category: main optional: false - name: pyasn1 - version: 0.5.0 + version: 0.5.1 manager: conda platform: osx-64 dependencies: python: "!=3.0,!=3.1,!=3.2,!=3.3,!=3.4,!=3.5" - url: https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.5.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.5.1-pyhd8ed1ab_0.conda hash: - md5: 4b1c0db24e212190be1969b0aa490ad8 - sha256: 259b1107ae7d6983a8fdebe1717b67005fdf5328e827f33d38a9df43dee5ef82 + md5: fb1a800972b072aa4d16450983c81418 + sha256: 8b116da9acbb471e107203c11acaffcb259aca2367aa7e83e796e43ed5d381b3 category: main optional: false - name: pyasn1 - version: 0.5.0 + version: 0.5.1 manager: conda platform: osx-arm64 dependencies: python: "!=3.0,!=3.1,!=3.2,!=3.3,!=3.4,!=3.5" - url: https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.5.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pyasn1-0.5.1-pyhd8ed1ab_0.conda hash: - md5: 4b1c0db24e212190be1969b0aa490ad8 - sha256: 259b1107ae7d6983a8fdebe1717b67005fdf5328e827f33d38a9df43dee5ef82 + md5: fb1a800972b072aa4d16450983c81418 + sha256: 8b116da9acbb471e107203c11acaffcb259aca2367aa7e83e796e43ed5d381b3 category: main optional: false - name: pyasn1-modules @@ -18953,17 +18953,17 @@ package: category: main optional: false - name: rdma-core - version: "28.9" + version: "49.0" manager: conda platform: linux-64 dependencies: __glibc: ">=2.17,<3.0.a0" libgcc-ng: ">=12" libstdcxx-ng: ">=12" - url: https://conda.anaconda.org/conda-forge/linux-64/rdma-core-28.9-h59595ed_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/rdma-core-49.0-hd3aeb46_1.conda hash: - md5: aeffb7c06b5f65e55e6c637408dc4100 - sha256: 832f9393ab3144ce6468c6f150db9d398fad4451e96a8879afb3059f0c9902f6 + md5: 434d42b3ee35e1aaf6bb42d87730d1a4 + sha256: dca608dd54c7782f15b6a99220fa1ac8f744c1e183ba69b5d0f29c5be85865b1 category: main optional: false - name: re2 @@ -19142,45 +19142,45 @@ package: category: main optional: false - name: referencing - version: 0.31.0 + version: 0.31.1 manager: conda platform: linux-64 dependencies: attrs: ">=22.2.0" python: ">=3.8" rpds-py: ">=0.7.0" - url: https://conda.anaconda.org/conda-forge/noarch/referencing-0.31.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/referencing-0.31.1-pyhd8ed1ab_0.conda hash: - md5: 38c2b9b24e9a58725a233f1fa32c23e9 - sha256: 108f27bf249a581acd0f1de0e1e6a4d814ab18943178c2d9a4df02f5c16d2102 + md5: ae08039cf63eb82637b867aea3f04758 + sha256: efb91b7d2f6e729c01676e52e99071db819628a9f0a3a519c8969f0d2350a371 category: main optional: false - name: referencing - version: 0.31.0 + version: 0.31.1 manager: conda platform: osx-64 dependencies: python: ">=3.8" attrs: ">=22.2.0" rpds-py: ">=0.7.0" - url: https://conda.anaconda.org/conda-forge/noarch/referencing-0.31.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/referencing-0.31.1-pyhd8ed1ab_0.conda hash: - md5: 38c2b9b24e9a58725a233f1fa32c23e9 - sha256: 108f27bf249a581acd0f1de0e1e6a4d814ab18943178c2d9a4df02f5c16d2102 + md5: ae08039cf63eb82637b867aea3f04758 + sha256: efb91b7d2f6e729c01676e52e99071db819628a9f0a3a519c8969f0d2350a371 category: main optional: false - name: referencing - version: 0.31.0 + version: 0.31.1 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" attrs: ">=22.2.0" rpds-py: ">=0.7.0" - url: https://conda.anaconda.org/conda-forge/noarch/referencing-0.31.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/referencing-0.31.1-pyhd8ed1ab_0.conda hash: - md5: 38c2b9b24e9a58725a233f1fa32c23e9 - sha256: 108f27bf249a581acd0f1de0e1e6a4d814ab18943178c2d9a4df02f5c16d2102 + md5: ae08039cf63eb82637b867aea3f04758 + sha256: efb91b7d2f6e729c01676e52e99071db819628a9f0a3a519c8969f0d2350a371 category: main optional: false - name: regex @@ -19599,43 +19599,43 @@ package: category: main optional: false - name: rpds-py - version: 0.13.1 + version: 0.13.2 manager: conda platform: linux-64 dependencies: libgcc-ng: ">=12" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/rpds-py-0.13.1-py311h46250e7_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/rpds-py-0.13.2-py311h46250e7_0.conda hash: - md5: b1924481122f7cb41cb001f5c96bf3f6 - sha256: 014f0393f43a67b43747b070a0619f84841d4c961597c30936d264abf899c39c + md5: c5f5089dd1fe0000fecaf0d12eca50b9 + sha256: 087429b28f17d6b9df1492120c1aebf93f47441b3c071e8a06796a0502ff7ee9 category: main optional: false - name: rpds-py - version: 0.13.1 + version: 0.13.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/rpds-py-0.13.1-py311h5e0f0e4_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/rpds-py-0.13.2-py311h5e0f0e4_0.conda hash: - md5: 96774911faf26609ab33aaa4246c1a06 - sha256: c591e79f21b60f5f37af31dd563f4515678f85b222b927138f94e8316cddf9e9 + md5: ca1b5674090b4f21c474bc3558dd0f72 + sha256: 4aeefa26b76d99c9aaf8f319493be42b2c016ab6b553b5ab8b3a6bb08737ff31 category: main optional: false - name: rpds-py - version: 0.13.1 + version: 0.13.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/rpds-py-0.13.1-py311h94f323b_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/rpds-py-0.13.2-py311h94f323b_0.conda hash: - md5: c392d76b681cfa1ea2155233af59f947 - sha256: dd7ea62b2860ec1da543e017ad9163623befde9b16df0098b8a631c9188ad203 + md5: 78c562a4e5efd7a2859c9a3ac3b88e35 + sha256: ca2106c533a9c9bfd8b9bae3ee9059a9d40cbdcfb7cfd085286e92c5e6f87c41 category: main optional: false - name: rsa @@ -19864,42 +19864,42 @@ package: category: main optional: false - name: s3transfer - version: 0.8.0 + version: 0.8.2 manager: conda platform: linux-64 dependencies: - botocore: ">=1.32.7,<2.0a.0" + botocore: ">=1.33.2,<2.0a.0" python: ">=3.7" - url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.2-pyhd8ed1ab_0.conda hash: - md5: 9d4e095f2a2e84d0a3f54e3d9f13f9b2 - sha256: cedf5d2e5da3dcd14d7da767a0cee8ef18938af724fdcf2fec682d44024cc2e8 + md5: 75e12933f4bf755c9cdd37072bcb6203 + sha256: 2e5679abcec8eb646df37518ecdbdaa224d7ff5295a1e56707317d52b47d9c79 category: main optional: false - name: s3transfer - version: 0.8.0 + version: 0.8.2 manager: conda platform: osx-64 dependencies: python: ">=3.7" - botocore: ">=1.32.7,<2.0a.0" - url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.0-pyhd8ed1ab_0.conda + botocore: ">=1.33.2,<2.0a.0" + url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.2-pyhd8ed1ab_0.conda hash: - md5: 9d4e095f2a2e84d0a3f54e3d9f13f9b2 - sha256: cedf5d2e5da3dcd14d7da767a0cee8ef18938af724fdcf2fec682d44024cc2e8 + md5: 75e12933f4bf755c9cdd37072bcb6203 + sha256: 2e5679abcec8eb646df37518ecdbdaa224d7ff5295a1e56707317d52b47d9c79 category: main optional: false - name: s3transfer - version: 0.8.0 + version: 0.8.2 manager: conda platform: osx-arm64 dependencies: python: ">=3.7" - botocore: ">=1.32.7,<2.0a.0" - url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.0-pyhd8ed1ab_0.conda + botocore: ">=1.33.2,<2.0a.0" + url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.2-pyhd8ed1ab_0.conda hash: - md5: 9d4e095f2a2e84d0a3f54e3d9f13f9b2 - sha256: cedf5d2e5da3dcd14d7da767a0cee8ef18938af724fdcf2fec682d44024cc2e8 + md5: 75e12933f4bf755c9cdd37072bcb6203 + sha256: 2e5679abcec8eb646df37518ecdbdaa224d7ff5295a1e56707317d52b47d9c79 category: main optional: false - name: scikit-learn @@ -21167,45 +21167,45 @@ package: category: main optional: false - name: starlette - version: 0.32.0.post1 + version: 0.33.0 manager: conda platform: linux-64 dependencies: anyio: <5,>=3.4.0 python: ">=3.8" typing_extensions: ">=3.10.0" - url: https://conda.anaconda.org/conda-forge/noarch/starlette-0.32.0.post1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/starlette-0.33.0-pyhd8ed1ab_0.conda hash: - md5: 9aa6d56db739eee2ff473becbe178fd1 - sha256: 9692b83467670b473dc71137376f735249ef2ee6eeefce9068b0dec94810c24c + md5: 55027cf7f50803f0f5ece8b661eff47b + sha256: 3923f4c3e31d8c3a9c574779585137ff834a6108558a8956ef93022d4fcb37a8 category: dev optional: true - name: starlette - version: 0.32.0.post1 + version: 0.33.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" typing_extensions: ">=3.10.0" anyio: <5,>=3.4.0 - url: https://conda.anaconda.org/conda-forge/noarch/starlette-0.32.0.post1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/starlette-0.33.0-pyhd8ed1ab_0.conda hash: - md5: 9aa6d56db739eee2ff473becbe178fd1 - sha256: 9692b83467670b473dc71137376f735249ef2ee6eeefce9068b0dec94810c24c + md5: 55027cf7f50803f0f5ece8b661eff47b + sha256: 3923f4c3e31d8c3a9c574779585137ff834a6108558a8956ef93022d4fcb37a8 category: dev optional: true - name: starlette - version: 0.32.0.post1 + version: 0.33.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" typing_extensions: ">=3.10.0" anyio: <5,>=3.4.0 - url: https://conda.anaconda.org/conda-forge/noarch/starlette-0.32.0.post1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/starlette-0.33.0-pyhd8ed1ab_0.conda hash: - md5: 9aa6d56db739eee2ff473becbe178fd1 - sha256: 9692b83467670b473dc71137376f735249ef2ee6eeefce9068b0dec94810c24c + md5: 55027cf7f50803f0f5ece8b661eff47b + sha256: 3923f4c3e31d8c3a9c574779585137ff834a6108558a8956ef93022d4fcb37a8 category: dev optional: true - name: stevedore @@ -22450,11 +22450,11 @@ package: libgcc-ng: ">=12" libnuma: ">=2.0.16,<3.0a0" libstdcxx-ng: ">=12" - rdma-core: ">=28.9,<29.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/ucx-1.15.0-h64cca9d_0.conda + rdma-core: ">=48.0" + url: https://conda.anaconda.org/conda-forge/linux-64/ucx-1.15.0-hae80064_1.conda hash: - md5: b35b1f1a9fdbf93266c91f297dc9060e - sha256: 8a4dce10304fee0df715addec3d078421aa7aa0824422a6630d621d15bd98e5f + md5: c0413425844278251c1cc9459386339b + sha256: f511a735bf7a0b56c5ae48839e2248d46a922ffc6ad8ea2da7617485faa70c6f category: main optional: false - name: ukkonen @@ -22694,7 +22694,7 @@ package: category: main optional: false - name: uvicorn - version: 0.24.0 + version: 0.24.0.post1 manager: conda platform: linux-64 dependencies: @@ -22702,14 +22702,14 @@ package: h11: ">=0.8" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/uvicorn-0.24.0-py311h38be061_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/uvicorn-0.24.0.post1-py311h38be061_0.conda hash: - md5: a6eb331b0b42251227dbdfb5838c287b - sha256: df5269d01ba7ae8fa7cc0d822a63db7a646005c689e8a90083f145a707df6035 + md5: 2b1938535dcb0385f024f6fa66eb63ad + sha256: e79e66a3baa0fc0ae6d3ca28305a5222f9f3f451d95369a9a6a8a13fbaa20eaa category: main optional: false - name: uvicorn - version: 0.24.0 + version: 0.24.0.post1 manager: conda platform: osx-64 dependencies: @@ -22717,14 +22717,14 @@ package: h11: ">=0.8" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/uvicorn-0.24.0-py311h6eed73b_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/uvicorn-0.24.0.post1-py311h6eed73b_0.conda hash: - md5: 62249aa566e8be9286966278a6582e1a - sha256: ab7aa3875fbafd7912b97616573741508e140446fa9819ba870788677ba8fba3 + md5: 84b59bc83d504ffdceaa08a16fbb0b03 + sha256: 092a4960fff7aa0263974cfdbf0eee85d53032633293be73bcf971f259fdf869 category: main optional: false - name: uvicorn - version: 0.24.0 + version: 0.24.0.post1 manager: conda platform: osx-arm64 dependencies: @@ -22732,14 +22732,14 @@ package: h11: ">=0.8" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/uvicorn-0.24.0-py311h267d04e_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/uvicorn-0.24.0.post1-py311h267d04e_0.conda hash: - md5: ed05fec89baaa5869db4e27bf4d510dc - sha256: 275934feb0e2cdfacd65414d8e54d3a9aa0e703f11a52ca3a0485df04a51cf77 + md5: 72fa7ae2d42c1b919afc2a05c94366da + sha256: 092af8de831585eea0c8980a06194ffcd558a41744b17028f7d81dc333726351 category: main optional: false - name: uvicorn-standard - version: 0.24.0 + version: 0.24.0.post1 manager: conda platform: linux-64 dependencies: @@ -22747,18 +22747,18 @@ package: python-dotenv: ">=0.13" python_abi: 3.11.* pyyaml: ">=5.1" - uvicorn: 0.24.0 + uvicorn: 0.24.0.post1 uvloop: ">=0.14.0,!=0.15.0,!=0.15.1" watchfiles: ">=0.13" websockets: ">=10.4" - url: https://conda.anaconda.org/conda-forge/linux-64/uvicorn-standard-0.24.0-h38be061_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/uvicorn-standard-0.24.0.post1-h38be061_0.conda hash: - md5: e8143a99cadb40ba9542e6e9ff15d862 - sha256: dc23a3aff61791522ab1d924c0f6b67468c3c72772c5ca690158c160ae42ac33 + md5: bc7779ba8fab689013281f98989f321e + sha256: c0cd1953e1bc87120dce855ee38828bfdf9c66d64dc2796c49b40cd69cfc09cd category: dev optional: true - name: uvicorn-standard - version: 0.24.0 + version: 0.24.0.post1 manager: conda platform: osx-64 dependencies: @@ -22766,18 +22766,18 @@ package: python-dotenv: ">=0.13" python_abi: 3.11.* pyyaml: ">=5.1" - uvicorn: 0.24.0 + uvicorn: 0.24.0.post1 uvloop: ">=0.14.0,!=0.15.0,!=0.15.1" watchfiles: ">=0.13" websockets: ">=10.4" - url: https://conda.anaconda.org/conda-forge/osx-64/uvicorn-standard-0.24.0-h6eed73b_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/uvicorn-standard-0.24.0.post1-h6eed73b_0.conda hash: - md5: fcfded7537383dc21fc53708048fb40f - sha256: 30476332eed1f448bfe769dcdf8a5a68e55587980026eae317c2a84b17daac2b + md5: fc3f047cd7236a5d906b828a9bbec38b + sha256: b8885240415223f1e176c8a0af7f3dd5b39cf303338425f75befb591e23c7c1d category: dev optional: true - name: uvicorn-standard - version: 0.24.0 + version: 0.24.0.post1 manager: conda platform: osx-arm64 dependencies: @@ -22785,14 +22785,14 @@ package: python-dotenv: ">=0.13" python_abi: 3.11.* pyyaml: ">=5.1" - uvicorn: 0.24.0 + uvicorn: 0.24.0.post1 uvloop: ">=0.14.0,!=0.15.0,!=0.15.1" watchfiles: ">=0.13" websockets: ">=10.4" - url: https://conda.anaconda.org/conda-forge/osx-arm64/uvicorn-standard-0.24.0-ha1ab1f8_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/uvicorn-standard-0.24.0.post1-ha1ab1f8_0.conda hash: - md5: e35093930996a0cd5668b020f880e0f2 - sha256: 391af506e734bd59d1a3b4611e27393b26ea6aa585070a63a45d4522a1fbd500 + md5: e4c1c55ae8b7aab529ecf8211f4cc4e4 + sha256: 92230fa9751494f3bc00c552803050cddf578e216421b3b7825a5d40dacea4d0 category: dev optional: true - name: uvloop diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index 92854a7799..832b19005b 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: osx-64 -# input_hash: 84d829289bcc9447b519b5ef1003de9a87b33c825aefe64c768630f2b560d152 +# input_hash: 39e56673d0def5503b315f36cec2b3e4bfd804758ec3bcea79dad417c6b146a2 channels: - conda-forge @@ -8,7 +8,7 @@ channels: dependencies: - aws-c-common=0.9.8=h10d778d_0 - bzip2=1.0.8=h10d778d_5 - - c-ares=1.22.1=h10d778d_0 + - c-ares=1.23.0=h10d778d_0 - ca-certificates=2023.11.17=h8857fd0_0 - font-ttf-dejavu-sans-mono=2.37=hab24e00_0 - font-ttf-inconsolata=3.000=h77eed37_0 @@ -152,7 +152,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_0 - crashtest=0.4.1=pyhd8ed1ab_0 - cycler=0.12.1=pyhd8ed1ab_0 - - dagster-pipes=1.5.9=pyhd8ed1ab_0 + - dagster-pipes=1.5.10=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - debugpy=1.8.0=py311hdf8f085_1 - decorator=5.1.1=pyhd8ed1ab_0 @@ -222,7 +222,7 @@ dependencies: - psutil=5.9.5=py311h2725bcf_1 - ptyprocess=0.7.0=pyhd3deb0d_0 - pure_eval=0.2.2=pyhd8ed1ab_0 - - pyasn1=0.5.0=pyhd8ed1ab_0 + - pyasn1=0.5.1=pyhd8ed1ab_0 - pycparser=2.21=pyhd8ed1ab_0 - pygments=2.17.2=pyhd8ed1ab_0 - pyjwt=2.8.0=pyhd8ed1ab_0 @@ -243,7 +243,7 @@ dependencies: - regex=2023.10.3=py311h2725bcf_0 - rfc3986=2.0.0=pyhd8ed1ab_0 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 - - rpds-py=0.13.1=py311h5e0f0e4_0 + - rpds-py=0.13.2=py311h5e0f0e4_0 - rtree=1.1.0=py311hbc1f44b_0 - ruamel.yaml.clib=0.2.7=py311h2725bcf_2 - ruff=0.1.6=py311hec6fdf1_0 @@ -359,7 +359,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.31.1=pyhd8ed1ab_0 - restructuredtext_lint=1.4.0=pyhd8ed1ab_0 - rfc3339-validator=0.1.4=pyhd8ed1ab_0 - rsa=4.9=pyhd8ed1ab_0 @@ -381,7 +381,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.2=pyhd8ed1ab_0 + - botocore=1.33.5=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.5=py311hd51016d_0 @@ -395,7 +395,7 @@ dependencies: - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - httpcore=1.0.2=pyhd8ed1ab_0 - importlib_metadata=6.8.0=hd8ed1ab_0 - - jsonschema-specifications=2023.11.1=pyhd8ed1ab_0 + - jsonschema-specifications=2023.11.2=pyhd8ed1ab_0 - jupyter_core=5.5.0=py311h6eed73b_0 - jupyter_server_terminals=0.4.4=pyhd8ed1ab_1 - kealib=1.5.2=h052fcf7_1 @@ -421,10 +421,10 @@ dependencies: - rich=13.7.0=pyhd8ed1ab_0 - sqlalchemy=2.0.23=py311he705e18_0 - stack_data=0.6.2=pyhd8ed1ab_0 - - starlette=0.32.0.post1=pyhd8ed1ab_0 + - starlette=0.33.0=pyhd8ed1ab_0 - tiledb=2.16.3=hd3a41d5_3 - ukkonen=1.0.1=py311h5fe6e05_4 - - uvicorn=0.24.0=py311h6eed73b_0 + - uvicorn=0.24.0.post1=py311h6eed73b_0 - virtualenv=20.24.7=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h5e0f0e4_0 - aiohttp=3.8.6=py311he705e18_1 @@ -463,24 +463,24 @@ dependencies: - readthedocs-sphinx-ext=2.2.3=pyhd8ed1ab_0 - requests-toolbelt=0.10.1=pyhd8ed1ab_0 - responses=0.24.1=pyhd8ed1ab_0 - - s3transfer=0.8.0=pyhd8ed1ab_0 + - s3transfer=0.8.2=pyhd8ed1ab_0 - scipy=1.11.4=py311he0bea55_0 - send2trash=1.8.2=pyhd1c38e8_0 - shapely=2.0.2=py311h4c12f3d_1 - stevedore=5.1.0=pyhd8ed1ab_0 - typeguard=4.1.5=pyhd8ed1ab_1 - typer=0.9.0=pyhd8ed1ab_0 - - uvicorn-standard=0.24.0=h6eed73b_0 - - boto3=1.33.1=pyhd8ed1ab_0 + - uvicorn-standard=0.24.0.post1=h6eed73b_0 + - boto3=1.33.5=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - - dagster=1.5.9=pyhd8ed1ab_0 + - dagster=1.5.10=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=py311h5646c56_6 - geopandas-base=0.14.1=pyha770c72_0 - - google-auth=2.23.4=pyhca7485f_0 + - google-auth=2.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 - graphviz=9.0.0=hee74176_1 - ipykernel=6.26.0=pyh3cd1d5f_0 @@ -495,10 +495,10 @@ dependencies: - requests-oauthlib=1.3.1=pyhd8ed1ab_0 - scikit-learn=1.3.2=py311h66081b9_1 - timezonefinder=6.2.0=py311he705e18_2 - - catalystcoop.ferc_xbrl_extractor=1.3.0=pyhd8ed1ab_1 + - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.9=pyhd8ed1ab_0 - - dagster-postgres=0.21.9=pyhd8ed1ab_0 + - dagster-graphql=1.5.10=pyhd8ed1ab_0 + - dagster-postgres=0.21.10=pyhd8ed1ab_0 - fiona=1.9.5=py311h809632c_1 - google-api-core=2.14.0=pyhd8ed1ab_0 - google-auth-oauthlib=1.1.0=pyhd8ed1ab_0 @@ -514,7 +514,7 @@ dependencies: - qtconsole-base=5.5.1=pyha770c72_0 - recordlinkage=0.16=pyhd8ed1ab_0 - tabulator=1.53.5=pyhd8ed1ab_0 - - dagster-webserver=1.5.9=pyhd8ed1ab_0 + - dagster-webserver=1.5.10=pyhd8ed1ab_0 - geopandas=0.14.1=pyhd8ed1ab_0 - google-cloud-core=2.3.3=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 f8f1a858ac..e28348c9e8 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: osx-arm64 -# input_hash: 4af60a188a5341a583519edb866207f4e68583e87831447441cb1088e6d9349a +# input_hash: c275fe8ff3012ad83a98252ba570f9b278f142720b73f42abfd4c4a1107f67e2 channels: - conda-forge @@ -8,7 +8,7 @@ channels: dependencies: - aws-c-common=0.9.8=h93a5062_0 - bzip2=1.0.8=h93a5062_5 - - c-ares=1.22.1=h93a5062_0 + - c-ares=1.23.0=h93a5062_0 - ca-certificates=2023.11.17=hf0a4a13_0 - font-ttf-dejavu-sans-mono=2.37=hab24e00_0 - font-ttf-inconsolata=3.000=h77eed37_0 @@ -152,7 +152,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_0 - crashtest=0.4.1=pyhd8ed1ab_0 - cycler=0.12.1=pyhd8ed1ab_0 - - dagster-pipes=1.5.9=pyhd8ed1ab_0 + - dagster-pipes=1.5.10=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - debugpy=1.8.0=py311ha891d26_1 - decorator=5.1.1=pyhd8ed1ab_0 @@ -222,7 +222,7 @@ dependencies: - psutil=5.9.5=py311heffc1b2_1 - ptyprocess=0.7.0=pyhd3deb0d_0 - pure_eval=0.2.2=pyhd8ed1ab_0 - - pyasn1=0.5.0=pyhd8ed1ab_0 + - pyasn1=0.5.1=pyhd8ed1ab_0 - pycparser=2.21=pyhd8ed1ab_0 - pygments=2.17.2=pyhd8ed1ab_0 - pyjwt=2.8.0=pyhd8ed1ab_0 @@ -243,7 +243,7 @@ dependencies: - regex=2023.10.3=py311heffc1b2_0 - rfc3986=2.0.0=pyhd8ed1ab_0 - rfc3986-validator=0.1.1=pyh9f0ad1d_0 - - rpds-py=0.13.1=py311h94f323b_0 + - rpds-py=0.13.2=py311h94f323b_0 - rtree=1.1.0=py311hd698ff7_0 - ruamel.yaml.clib=0.2.7=py311heffc1b2_2 - ruff=0.1.6=py311h6fc163c_0 @@ -359,7 +359,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.31.1=pyhd8ed1ab_0 - restructuredtext_lint=1.4.0=pyhd8ed1ab_0 - rfc3339-validator=0.1.4=pyhd8ed1ab_0 - rsa=4.9=pyhd8ed1ab_0 @@ -381,7 +381,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.2=pyhd8ed1ab_0 + - botocore=1.33.5=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.5=py311h71175c2_0 @@ -395,7 +395,7 @@ dependencies: - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - httpcore=1.0.2=pyhd8ed1ab_0 - importlib_metadata=6.8.0=hd8ed1ab_0 - - jsonschema-specifications=2023.11.1=pyhd8ed1ab_0 + - jsonschema-specifications=2023.11.2=pyhd8ed1ab_0 - jupyter_core=5.5.0=py311h267d04e_0 - jupyter_server_terminals=0.4.4=pyhd8ed1ab_1 - kealib=1.5.2=h47b5e36_1 @@ -421,10 +421,10 @@ dependencies: - rich=13.7.0=pyhd8ed1ab_0 - sqlalchemy=2.0.23=py311h05b510d_0 - stack_data=0.6.2=pyhd8ed1ab_0 - - starlette=0.32.0.post1=pyhd8ed1ab_0 + - starlette=0.33.0=pyhd8ed1ab_0 - tiledb=2.16.3=he15c4da_3 - ukkonen=1.0.1=py311he4fd1f5_4 - - uvicorn=0.24.0=py311h267d04e_0 + - uvicorn=0.24.0.post1=py311h267d04e_0 - virtualenv=20.24.7=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h94f323b_0 - aiohttp=3.8.6=py311h05b510d_1 @@ -463,24 +463,24 @@ dependencies: - readthedocs-sphinx-ext=2.2.3=pyhd8ed1ab_0 - requests-toolbelt=0.10.1=pyhd8ed1ab_0 - responses=0.24.1=pyhd8ed1ab_0 - - s3transfer=0.8.0=pyhd8ed1ab_0 + - s3transfer=0.8.2=pyhd8ed1ab_0 - scipy=1.11.4=py311h2b215a9_0 - send2trash=1.8.2=pyhd1c38e8_0 - shapely=2.0.2=py311h0815064_1 - stevedore=5.1.0=pyhd8ed1ab_0 - typeguard=4.1.5=pyhd8ed1ab_1 - typer=0.9.0=pyhd8ed1ab_0 - - uvicorn-standard=0.24.0=ha1ab1f8_0 - - boto3=1.33.1=pyhd8ed1ab_0 + - uvicorn-standard=0.24.0.post1=ha1ab1f8_0 + - boto3=1.33.5=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - - dagster=1.5.9=pyhd8ed1ab_0 + - dagster=1.5.10=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=py311h32a4f3d_6 - geopandas-base=0.14.1=pyha770c72_0 - - google-auth=2.23.4=pyhca7485f_0 + - google-auth=2.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 - graphviz=9.0.0=h3face73_1 - ipykernel=6.26.0=pyh3cd1d5f_0 @@ -495,10 +495,10 @@ dependencies: - requests-oauthlib=1.3.1=pyhd8ed1ab_0 - scikit-learn=1.3.2=py311ha25ca4d_1 - timezonefinder=6.2.0=py311h05b510d_2 - - catalystcoop.ferc_xbrl_extractor=1.3.0=pyhd8ed1ab_1 + - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.9=pyhd8ed1ab_0 - - dagster-postgres=0.21.9=pyhd8ed1ab_0 + - dagster-graphql=1.5.10=pyhd8ed1ab_0 + - dagster-postgres=0.21.10=pyhd8ed1ab_0 - fiona=1.9.5=py311h4760b73_1 - google-api-core=2.14.0=pyhd8ed1ab_0 - google-auth-oauthlib=1.1.0=pyhd8ed1ab_0 @@ -514,7 +514,7 @@ dependencies: - qtconsole-base=5.5.1=pyha770c72_0 - recordlinkage=0.16=pyhd8ed1ab_0 - tabulator=1.53.5=pyhd8ed1ab_0 - - dagster-webserver=1.5.9=pyhd8ed1ab_0 + - dagster-webserver=1.5.10=pyhd8ed1ab_0 - geopandas=0.14.1=pyhd8ed1ab_0 - google-cloud-core=2.3.3=pyhd8ed1ab_0 - libarrow-dataset=14.0.1=had9dd58_3_cpu From 9f2ad16f5af99d0b1a395f747c6c0eb3a59cf562 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Fri, 1 Dec 2023 13:37:13 -0700 Subject: [PATCH 59/80] Checksum partial coverage files before merging. --- .github/workflows/pytest.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 09f8f3bc45..6166be782e 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -193,8 +193,11 @@ jobs: run: | coverage run ${{ env.COVERAGE_OPTIONS }} \ -m pytest -n auto --live-dbs test/integration + - name: Checksum coverage files + run: ls .coverage* | xargs md5sum | sort - name: Generate coverage run: | + coverage --version coverage combine --append coverage xml coverage report From c039a0adc14b460e97e02a5e14b425d79b02e012 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Fri, 1 Dec 2023 14:16:16 -0700 Subject: [PATCH 60/80] Explicitly include src and test as source directories. --- .coveragerc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.coveragerc b/.coveragerc index 6bf97eb778..5e4e78e3b8 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,4 +1,7 @@ [run] +source = + src + test omit = *__main__.py *__init__.py From b0105f306907e78f52b4247afe40b98edd728fbf Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Fri, 1 Dec 2023 20:07:09 -0700 Subject: [PATCH 61/80] Use src/pudl as a source definition. --- .coveragerc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.coveragerc b/.coveragerc index 5e4e78e3b8..ffc65bf9be 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,7 +1,5 @@ [run] -source = - src - test +source = src/pudl/ omit = *__main__.py *__init__.py From dd6d357f2a01a5a382d177a71b3c0ec8a9b7828a Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Sun, 3 Dec 2023 10:08:18 -0700 Subject: [PATCH 62/80] Use --source=src/pudl when running coverage Just to be sure that this gets through. --- .coveragerc | 2 +- .github/workflows/pytest.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.coveragerc b/.coveragerc index ffc65bf9be..40a1d24fba 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,5 +1,5 @@ [run] -source = src/pudl/ +source = src/pudl omit = *__main__.py *__init__.py diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 6166be782e..32fc46d360 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -18,7 +18,7 @@ env: DAGSTER_HOME: /home/runner/pudl-work/dagster_home/ ETL_CONFIG: src/pudl/package_data/settings/etl_fast.yml ETL_COMMANDLINE_OPTIONS: --gcs-cache-path=gs://zenodo-cache.catalyst.coop - COVERAGE_OPTIONS: --concurrency=multiprocessing + COVERAGE_OPTIONS: --concurrency=multiprocessing --source=src/pudl jobs: ci-docs: From 908e83c11506379b246de06436440ba8ae78450c Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Sun, 3 Dec 2023 18:35:37 -0700 Subject: [PATCH 63/80] Remove option that can't be set via cmdline. --- .github/workflows/pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 32fc46d360..6166be782e 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -18,7 +18,7 @@ env: DAGSTER_HOME: /home/runner/pudl-work/dagster_home/ ETL_CONFIG: src/pudl/package_data/settings/etl_fast.yml ETL_COMMANDLINE_OPTIONS: --gcs-cache-path=gs://zenodo-cache.catalyst.coop - COVERAGE_OPTIONS: --concurrency=multiprocessing --source=src/pudl + COVERAGE_OPTIONS: --concurrency=multiprocessing jobs: ci-docs: From bf779216b20e16bc4995d415e1f4732778325996 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Sun, 10 Dec 2023 12:22:24 -0600 Subject: [PATCH 64/80] Use right parameters for coverage.run tool. --- pyproject.toml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 86a02af819..c9c00709d9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -302,10 +302,26 @@ curl = ">=8.4.0" [tool.coverage.run] # See note above on need to specify separate sources for pytest-coverage and coverage. source = ["src/pudl/", "test/integration/", "test/unit/"] +include = [ + "src/pudl/**", + "test/integration/**", + "test/unit/**", + "*/site-packages/pudl/**", +] omit = [ # Never hit by integration tests: "src/pudl/validate.py", ] +concurrency = ["multiprocessing"] + +[tool.coverage.paths] +# When running pudl tools installed with pip, the sources are imported +# from package-data/pudl directory. The following maps this to raw +# source files. +pudl_sources = [ + "src/pudl", + "*/site-packages/pudl/", +] [tool.coverage.report] precision = 1 From a9f605344d685c3e763cbc4237398e078e76b7cc Mon Sep 17 00:00:00 2001 From: rousik Date: Sun, 10 Dec 2023 18:25:17 +0000 Subject: [PATCH 65/80] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 56 +- environments/conda-lock.yml | 936 +++++++++++++------------- environments/conda-osx-64.lock.yml | 64 +- environments/conda-osx-arm64.lock.yml | 64 +- 4 files changed, 558 insertions(+), 562 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index b3a384bb41..5d67d564c7 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -43,7 +43,7 @@ dependencies: - libbrotlicommon=1.1.0=hd590300_1 - libcrc32c=1.1.2=h9c3ff4c_0 - libdeflate=1.19=hd590300_0 - - libev=4.33=h516909a_1 + - libev=4.33=hd590300_2 - libexpat=2.5.0=hcb278e6_1 - libffi=3.4.2=h7f98852_5 - libgfortran5=13.2.0=ha4646dd_3 @@ -62,7 +62,7 @@ dependencies: - lzo=2.10=h516909a_1000 - ncurses=6.4=h59595ed_2 - nspr=4.35=h27087fc_0 - - openssl=3.1.4=hd590300_0 + - openssl=3.2.0=hd590300_1 - pixman=0.42.2=h59595ed_0 - pthread-stubs=0.4=h36c2ea0_1001 - rdma-core=49.0=hd3aeb46_1 @@ -92,7 +92,7 @@ dependencies: - libgfortran-ng=13.2.0=h69a702a_3 - libkml=1.3.0=h01aab08_1018 - libllvm14=14.0.6=hcd5def8_4 - - libnghttp2=1.58.0=h47da74e_0 + - libnghttp2=1.58.0=h47da74e_1 - libpng=1.6.39=h753d276_0 - libprotobuf=4.24.4=hf27288f_0 - libre2-11=2023.06.02=h7a70373_0 @@ -160,7 +160,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_0 - crashtest=0.4.1=pyhd8ed1ab_0 - cycler=0.12.1=pyhd8ed1ab_0 - - dagster-pipes=1.5.10=pyhd8ed1ab_0 + - dagster-pipes=1.5.11=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - dbus=1.13.6=h5008d03_3 - debugpy=1.8.0=py311hb755f60_1 @@ -181,7 +181,7 @@ dependencies: - fsspec=2023.12.1=pyhca7485f_0 - gdk-pixbuf=2.42.10=h829c605_4 - google-cloud-sdk=456.0.0=py311h38be061_0 - - greenlet=3.0.1=py311hb755f60_0 + - greenlet=3.0.2=py311hb755f60_0 - gts=0.7.6=h977cf35_4 - hpack=4.0.0=pyh9f0ad1d_0 - httptools=0.6.1=py311h459d7ec_0 @@ -202,9 +202,9 @@ dependencies: - kiwisolver=1.4.5=py311h9547e67_1 - lcms2=2.16=hb7c19ff_0 - libblas=3.9.0=20_linux64_openblas - - libcurl=8.4.0=hca28451_0 + - libcurl=8.5.0=hca28451_0 - libgrpc=1.59.2=hd6c4280_0 - - libpq=16.1=hfc447b1_0 + - libpq=16.1=h33b98f1_7 - libwebp=1.3.2=h658648e_1 - llvmlite=0.41.1=py311ha6695c7_0 - locket=1.0.0=pyhd8ed1ab_0 @@ -233,7 +233,7 @@ dependencies: - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_1 - platformdirs=4.1.0=pyhd8ed1ab_0 - pluggy=1.3.0=pyhd8ed1ab_0 - - prettier=3.1.0=h31abb78_0 + - prettier=3.1.1=h31abb78_0 - prometheus_client=0.19.0=pyhd8ed1ab_0 - psutil=5.9.5=py311h459d7ec_1 - ptyprocess=0.7.0=pyhd3deb0d_0 @@ -287,7 +287,7 @@ dependencies: - traitlets=5.14.0=pyhd8ed1ab_0 - types-python-dateutil=2.8.19.14=pyhd8ed1ab_0 - types-pyyaml=6.0.12.12=pyhd8ed1ab_0 - - typing_extensions=4.8.0=pyha770c72_0 + - typing_extensions=4.9.0=pyha770c72_0 - typing_utils=0.1.0=pyhd8ed1ab_0 - unicodecsv=0.14.1=pyhd8ed1ab_2 - uri-template=1.3.0=pyhd8ed1ab_0 @@ -321,7 +321,7 @@ dependencies: - cached-property=1.5.2=hd8ed1ab_1 - cairo=1.18.0=h3faef2a_0 - cffi=1.16.0=py311hb3a22ac_0 - - cfitsio=4.3.0=hbdc6101_0 + - cfitsio=4.3.1=hbdc6101_0 - click-default-group=1.2.4=pyhd8ed1ab_0 - click-default-group-wheel=1.2.2=pyhd8ed1ab_0 - click-plugins=1.1.1=py_0 @@ -330,16 +330,16 @@ dependencies: - coloredlogs=14.0=pyhd8ed1ab_3 - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311h459d7ec_0 - - curl=8.4.0=hca28451_0 + - curl=8.5.0=hca28451_0 - fonttools=4.46.0=py311h459d7ec_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 - grpcio=1.59.2=py311ha6695c7_0 - h11=0.14.0=pyhd8ed1ab_0 - h2=4.1.0=pyhd8ed1ab_0 - - hdf5=1.14.2=nompi_h4f84152_100 + - hdf5=1.14.3=nompi_h4f84152_100 - html5lib=1.1=pyh9f0ad1d_0 - - hypothesis=6.91.0=pyha770c72_0 + - hypothesis=6.92.0=pyha770c72_0 - importlib-metadata=7.0.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 @@ -365,9 +365,9 @@ dependencies: - partd=1.4.1=pyhd8ed1ab_0 - pexpect=4.8.0=pyh1a96a4e_2 - pillow=10.1.0=py311ha6c5da5_0 - - pint=0.22=pyhd8ed1ab_1 + - pint=0.23=pyhd8ed1ab_0 - pip=23.3.1=pyhd8ed1ab_0 - - postgresql=16.1=h8972f4a_0 + - postgresql=16.1=h8972f4a_7 - proj=9.3.0=h1d62c97_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h46cbc50_0 @@ -387,7 +387,7 @@ dependencies: - terminado=0.18.0=pyh0d859eb_0 - tinycss2=1.2.1=pyhd8ed1ab_0 - tqdm=4.66.1=pyhd8ed1ab_0 - - typing-extensions=4.8.0=hd8ed1ab_0 + - typing-extensions=4.9.0=hd8ed1ab_0 - typing_inspect=0.9.0=pyhd8ed1ab_0 - universal_pathlib=0.1.4=pyhd8ed1ab_0 - urllib3=1.26.18=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.9=pyhd8ed1ab_0 + - botocore=1.33.11=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.7=py311hcb13ee4_1 @@ -426,7 +426,7 @@ dependencies: - numpy=1.26.2=py311h64a7726_0 - pbr=6.0.0=pyhd8ed1ab_0 - pendulum=2.1.2=py311h459d7ec_6 - - poppler=23.11.0=h590f24d_0 + - poppler=23.12.0=h590f24d_0 - prompt_toolkit=3.0.41=hd8ed1ab_0 - psycopg2-binary=2.9.9=pyhd8ed1ab_0 - pybtex=0.24.0=pyhd8ed1ab_2 @@ -468,11 +468,11 @@ dependencies: - isoduration=20.11.0=pyhd8ed1ab_0 - jsonschema=4.20.0=pyhd8ed1ab_0 - jupyter_client=8.6.0=pyhd8ed1ab_0 - - libgdal=3.8.0=he7dcfe9_6 + - libgdal=3.8.1=hcae7082_1 - numba=0.58.1=py311h96b013e_0 - numexpr=2.8.7=py311h039bad6_104 - oauthlib=3.2.2=pyhd8ed1ab_0 - - pandas=2.1.3=py311h320fe9a_0 + - pandas=2.1.4=py311h320fe9a_0 - pango=1.50.14=ha41ecd1_2 - pybtex-docutils=1.0.3=py311h38be061_1 - pydantic=2.5.2=pyhd8ed1ab_0 @@ -489,16 +489,16 @@ 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.9=pyhd8ed1ab_0 + - boto3=1.33.11=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - - dagster=1.5.10=pyhd8ed1ab_0 + - dagster=1.5.11=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_6 + - gdal=3.8.1=py311h815a124_1 - geopandas-base=0.14.1=pyha770c72_0 - - google-auth=2.25.1=pyhca7485f_0 + - google-auth=2.25.2=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 - gtk2=2.24.33=h90689f9_2 - ipykernel=6.26.0=pyhf8b6a83_0 @@ -509,15 +509,15 @@ dependencies: - matplotlib-base=3.8.2=py311h54ef318_0 - nbformat=5.9.2=pyhd8ed1ab_0 - pandera-core=0.17.2=pyhd8ed1ab_1 - - pre-commit=3.5.0=pyha770c72_0 + - pre-commit=3.6.0=pyha770c72_0 - pydantic-settings=2.1.0=pyhd8ed1ab_1 - requests-oauthlib=1.3.1=pyhd8ed1ab_0 - scikit-learn=1.3.2=py311hc009520_2 - 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.10=pyhd8ed1ab_0 - - dagster-postgres=0.21.10=pyhd8ed1ab_0 + - dagster-graphql=1.5.11=pyhd8ed1ab_0 + - dagster-postgres=0.21.11=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.10=pyhd8ed1ab_0 + - dagster-webserver=1.5.11=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 485dd1c1da..3584f3f1ac 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -1914,52 +1914,52 @@ package: category: main optional: false - name: boto3 - version: 1.33.9 + version: 1.33.11 manager: conda platform: linux-64 dependencies: - botocore: ">=1.33.9,<1.34.0" + botocore: ">=1.33.11,<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.9-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.11-pyhd8ed1ab_0.conda hash: - md5: 0bc87faa4f6ff6321c4cef9b57e82041 - sha256: 685c90c40889cabc9bd03e67bd066546d019ba13667814d6b78352afe5dd751f + md5: 5bd2b183cccabe53846acc0bc36a701a + sha256: 9b30f449a8eb6e1e4a2b9ce8cf87d0348a92cad1a0df6819f458376dd2f2424d category: main optional: false - name: boto3 - version: 1.33.9 + version: 1.33.11 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.9,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.9-pyhd8ed1ab_0.conda + botocore: ">=1.33.11,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.11-pyhd8ed1ab_0.conda hash: - md5: 0bc87faa4f6ff6321c4cef9b57e82041 - sha256: 685c90c40889cabc9bd03e67bd066546d019ba13667814d6b78352afe5dd751f + md5: 5bd2b183cccabe53846acc0bc36a701a + sha256: 9b30f449a8eb6e1e4a2b9ce8cf87d0348a92cad1a0df6819f458376dd2f2424d category: main optional: false - name: boto3 - version: 1.33.9 + version: 1.33.11 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.9,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.9-pyhd8ed1ab_0.conda + botocore: ">=1.33.11,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.11-pyhd8ed1ab_0.conda hash: - md5: 0bc87faa4f6ff6321c4cef9b57e82041 - sha256: 685c90c40889cabc9bd03e67bd066546d019ba13667814d6b78352afe5dd751f + md5: 5bd2b183cccabe53846acc0bc36a701a + sha256: 9b30f449a8eb6e1e4a2b9ce8cf87d0348a92cad1a0df6819f458376dd2f2424d category: main optional: false - name: botocore - version: 1.33.9 + version: 1.33.11 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.9-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.11-pyhd8ed1ab_0.conda hash: - md5: 66b5f9da695d491e2df00c0045f073a3 - sha256: 7658e63b78ae37bb7e2047232a7f6d0d851e3a57231beeb32ea21a2da002e26b + md5: 096f907152d65c6f5ba9d437e27a4074 + sha256: b3ddf4459fa887fc76d1a97eaa9da7a31bd84838bd35cbda72ff54949971dc8a category: main optional: false - name: botocore - version: 1.33.9 + version: 1.33.11 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.9-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.11-pyhd8ed1ab_0.conda hash: - md5: 66b5f9da695d491e2df00c0045f073a3 - sha256: 7658e63b78ae37bb7e2047232a7f6d0d851e3a57231beeb32ea21a2da002e26b + md5: 096f907152d65c6f5ba9d437e27a4074 + sha256: b3ddf4459fa887fc76d1a97eaa9da7a31bd84838bd35cbda72ff54949971dc8a category: main optional: false - name: botocore - version: 1.33.9 + version: 1.33.11 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.9-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.11-pyhd8ed1ab_0.conda hash: - md5: 66b5f9da695d491e2df00c0045f073a3 - sha256: 7658e63b78ae37bb7e2047232a7f6d0d851e3a57231beeb32ea21a2da002e26b + md5: 096f907152d65c6f5ba9d437e27a4074 + sha256: b3ddf4459fa887fc76d1a97eaa9da7a31bd84838bd35cbda72ff54949971dc8a category: main optional: false - name: bottleneck @@ -2873,52 +2873,52 @@ package: category: main optional: false - name: cfitsio - version: 4.3.0 + version: 4.3.1 manager: conda platform: linux-64 dependencies: bzip2: ">=1.0.8,<2.0a0" - libcurl: ">=8.2.0,<9.0a0" + libcurl: ">=8.4.0,<9.0a0" libgcc-ng: ">=12" libgfortran-ng: "" libgfortran5: ">=12.3.0" libzlib: ">=1.2.13,<1.3.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/cfitsio-4.3.0-hbdc6101_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/cfitsio-4.3.1-hbdc6101_0.conda hash: - md5: 797554b8b7603011e8677884381fbcc5 - sha256: c74938f1ade9b8f37b9fa8cc98a5b9262b325506f41d7492ad1d00146e0f1d08 + md5: dcea02841b33a9c49f74ca9328de919a + sha256: b91003bff71351a0132c84d69fbb5afcfa90e57d83f76a180c6a5a0289099fb1 category: main optional: false - name: cfitsio - version: 4.3.0 + version: 4.3.1 manager: conda platform: osx-64 dependencies: bzip2: ">=1.0.8,<2.0a0" - libcurl: ">=8.2.0,<9.0a0" + libcurl: ">=8.4.0,<9.0a0" libgfortran: 5.* - libgfortran5: ">=12.2.0" + libgfortran5: ">=13.2.0" libzlib: ">=1.2.13,<1.3.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/cfitsio-4.3.0-h66f91ea_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/cfitsio-4.3.1-h60fb419_0.conda hash: - md5: f540472ad8a8ea2b39a4c6ca14ebc1b5 - sha256: 0246d80ce305609c7e810514d1aa578ef498a1f05fd2dba5fa46ea845e4e57b9 + md5: 03ab895afe3804b527c12193a9612cac + sha256: 5bd157478529ff4d05b8e8654de0580609177252eb11ecf5201b831effeeb2ec category: main optional: false - name: cfitsio - version: 4.3.0 + version: 4.3.1 manager: conda platform: osx-arm64 dependencies: bzip2: ">=1.0.8,<2.0a0" - libcurl: ">=8.2.0,<9.0a0" + libcurl: ">=8.4.0,<9.0a0" libgfortran: 5.* - libgfortran5: ">=12.3.0" + libgfortran5: ">=13.2.0" libzlib: ">=1.2.13,<1.3.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/cfitsio-4.3.0-hca87796_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/cfitsio-4.3.1-h808cd33_0.conda hash: - md5: a5a1019a6405052124e97999a5204a74 - sha256: 5d03f8d484d29f8d3bdd64afe22ed29d75c639834b40382f8a520f96a7af27c4 + md5: 22b61b2ad129db82da2eee76710f7551 + sha256: 9395bd24ef552ac6063e2d6a6fc57e5c7067a74b8d8ee3f06d8389baffacf016 category: main optional: false - name: chardet @@ -3704,55 +3704,55 @@ package: category: main optional: false - name: curl - version: 8.4.0 + version: 8.5.0 manager: conda platform: linux-64 dependencies: krb5: ">=1.21.2,<1.22.0a0" - libcurl: 8.4.0 + libcurl: 8.5.0 libgcc-ng: ">=12" libssh2: ">=1.11.0,<2.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.1.3,<4.0a0" + openssl: ">=3.2.0,<4.0a0" zstd: ">=1.5.5,<1.6.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/curl-8.4.0-hca28451_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/curl-8.5.0-hca28451_0.conda hash: - md5: 2bcf7689cae931dd35d9a45626f49fce - sha256: 373c50b5b668cf39a71d17a42a96144d5efc1e62e7d81c1dd830e2493cefc8cc + md5: e5e83fb15e752dbc8f54c4ac7da7d0f1 + sha256: febf098d6ca901b589d02c58eedcf5cb77d8fa4bfe35a52109f5909980b426db category: main optional: false - name: curl - version: 8.4.0 + version: 8.5.0 manager: conda platform: osx-64 dependencies: krb5: ">=1.21.2,<1.22.0a0" - libcurl: 8.4.0 + libcurl: 8.5.0 libssh2: ">=1.11.0,<2.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.1.3,<4.0a0" + openssl: ">=3.2.0,<4.0a0" zstd: ">=1.5.5,<1.6.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/curl-8.4.0-h726d00d_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/curl-8.5.0-h726d00d_0.conda hash: - md5: e1de44cac6e7774dd2c1e074f5d637a9 - sha256: 32cb23c91dd4cd88d3e6c7adb38ea3d1a1e5da79c63a20ec27d3d0924fcf644c + md5: a4440b9488f87d4da98c1a4cb121931a + sha256: f9e59c964945f5526cec0beb98e9983cee40da2a1e189f174af3da25a7c38c09 category: main optional: false - name: curl - version: 8.4.0 + version: 8.5.0 manager: conda platform: osx-arm64 dependencies: krb5: ">=1.21.2,<1.22.0a0" - libcurl: 8.4.0 + libcurl: 8.5.0 libssh2: ">=1.11.0,<2.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.1.3,<4.0a0" + openssl: ">=3.2.0,<4.0a0" zstd: ">=1.5.5,<1.6.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/curl-8.4.0-h2d989ff_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/curl-8.5.0-h2d989ff_0.conda hash: - md5: ae975c2ea5334bd8a8ddecb5013a30c6 - sha256: d0fa5d1a7a6d0e9dcf930db1e4a750991244567ea5e09a15a00c163a52113465 + md5: e69501791fc0552a668adf28344bb2b1 + sha256: b74a05b0e0f606e8fe6def4bec62cdcc9ae4c08152e0b298252ae033019432d5 category: main optional: false - name: cycler @@ -3792,7 +3792,7 @@ package: category: main optional: false - name: dagster - version: 1.5.10 + version: 1.5.11 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.10,<1.5.11.0a0" + dagster-pipes: ">=1.5.11,<1.5.12.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.10-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.11-pyhd8ed1ab_0.conda hash: - md5: bcf42b675edb2999669116bc3b1ed789 - sha256: dcee8473cbd1823005285f5fc82fbb16d9d1b2b46bcdf8371ee4fe2fdb0ad50c + md5: 5c2edce540b4ee809fc191d87325d6b0 + sha256: 73d8ad12f3e280ebec2ae5357ec6b08e19e8f6df63e7be21b4d90db406329844 category: main optional: false - name: dagster - version: 1.5.10 + version: 1.5.11 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.10,<1.5.11.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.10-pyhd8ed1ab_0.conda + dagster-pipes: ">=1.5.11,<1.5.12.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.11-pyhd8ed1ab_0.conda hash: - md5: bcf42b675edb2999669116bc3b1ed789 - sha256: dcee8473cbd1823005285f5fc82fbb16d9d1b2b46bcdf8371ee4fe2fdb0ad50c + md5: 5c2edce540b4ee809fc191d87325d6b0 + sha256: 73d8ad12f3e280ebec2ae5357ec6b08e19e8f6df63e7be21b4d90db406329844 category: main optional: false - name: dagster - version: 1.5.10 + version: 1.5.11 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.10,<1.5.11.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.10-pyhd8ed1ab_0.conda + dagster-pipes: ">=1.5.11,<1.5.12.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.11-pyhd8ed1ab_0.conda hash: - md5: bcf42b675edb2999669116bc3b1ed789 - sha256: dcee8473cbd1823005285f5fc82fbb16d9d1b2b46bcdf8371ee4fe2fdb0ad50c + md5: 5c2edce540b4ee809fc191d87325d6b0 + sha256: 73d8ad12f3e280ebec2ae5357ec6b08e19e8f6df63e7be21b4d90db406329844 category: main optional: false - name: dagster-graphql - version: 1.5.10 + version: 1.5.11 manager: conda platform: linux-64 dependencies: - dagster: ">=1.5.10,<1.5.11.0a0" + dagster: ">=1.5.11,<1.5.12.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.10-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.11-pyhd8ed1ab_0.conda hash: - md5: fd3569582db65a0c88fbc7d1bb803853 - sha256: a142f082da2b7905713b09e0ad19eef971a5d4f66063ba7a2b19247e3932e129 + md5: bcecd97c7835c5057b220b1fdf52412b + sha256: a968aee0eec0587555f827b584af484149ed235a331222ad10c69f92c80623de category: dev optional: true - name: dagster-graphql - version: 1.5.10 + version: 1.5.11 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.10,<1.5.11.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.10-pyhd8ed1ab_0.conda + dagster: ">=1.5.11,<1.5.12.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.11-pyhd8ed1ab_0.conda hash: - md5: fd3569582db65a0c88fbc7d1bb803853 - sha256: a142f082da2b7905713b09e0ad19eef971a5d4f66063ba7a2b19247e3932e129 + md5: bcecd97c7835c5057b220b1fdf52412b + sha256: a968aee0eec0587555f827b584af484149ed235a331222ad10c69f92c80623de category: dev optional: true - name: dagster-graphql - version: 1.5.10 + version: 1.5.11 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.10,<1.5.11.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.10-pyhd8ed1ab_0.conda + dagster: ">=1.5.11,<1.5.12.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.11-pyhd8ed1ab_0.conda hash: - md5: fd3569582db65a0c88fbc7d1bb803853 - sha256: a142f082da2b7905713b09e0ad19eef971a5d4f66063ba7a2b19247e3932e129 + md5: bcecd97c7835c5057b220b1fdf52412b + sha256: a968aee0eec0587555f827b584af484149ed235a331222ad10c69f92c80623de category: dev optional: true - name: dagster-pipes - version: 1.5.10 + version: 1.5.11 manager: conda platform: linux-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-pipes-1.5.10-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-pipes-1.5.11-pyhd8ed1ab_0.conda hash: - md5: 69600c68efc23fb84c05c2e9c1c05947 - sha256: a98a8b2501af4bc112d5b2f5e3edea6c22a084651cc720786c405877b8507630 + md5: 521cde2b4e9f5919f1c10384f8050874 + sha256: 84b0f25af328c185f0bb86fbe2a49f2cd2917ecd6c3413881a54b2a92c6a63d5 category: main optional: false - name: dagster-pipes - version: 1.5.10 + version: 1.5.11 manager: conda platform: osx-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-pipes-1.5.10-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-pipes-1.5.11-pyhd8ed1ab_0.conda hash: - md5: 69600c68efc23fb84c05c2e9c1c05947 - sha256: a98a8b2501af4bc112d5b2f5e3edea6c22a084651cc720786c405877b8507630 + md5: 521cde2b4e9f5919f1c10384f8050874 + sha256: 84b0f25af328c185f0bb86fbe2a49f2cd2917ecd6c3413881a54b2a92c6a63d5 category: main optional: false - name: dagster-pipes - version: 1.5.10 + version: 1.5.11 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-pipes-1.5.10-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-pipes-1.5.11-pyhd8ed1ab_0.conda hash: - md5: 69600c68efc23fb84c05c2e9c1c05947 - sha256: a98a8b2501af4bc112d5b2f5e3edea6c22a084651cc720786c405877b8507630 + md5: 521cde2b4e9f5919f1c10384f8050874 + sha256: 84b0f25af328c185f0bb86fbe2a49f2cd2917ecd6c3413881a54b2a92c6a63d5 category: main optional: false - name: dagster-postgres - version: 0.21.10 + version: 0.21.11 manager: conda platform: linux-64 dependencies: - dagster: 1.5.10.* + dagster: 1.5.11.* psycopg2-binary: "" python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.10-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.11-pyhd8ed1ab_0.conda hash: - md5: ec155b3a7172590ccbc89f461427b5aa - sha256: 4eb986655ef547d4dc72cd34b60687c9c3c390806493c15187c4d26d89d58fc0 + md5: de15ce0dd3e33040b34c29fe8c0efafd + sha256: 960e055be62adfd094257eadb0a23eacc9cce3f1b540deddec9b6a498e3ece85 category: main optional: false - name: dagster-postgres - version: 0.21.10 + version: 0.21.11 manager: conda platform: osx-64 dependencies: psycopg2-binary: "" python: ">=3.8" - dagster: 1.5.10.* - url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.10-pyhd8ed1ab_0.conda + dagster: 1.5.11.* + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.11-pyhd8ed1ab_0.conda hash: - md5: ec155b3a7172590ccbc89f461427b5aa - sha256: 4eb986655ef547d4dc72cd34b60687c9c3c390806493c15187c4d26d89d58fc0 + md5: de15ce0dd3e33040b34c29fe8c0efafd + sha256: 960e055be62adfd094257eadb0a23eacc9cce3f1b540deddec9b6a498e3ece85 category: main optional: false - name: dagster-postgres - version: 0.21.10 + version: 0.21.11 manager: conda platform: osx-arm64 dependencies: psycopg2-binary: "" python: ">=3.8" - dagster: 1.5.10.* - url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.10-pyhd8ed1ab_0.conda + dagster: 1.5.11.* + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.11-pyhd8ed1ab_0.conda hash: - md5: ec155b3a7172590ccbc89f461427b5aa - sha256: 4eb986655ef547d4dc72cd34b60687c9c3c390806493c15187c4d26d89d58fc0 + md5: de15ce0dd3e33040b34c29fe8c0efafd + sha256: 960e055be62adfd094257eadb0a23eacc9cce3f1b540deddec9b6a498e3ece85 category: main optional: false - name: dagster-webserver - version: 1.5.10 + version: 1.5.11 manager: conda platform: linux-64 dependencies: click: ">=7.0,<9.0" - dagster: ">=1.5.10,<1.5.11.0a0" - dagster-graphql: ">=1.5.10,<1.5.11.0a0" + dagster: ">=1.5.11,<1.5.12.0a0" + dagster-graphql: ">=1.5.11,<1.5.12.0a0" python: ">=3.8" starlette: "" uvicorn-standard: "" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-webserver-1.5.10-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-webserver-1.5.11-pyhd8ed1ab_0.conda hash: - md5: 6161623733c03c21098dce0af904ea6b - sha256: 975173f6a39f40d5fa505354007200741689714bb1eaf1cba8e52fab1a2bfc88 + md5: 26fc6d8624aa44ad7a27ae376c8c8126 + sha256: d2a0d9a100c353b3489d72832ed2541b128ff548a8b314e00d1259c07795be17 category: dev optional: true - name: dagster-webserver - version: 1.5.10 + version: 1.5.11 manager: conda platform: osx-64 dependencies: @@ -4069,16 +4069,16 @@ package: uvicorn-standard: "" python: ">=3.8" click: ">=7.0,<9.0" - dagster: ">=1.5.10,<1.5.11.0a0" - dagster-graphql: ">=1.5.10,<1.5.11.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-webserver-1.5.10-pyhd8ed1ab_0.conda + 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 hash: - md5: 6161623733c03c21098dce0af904ea6b - sha256: 975173f6a39f40d5fa505354007200741689714bb1eaf1cba8e52fab1a2bfc88 + md5: 26fc6d8624aa44ad7a27ae376c8c8126 + sha256: d2a0d9a100c353b3489d72832ed2541b128ff548a8b314e00d1259c07795be17 category: dev optional: true - name: dagster-webserver - version: 1.5.10 + version: 1.5.11 manager: conda platform: osx-arm64 dependencies: @@ -4086,12 +4086,12 @@ package: uvicorn-standard: "" python: ">=3.8" click: ">=7.0,<9.0" - dagster: ">=1.5.10,<1.5.11.0a0" - dagster-graphql: ">=1.5.10,<1.5.11.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/dagster-webserver-1.5.10-pyhd8ed1ab_0.conda + 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 hash: - md5: 6161623733c03c21098dce0af904ea6b - sha256: 975173f6a39f40d5fa505354007200741689714bb1eaf1cba8e52fab1a2bfc88 + md5: 26fc6d8624aa44ad7a27ae376c8c8126 + sha256: d2a0d9a100c353b3489d72832ed2541b128ff548a8b314e00d1259c07795be17 category: dev optional: true - name: dask-core @@ -5873,63 +5873,63 @@ package: category: main optional: false - name: gdal - version: 3.8.0 + version: 3.8.1 manager: conda platform: linux-64 dependencies: hdf5: ">=1.14.2,<1.14.4.0a0" libgcc-ng: ">=12" - libgdal: 3.8.0 + libgdal: 3.8.1 libstdcxx-ng: ">=12" libxml2: ">=2.11.6,<2.12.0a0" numpy: ">=1.23.5,<2.0a0" - openssl: ">=3.1.4,<4.0a0" + openssl: ">=3.2.0,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/gdal-3.8.0-py311h815a124_6.conda + url: https://conda.anaconda.org/conda-forge/linux-64/gdal-3.8.1-py311h815a124_1.conda hash: - md5: a20379b7539caea4fd3ba6628d862138 - sha256: 7aab0e96f76d15a35b78704d13523f234a47cd8c653d8085c1219a8d7d45ef22 + md5: 6e9577466e5f1d18bd659746a5d948b7 + sha256: 6f1de976174089589b1ff7a6dd0d627f107f051a15cb046cb4703c0fc18480e3 category: main optional: false - name: gdal - version: 3.8.0 + version: 3.8.1 manager: conda platform: osx-64 dependencies: __osx: ">=10.9" hdf5: ">=1.14.2,<1.14.4.0a0" libcxx: ">=16.0.6" - libgdal: 3.8.0 + libgdal: 3.8.1 libxml2: ">=2.11.6,<2.12.0a0" numpy: ">=1.23.5,<2.0a0" - openssl: ">=3.1.4,<4.0a0" + openssl: ">=3.2.0,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/gdal-3.8.0-py311h5646c56_6.conda + url: https://conda.anaconda.org/conda-forge/osx-64/gdal-3.8.1-py311h5646c56_1.conda hash: - md5: 1cb3c8b063c0aca152dd7d7045e8ec2e - sha256: b9428ade4519d84f5ef68174f403cac65ee8d44ba10992809ea54ac56508457b + md5: 040c7cfdae3033444b9f193f9ac7dda2 + sha256: dc12757089d571dc33a5be6428bb50374fcfe2839230d8bc2b6aecf019545e64 category: main optional: false - name: gdal - version: 3.8.0 + version: 3.8.1 manager: conda platform: osx-arm64 dependencies: __osx: ">=10.9" hdf5: ">=1.14.2,<1.14.4.0a0" libcxx: ">=16.0.6" - libgdal: 3.8.0 + libgdal: 3.8.1 libxml2: ">=2.11.6,<2.12.0a0" numpy: ">=1.23.5,<2.0a0" - openssl: ">=3.1.4,<4.0a0" + openssl: ">=3.2.0,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/gdal-3.8.0-py311h32a4f3d_6.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/gdal-3.8.1-py311h32a4f3d_1.conda hash: - md5: b266b8795152cc1dfc9296ac95cb60ad - sha256: f8d113f50e12756c4b6640a8f70b2bccc54cc2e1a29b11f5e3cb3e4671d259be + md5: 22050ed6dfba916d82f470c4e5c820e9 + sha256: f6f8555e164a37371dc729b9aa0773e60716218ed706cd621b3f5cbfbe2ea51e category: main optional: false - name: gdk-pixbuf @@ -6467,7 +6467,7 @@ package: category: main optional: false - name: google-auth - version: 2.25.1 + version: 2.25.2 manager: conda platform: linux-64 dependencies: @@ -6480,14 +6480,14 @@ package: pyu2f: ">=0.1.5" requests: ">=2.20.0,<3.0.0" rsa: ">=3.1.4,<5" - url: https://conda.anaconda.org/conda-forge/noarch/google-auth-2.25.1-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/google-auth-2.25.2-pyhca7485f_0.conda hash: - md5: ea4120e492a1b82f298419e0f2210a1e - sha256: 4626124ab555cd8620ff9ff0cd4e1e2f8a161667c00c1571241f9fc722b0b8bd + md5: ef008fe13beb99a47cbe5a7a68a1f0ea + sha256: 928960978bfdb77a912db60659ec30ec7e04d1ec12ba12f38ac61134158320d0 category: main optional: false - name: google-auth - version: 2.25.1 + version: 2.25.2 manager: conda platform: osx-64 dependencies: @@ -6500,14 +6500,14 @@ package: cachetools: ">=2.0.0,<6.0" aiohttp: ">=3.6.2,<4.0.0" cryptography: ">=38.0.3" - url: https://conda.anaconda.org/conda-forge/noarch/google-auth-2.25.1-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/google-auth-2.25.2-pyhca7485f_0.conda hash: - md5: ea4120e492a1b82f298419e0f2210a1e - sha256: 4626124ab555cd8620ff9ff0cd4e1e2f8a161667c00c1571241f9fc722b0b8bd + md5: ef008fe13beb99a47cbe5a7a68a1f0ea + sha256: 928960978bfdb77a912db60659ec30ec7e04d1ec12ba12f38ac61134158320d0 category: main optional: false - name: google-auth - version: 2.25.1 + version: 2.25.2 manager: conda platform: osx-arm64 dependencies: @@ -6520,10 +6520,10 @@ package: cachetools: ">=2.0.0,<6.0" aiohttp: ">=3.6.2,<4.0.0" cryptography: ">=38.0.3" - url: https://conda.anaconda.org/conda-forge/noarch/google-auth-2.25.1-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/google-auth-2.25.2-pyhca7485f_0.conda hash: - md5: ea4120e492a1b82f298419e0f2210a1e - sha256: 4626124ab555cd8620ff9ff0cd4e1e2f8a161667c00c1571241f9fc722b0b8bd + md5: ef008fe13beb99a47cbe5a7a68a1f0ea + sha256: 928960978bfdb77a912db60659ec30ec7e04d1ec12ba12f38ac61134158320d0 category: main optional: false - name: google-auth-oauthlib @@ -7168,7 +7168,7 @@ package: category: dev optional: true - name: greenlet - version: 3.0.1 + version: 3.0.2 manager: conda platform: linux-64 dependencies: @@ -7176,14 +7176,14 @@ package: libstdcxx-ng: ">=12" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/greenlet-3.0.1-py311hb755f60_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/greenlet-3.0.2-py311hb755f60_0.conda hash: - md5: 7c82abd17036c6ca0f02f2a8935c5572 - sha256: 8470a1c15889f4830df38966e29e3a7aa4473681b7b5997d916428c929544d74 + md5: 59bf81c0e43e96ff1ebb5140ccc135b5 + sha256: e11f4bf977c21d3c70bb772c57bb800319f1353a8f0bd947f7561e28eae8d808 category: main optional: false - name: greenlet - version: 3.0.1 + version: 3.0.2 manager: conda platform: osx-64 dependencies: @@ -7191,14 +7191,14 @@ package: libcxx: ">=16.0.6" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/greenlet-3.0.1-py311hd39e593_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/greenlet-3.0.2-py311hd39e593_0.conda hash: - md5: 447a2de59f80041e6f63c222d5a5e77f - sha256: 872e40b28dce3abf5d3df621a99247a79d3e642eaf1db284c8a43888e1c7f74b + md5: 6005605b11c7db35cd5d4d04e645ecd3 + sha256: 1120b061eb3216f3c2fd4db8a2150c5185742941c1a66c1e05a8bb26bfa9d026 category: main optional: false - name: greenlet - version: 3.0.1 + version: 3.0.2 manager: conda platform: osx-arm64 dependencies: @@ -7206,10 +7206,10 @@ package: libcxx: ">=16.0.6" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/greenlet-3.0.1-py311hbaf5611_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/greenlet-3.0.2-py311hbaf5611_0.conda hash: - md5: 9136cd518f65a952b2a37c80645ef610 - sha256: 6c8e2e5024ee26099d396a95a55c49ffe3eb8985c764ce875e95f01711f4c2a7 + md5: a2c6cc57bc11c771364d436fe6508c89 + sha256: 47ef5de059adf8ccfb99ef03e5e0337198c06c78c32bcafbf4432276dfac640b category: main optional: false - name: grpcio @@ -7667,58 +7667,60 @@ package: category: main optional: false - name: hdf5 - version: 1.14.2 + version: 1.14.3 manager: conda platform: linux-64 dependencies: - libaec: ">=1.0.6,<2.0a0" - libcurl: ">=8.2.1,<9.0a0" + libaec: ">=1.1.2,<2.0a0" + libcurl: ">=8.4.0,<9.0a0" libgcc-ng: ">=12" libgfortran-ng: "" libgfortran5: ">=12.3.0" libstdcxx-ng: ">=12" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.1.2,<4.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.14.2-nompi_h4f84152_100.conda + openssl: ">=3.2.0,<4.0a0" + url: https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.14.3-nompi_h4f84152_100.conda hash: - md5: 2de6a9bc8083b49f09b2f6eb28d3ba3c - sha256: f70f18291f912ba019cbb736bb87b6487021154733cd109147a6d9672790b6b8 + md5: d471a5c3abc984b662d9bae3bb7fd8a5 + sha256: b814f8f9598cc6e50127533ec256725183ba69db5fd8cf5443223627f19e3e59 category: main optional: false - name: hdf5 - version: 1.14.2 + version: 1.14.3 manager: conda platform: osx-64 dependencies: - libaec: ">=1.0.6,<2.0a0" - libcurl: ">=8.2.1,<9.0a0" - libcxx: ">=15.0.7" + __osx: ">=10.9" + libaec: ">=1.1.2,<2.0a0" + libcurl: ">=8.4.0,<9.0a0" + libcxx: ">=16.0.6" libgfortran: 5.* - libgfortran5: ">=12.3.0" + libgfortran5: ">=13.2.0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.1.2,<4.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/hdf5-1.14.2-nompi_hedada53_100.conda + openssl: ">=3.2.0,<4.0a0" + url: https://conda.anaconda.org/conda-forge/osx-64/hdf5-1.14.3-nompi_h691f4bf_100.conda hash: - md5: 2b1d4f355b60eb10c5cb435b9f0e664f - sha256: 08ab97d63ab4be60c92d3f5931effc565ae6ee0cd686eba81b9d20daf5f181ff + md5: 8e2ac4ae815a8c9743fe37d70f48f075 + sha256: 158dd2ab901659b47e8f7ee0ec1d9e45a1fedc4871391a44a1c8b9e8ba4c9c6b category: main optional: false - name: hdf5 - version: 1.14.2 + version: 1.14.3 manager: conda platform: osx-arm64 dependencies: - libaec: ">=1.0.6,<2.0a0" - libcurl: ">=8.2.1,<9.0a0" - libcxx: ">=15.0.7" + __osx: ">=10.9" + libaec: ">=1.1.2,<2.0a0" + libcurl: ">=8.4.0,<9.0a0" + libcxx: ">=16.0.6" libgfortran: 5.* - libgfortran5: ">=12.3.0" + libgfortran5: ">=13.2.0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.1.2,<4.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/hdf5-1.14.2-nompi_h3aba7b3_100.conda + openssl: ">=3.2.0,<4.0a0" + url: https://conda.anaconda.org/conda-forge/osx-arm64/hdf5-1.14.3-nompi_h5bb55e9_100.conda hash: - md5: 842c5b010b219058098ebfe5aa5891b9 - sha256: 2749910e21a7d1f88a81dc4709fc3565a4a3954eadb4409e7a5be1fc13a5b7ca + md5: 120fefd1da806c4d708ecdfe31263f0c + sha256: 22331a0ac71a4dd1868f05f8197c36815a41a9f2dcfd01b73ff0d87d9e0ea087 category: main optional: false - name: hpack @@ -8053,7 +8055,7 @@ package: category: main optional: false - name: hypothesis - version: 6.91.0 + version: 6.92.0 manager: conda platform: linux-64 dependencies: @@ -8064,14 +8066,14 @@ package: python: ">=3.8" setuptools: "" sortedcontainers: ">=2.1.0,<3.0.0" - url: https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.91.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.92.0-pyha770c72_0.conda hash: - md5: 06da22edc102acb39fcf951b4872f754 - sha256: 0dc4aab6a020d6ba5d569128155529137a48cc08d91928e1dbeb0bdcb4b27117 + md5: af99a4aaa4d7abf306f6799b13a1c018 + sha256: 1fec99d75cc291bb2582a2936fa8d8aab59d43a2cda88186ce50fb1d39d208b8 category: main optional: false - name: hypothesis - version: 6.91.0 + version: 6.92.0 manager: conda platform: osx-64 dependencies: @@ -8082,14 +8084,14 @@ package: sortedcontainers: ">=2.1.0,<3.0.0" backports.zoneinfo: ">=0.2.1" exceptiongroup: ">=1.0.0rc8" - url: https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.91.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.92.0-pyha770c72_0.conda hash: - md5: 06da22edc102acb39fcf951b4872f754 - sha256: 0dc4aab6a020d6ba5d569128155529137a48cc08d91928e1dbeb0bdcb4b27117 + md5: af99a4aaa4d7abf306f6799b13a1c018 + sha256: 1fec99d75cc291bb2582a2936fa8d8aab59d43a2cda88186ce50fb1d39d208b8 category: main optional: false - name: hypothesis - version: 6.91.0 + version: 6.92.0 manager: conda platform: osx-arm64 dependencies: @@ -8100,10 +8102,10 @@ package: sortedcontainers: ">=2.1.0,<3.0.0" backports.zoneinfo: ">=0.2.1" exceptiongroup: ">=1.0.0rc8" - url: https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.91.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/hypothesis-6.92.0-pyha770c72_0.conda hash: - md5: 06da22edc102acb39fcf951b4872f754 - sha256: 0dc4aab6a020d6ba5d569128155529137a48cc08d91928e1dbeb0bdcb4b27117 + md5: af99a4aaa4d7abf306f6799b13a1c018 + sha256: 1fec99d75cc291bb2582a2936fa8d8aab59d43a2cda88186ce50fb1d39d208b8 category: main optional: false - name: icu @@ -11127,55 +11129,55 @@ package: category: main optional: false - name: libcurl - version: 8.4.0 + version: 8.5.0 manager: conda platform: linux-64 dependencies: krb5: ">=1.21.2,<1.22.0a0" libgcc-ng: ">=12" - libnghttp2: ">=1.52.0,<2.0a0" + libnghttp2: ">=1.58.0,<2.0a0" libssh2: ">=1.11.0,<2.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.1.3,<4.0a0" + openssl: ">=3.2.0,<4.0a0" zstd: ">=1.5.5,<1.6.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/libcurl-8.4.0-hca28451_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libcurl-8.5.0-hca28451_0.conda hash: - md5: 1158ac1d2613b28685644931f11ee807 - sha256: 25f4b6a8827d7b17a66e0bd9b5d194bf9a9e4a46fb14e2ef472fdad4b39426a6 + md5: 7144d5a828e2cae218e0e3c98d8a0aeb + sha256: 00a6bea5ff90ca58eeb15ebc98e08ffb88bddaff27396bb62640064f59d29cf0 category: main optional: false - name: libcurl - version: 8.4.0 + version: 8.5.0 manager: conda platform: osx-64 dependencies: krb5: ">=1.21.2,<1.22.0a0" - libnghttp2: ">=1.52.0,<2.0a0" + libnghttp2: ">=1.58.0,<2.0a0" libssh2: ">=1.11.0,<2.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.1.3,<4.0a0" + openssl: ">=3.2.0,<4.0a0" zstd: ">=1.5.5,<1.6.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/libcurl-8.4.0-h726d00d_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/libcurl-8.5.0-h726d00d_0.conda hash: - md5: 2c17b4dedf0039736951471f493353bd - sha256: cd3400ecb42fc420acb18e2d836535c44ebd501ebeb4e0bf3830776e9b4ca650 + md5: 86d749e27fe00fa6b7d790a6feaa22a2 + sha256: 7ec7e026be90da0965dfa6b92bbc905c852c13b27f3f83c47156db66ed0668f0 category: main optional: false - name: libcurl - version: 8.4.0 + version: 8.5.0 manager: conda platform: osx-arm64 dependencies: krb5: ">=1.21.2,<1.22.0a0" - libnghttp2: ">=1.52.0,<2.0a0" + libnghttp2: ">=1.58.0,<2.0a0" libssh2: ">=1.11.0,<2.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.1.3,<4.0a0" + openssl: ">=3.2.0,<4.0a0" zstd: ">=1.5.5,<1.6.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/libcurl-8.4.0-h2d989ff_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/libcurl-8.5.0-h2d989ff_0.conda hash: - md5: afabb3372209028627ec03e206f4d967 - sha256: 5ca24ab030b1c56ce07921bf901ea99076e8b7e45586b4a04e5187cc67c87273 + md5: f1211ed00947a84e15a964a8f459f620 + sha256: f1c04be217aaf161ce3c99a8d618871295b5dc1eae2f7ff7b32078af50303f5b category: main optional: false - name: libcxx @@ -11276,11 +11278,11 @@ package: manager: conda platform: linux-64 dependencies: - libgcc-ng: ">=7.5.0" - url: https://conda.anaconda.org/conda-forge/linux-64/libev-4.33-h516909a_1.tar.bz2 + libgcc-ng: ">=12" + url: https://conda.anaconda.org/conda-forge/linux-64/libev-4.33-hd590300_2.conda hash: - md5: 6f8720dff19e17ce5d48cfe7f3d2f0a3 - sha256: 8c9635aa0ea28922877dc96358f9547f6a55fc7e2eb75a556b05f1725496baf9 + md5: 172bf1cd1ff8629f2b1179945ed45055 + sha256: 1cd6048169fa0395af74ed5d8f1716e22c19a81a8a36f934c110ca3ad4dd27b4 category: main optional: false - name: libev @@ -11288,10 +11290,10 @@ package: manager: conda platform: osx-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/osx-64/libev-4.33-haf1e3a3_1.tar.bz2 + url: https://conda.anaconda.org/conda-forge/osx-64/libev-4.33-h10d778d_2.conda hash: - md5: 79dc2be110b2a3d1e97ec21f691c50ad - sha256: c4154d424431898d84d6afb8b32e3ba749fe5d270d322bb0af74571a3cb09c6b + md5: 899db79329439820b7e8f8de41bca902 + sha256: 0d238488564a7992942aa165ff994eca540f687753b4f0998b29b4e4d030ff43 category: main optional: false - name: libev @@ -11299,10 +11301,10 @@ package: manager: conda platform: osx-arm64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/osx-arm64/libev-4.33-h642e427_1.tar.bz2 + url: https://conda.anaconda.org/conda-forge/osx-arm64/libev-4.33-h93a5062_2.conda hash: - md5: 566dbf70fe79eacdb3c3d3d195a27f55 - sha256: eb7325eb2e6bd4c291cb9682781b35b8c0f68cb72651c35a5b9dd22707ebd25c + md5: 36d33e440c31857372a72137f78bacf5 + sha256: 95cecb3902fbe0399c3a7e67a5bed1db813e5ab0e22f4023a5e0f722f2cc214f category: main optional: false - name: libevent @@ -11499,13 +11501,13 @@ package: category: dev optional: true - name: libgdal - version: 3.8.0 + version: 3.8.1 manager: conda platform: linux-64 dependencies: __glibc: ">=2.17,<3.0.a0" blosc: ">=1.21.5,<2.0a0" - cfitsio: ">=4.3.0,<4.3.1.0a0" + cfitsio: ">=4.3.1,<4.3.2.0a0" freexl: ">=2.0.0,<3.0a0" geos: ">=3.12.1,<3.12.2.0a0" geotiff: ">=1.7.1,<1.8.0a0" @@ -11528,7 +11530,7 @@ package: libpng: ">=1.6.39,<1.7.0a0" libpq: ">=16.1,<17.0a0" libspatialite: ">=5.1.0,<5.2.0a0" - libsqlite: ">=3.44.1,<4.0a0" + libsqlite: ">=3.44.2,<4.0a0" libstdcxx-ng: ">=12" libtiff: ">=4.6.0,<4.7.0a0" libuuid: ">=2.38.1,<3.0a0" @@ -11537,29 +11539,29 @@ package: libzlib: ">=1.2.13,<1.3.0a0" lz4-c: ">=1.9.3,<1.10.0a0" openjpeg: ">=2.5.0,<3.0a0" - openssl: ">=3.1.4,<4.0a0" + openssl: ">=3.2.0,<4.0a0" pcre2: ">=10.42,<10.43.0a0" - poppler: ">=23.11.0,<23.12.0a0" + poppler: ">=23.12.0,<23.13.0a0" postgresql: "" proj: ">=9.3.0,<9.3.1.0a0" tiledb: ">=2.16,<2.17.0a0" xerces-c: ">=3.2.4,<3.3.0a0" xz: ">=5.2.6,<6.0a0" zstd: ">=1.5.5,<1.6.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/libgdal-3.8.0-he7dcfe9_6.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libgdal-3.8.1-hcae7082_1.conda hash: - md5: 16ff703a847430fa074c5d53916740c1 - sha256: 06ccb879fc2783c371f1b02d062c4e90dfe4d8c5e9f2f83213bbef0fe27a00b0 + md5: e96d24ccc597439cda2859fe948aac77 + sha256: 9d6a19f03ea1437e951ba5e09c12faf11aa47a375a76f80f9bab1d2c3aed4aa9 category: main optional: false - name: libgdal - version: 3.8.0 + version: 3.8.1 manager: conda platform: osx-64 dependencies: __osx: ">=10.9" blosc: ">=1.21.5,<2.0a0" - cfitsio: ">=4.3.0,<4.3.1.0a0" + cfitsio: ">=4.3.1,<4.3.2.0a0" freexl: ">=2.0.0,<3.0a0" geos: ">=3.12.1,<3.12.2.0a0" geotiff: ">=1.7.1,<1.8.0a0" @@ -11582,36 +11584,36 @@ package: libpng: ">=1.6.39,<1.7.0a0" libpq: ">=16.1,<17.0a0" libspatialite: ">=5.1.0,<5.2.0a0" - libsqlite: ">=3.44.1,<4.0a0" + libsqlite: ">=3.44.2,<4.0a0" libtiff: ">=4.6.0,<4.7.0a0" libwebp-base: ">=1.3.2,<2.0a0" libxml2: ">=2.11.6,<2.12.0a0" libzlib: ">=1.2.13,<1.3.0a0" lz4-c: ">=1.9.3,<1.10.0a0" openjpeg: ">=2.5.0,<3.0a0" - openssl: ">=3.1.4,<4.0a0" + openssl: ">=3.2.0,<4.0a0" pcre2: ">=10.42,<10.43.0a0" - poppler: ">=23.11.0,<23.12.0a0" + poppler: ">=23.12.0,<23.13.0a0" postgresql: "" proj: ">=9.3.0,<9.3.1.0a0" tiledb: ">=2.16,<2.17.0a0" xerces-c: ">=3.2.4,<3.3.0a0" xz: ">=5.2.6,<6.0a0" zstd: ">=1.5.5,<1.6.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/libgdal-3.8.0-h5b0c7d5_6.conda + url: https://conda.anaconda.org/conda-forge/osx-64/libgdal-3.8.1-hb7f764b_1.conda hash: - md5: 01e293a419480a02fc7775f6c6afa530 - sha256: fc602de0bb3d5b7c0493b25b1e4345018fd68f26c672c8abff621c492f67abf4 + md5: eee8b19233a243e229af4399af2c4a10 + sha256: efe25d85efe856c1db71e2a40ce9736e07cf5c06e53285248866a62a43363a0d category: main optional: false - name: libgdal - version: 3.8.0 + version: 3.8.1 manager: conda platform: osx-arm64 dependencies: __osx: ">=10.9" blosc: ">=1.21.5,<2.0a0" - cfitsio: ">=4.3.0,<4.3.1.0a0" + cfitsio: ">=4.3.1,<4.3.2.0a0" freexl: ">=2.0.0,<3.0a0" geos: ">=3.12.1,<3.12.2.0a0" geotiff: ">=1.7.1,<1.8.0a0" @@ -11634,26 +11636,26 @@ package: libpng: ">=1.6.39,<1.7.0a0" libpq: ">=16.1,<17.0a0" libspatialite: ">=5.1.0,<5.2.0a0" - libsqlite: ">=3.44.1,<4.0a0" + libsqlite: ">=3.44.2,<4.0a0" libtiff: ">=4.6.0,<4.7.0a0" libwebp-base: ">=1.3.2,<2.0a0" libxml2: ">=2.11.6,<2.12.0a0" libzlib: ">=1.2.13,<1.3.0a0" lz4-c: ">=1.9.3,<1.10.0a0" openjpeg: ">=2.5.0,<3.0a0" - openssl: ">=3.1.4,<4.0a0" + openssl: ">=3.2.0,<4.0a0" pcre2: ">=10.42,<10.43.0a0" - poppler: ">=23.11.0,<23.12.0a0" + poppler: ">=23.12.0,<23.13.0a0" postgresql: "" proj: ">=9.3.0,<9.3.1.0a0" tiledb: ">=2.16,<2.17.0a0" xerces-c: ">=3.2.4,<3.3.0a0" xz: ">=5.2.6,<6.0a0" zstd: ">=1.5.5,<1.6.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/libgdal-3.8.0-h76f3012_6.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/libgdal-3.8.1-hac00559_1.conda hash: - md5: c7efc96733da609c84411293fa3a8457 - sha256: 34d8f93a03a58396074dbbcc832a0c84bb6192d9e0ddf70992c4fa40349366c5 + md5: a65e999f85ab35663d7e9753ca7eaa13 + sha256: 636ff5b1f95edc083dc7b3ba9f35a87fe18695349b1bd57ae72c54d00ef5034e category: main optional: false - name: libgfortran @@ -12227,16 +12229,16 @@ package: manager: conda platform: linux-64 dependencies: - c-ares: ">=1.21.0,<2.0a0" - libev: ">=4.33,<4.34.0a0" + c-ares: ">=1.23.0,<2.0a0" + libev: ">=4.33,<5.0a0" libgcc-ng: ">=12" libstdcxx-ng: ">=12" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.1.4,<4.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/libnghttp2-1.58.0-h47da74e_0.conda + openssl: ">=3.2.0,<4.0a0" + url: https://conda.anaconda.org/conda-forge/linux-64/libnghttp2-1.58.0-h47da74e_1.conda hash: - md5: 9b13d5ee90fc9f09d54fd403247342b4 - sha256: 151b18e4f92dcca263a6d23e4beb0c4e2287aa1c7d0587ff71ef50035ed34aca + md5: 700ac6ea6d53d5510591c4344d5c989a + sha256: 1910c5306c6aa5bcbd623c3c930c440e9c77a5a019008e1487810e3c1d3716cb category: main optional: false - name: libnghttp2 @@ -12245,15 +12247,15 @@ package: platform: osx-64 dependencies: __osx: ">=10.9" - c-ares: ">=1.21.0,<2.0a0" + c-ares: ">=1.23.0,<2.0a0" libcxx: ">=16.0.6" - libev: ">=4.33,<4.34.0a0" + libev: ">=4.33,<5.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.1.4,<4.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/libnghttp2-1.58.0-h64cf6d3_0.conda + openssl: ">=3.2.0,<4.0a0" + url: https://conda.anaconda.org/conda-forge/osx-64/libnghttp2-1.58.0-h64cf6d3_1.conda hash: - md5: 864e23fba3678000154f53bbf6d476a2 - sha256: b2b94cdaffa0d4fddd73c04262fdb1d1bcd6f8783979281ccfdb832e159cac4e + md5: faecc55c2a8155d9ff1c0ff9a0fef64f + sha256: 412fd768e787e586602f8e9ea52bf089f3460fc630f6987f0cbd89b70e9a4380 category: main optional: false - name: libnghttp2 @@ -12262,15 +12264,15 @@ package: platform: osx-arm64 dependencies: __osx: ">=10.9" - c-ares: ">=1.21.0,<2.0a0" + c-ares: ">=1.23.0,<2.0a0" libcxx: ">=16.0.6" - libev: ">=4.33,<4.34.0a0" + libev: ">=4.33,<5.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.1.4,<4.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/libnghttp2-1.58.0-ha4dd798_0.conda + openssl: ">=3.2.0,<4.0a0" + url: https://conda.anaconda.org/conda-forge/osx-arm64/libnghttp2-1.58.0-ha4dd798_1.conda hash: - md5: b93d94874cfd44bc96496c2ee69f82a9 - sha256: 3597032667444f91ae59343c553da6e93f2b3359bc2c0dd6b7f8260e41572e9c + md5: 1813e066bfcef82de579a0be8a766df4 + sha256: fc97aaaf0c6d0f508be313d86c2705b490998d382560df24be918b8e977802cd category: main optional: false - name: libnsl @@ -12431,12 +12433,11 @@ package: dependencies: krb5: ">=1.21.2,<1.22.0a0" libgcc-ng: ">=12" - libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.1.4,<3.2.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/libpq-16.1-hfc447b1_0.conda + openssl: ">=3.2.0,<4.0a0" + url: https://conda.anaconda.org/conda-forge/linux-64/libpq-16.1-h33b98f1_7.conda hash: - md5: 2b7f1893cf40b4ccdc0230bcd94d5ed9 - sha256: 8c92a8cce329a83cc9e94b19d18200c661957c00cfb464f26237d24730864585 + md5: 675317e46167caea24542d85c72f19a3 + sha256: 833fd96338dffc6784fb5f79ab805fa5a4c2cabf5c08c4f1d5caf4e290e39c28 category: main optional: false - name: libpq @@ -12445,12 +12446,11 @@ package: platform: osx-64 dependencies: krb5: ">=1.21.2,<1.22.0a0" - libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.1.4,<3.2.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/libpq-16.1-h6dd4ff7_0.conda + openssl: ">=3.2.0,<4.0a0" + url: https://conda.anaconda.org/conda-forge/osx-64/libpq-16.1-ha925e61_7.conda hash: - md5: 39de94ff4ccc306f3d24ef7aef13c689 - sha256: 1a51c9b3451eebf04ac1f7a7a58fec07c2e44d2298514a30f62b5b432a653c07 + md5: ad8be4619f57504e8c243e00ab315ad6 + sha256: addce7453b4ac80faf46ecec76db74d98f57d9711624df600399c56e147b7903 category: main optional: false - name: libpq @@ -12459,12 +12459,11 @@ package: platform: osx-arm64 dependencies: krb5: ">=1.21.2,<1.22.0a0" - libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.1.4,<3.2.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/libpq-16.1-hd435d45_0.conda + openssl: ">=3.2.0,<4.0a0" + url: https://conda.anaconda.org/conda-forge/osx-arm64/libpq-16.1-h0f8b458_7.conda hash: - md5: 883bbf64780c91608f1a7df9203b79a5 - sha256: 1b5c86d5f247b3e154ae373dcebea6979368c4a0ee722d39ec33ee2fc8528c04 + md5: c94283997b390fc897936edf2c1f0d55 + sha256: 2e71c5efc57ec7da59efcb747b615ccde1f70d12eb25128720817a3f3482d622 category: main optional: false - name: libprotobuf @@ -15274,40 +15273,40 @@ package: category: main optional: false - name: openssl - version: 3.1.4 + version: 3.2.0 manager: conda platform: linux-64 dependencies: ca-certificates: "" libgcc-ng: ">=12" - url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.4-hd590300_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.2.0-hd590300_1.conda hash: - md5: 412ba6938c3e2abaca8b1129ea82e238 - sha256: d15b3e83ce66c6f6fbb4707f2f5c53337124c01fb03bfda1cf25c5b41123efc7 + md5: 603827b39ea2b835268adb8c821b8570 + sha256: 80efc6f429bd8e622d999652e5cba2ca56fcdb9c16a439d2ce9b4313116e4a87 category: main optional: false - name: openssl - version: 3.1.4 + version: 3.2.0 manager: conda platform: osx-64 dependencies: ca-certificates: "" - url: https://conda.anaconda.org/conda-forge/osx-64/openssl-3.1.4-hd75f5a5_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/openssl-3.2.0-hd75f5a5_1.conda hash: - md5: bc9201da6eb1e0df4107901df5371347 - sha256: 1c436103a8de0dc82c9c56974badaa1b8b8f8cd9f37c2766bd50cd9899720f6b + md5: 06cb561619487c88891839b9beb5244c + sha256: 99161bf349f5dc80322f2a2c188588d11efa662566e4e19f2ac0a36d9fa3de25 category: main optional: false - name: openssl - version: 3.1.4 + version: 3.2.0 manager: conda platform: osx-arm64 dependencies: ca-certificates: "" - url: https://conda.anaconda.org/conda-forge/osx-arm64/openssl-3.1.4-h0d3ecfb_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/openssl-3.2.0-h0d3ecfb_1.conda hash: - md5: 5a89552fececf4cd99628318ccbb67a3 - sha256: 3c715b1d4940c7ad6065935db18924b85a54048dde066f963cfc250340639457 + md5: 47d16d26100f19ca495882882b7bc93b + sha256: a53e1c6c058b621fd1d13cca6f9cccd534d2b3f4b4ac789fe26f7902031d6c41 category: main optional: false - name: orc @@ -15440,7 +15439,7 @@ package: category: main optional: false - name: pandas - version: 2.1.3 + version: 2.1.4 manager: conda platform: linux-64 dependencies: @@ -15452,14 +15451,14 @@ package: python-tzdata: ">=2022a" python_abi: 3.11.* pytz: ">=2020.1" - url: https://conda.anaconda.org/conda-forge/linux-64/pandas-2.1.3-py311h320fe9a_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pandas-2.1.4-py311h320fe9a_0.conda hash: - md5: 3ea3486e16d559dfcb539070ed330a1e - sha256: d69759f8e5f3dcae2562e177cdfde5a45e4cd38db732301812aa558c1c80db57 + md5: e44ccb61b6621bf3f8053ae66eba7397 + sha256: 4f40035c77c381e0151c0fb0b39d0dfc343947f7d283c2bced2123273c5d4884 category: main optional: false - name: pandas - version: 2.1.3 + version: 2.1.4 manager: conda platform: osx-64 dependencies: @@ -15471,14 +15470,14 @@ package: python-tzdata: ">=2022a" python_abi: 3.11.* pytz: ">=2020.1" - url: https://conda.anaconda.org/conda-forge/osx-64/pandas-2.1.3-py311h1eadf79_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/pandas-2.1.4-py311h1eadf79_0.conda hash: - md5: 0a1ea4be8bcc907018694b5d04ac3036 - sha256: 2ca591570ce60be45eae8e5d39a07f08390e9ecc18997f66cb3d712953c09724 + md5: 905aff7f27a734e251526b9a7ecc20ac + sha256: 994d226d29293c1b118c0902af50719c5fc25c63c2c6cf7be7808b44226e19eb category: main optional: false - name: pandas - version: 2.1.3 + version: 2.1.4 manager: conda platform: osx-arm64 dependencies: @@ -15490,10 +15489,10 @@ package: python-tzdata: ">=2022a" python_abi: 3.11.* pytz: ">=2020.1" - url: https://conda.anaconda.org/conda-forge/osx-arm64/pandas-2.1.3-py311h6e08293_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/pandas-2.1.4-py311h6e08293_0.conda hash: - md5: 0d0ecc6bac2b7a4007bf4d96b125d674 - sha256: eacddc0866e26372578fdeb5059e6f7edf4c6c8f59f494a8d5e64caa032b2600 + md5: 5130445e7fe8465365dab3ed3694c770 + sha256: fa6c79cf5252c22ef8141a405ea9650ea9df2d6436c003b279086e146eaef1e5 category: main optional: false - name: pandera-core @@ -16108,42 +16107,42 @@ package: category: main optional: false - name: pint - version: "0.22" + version: "0.23" manager: conda platform: linux-64 dependencies: python: ">=3.9" typing_extensions: "" - url: https://conda.anaconda.org/conda-forge/noarch/pint-0.22-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/pint-0.23-pyhd8ed1ab_0.conda hash: - md5: a719c3f3959c529e558e9ed9f98c3f30 - sha256: 49795ff6e5e634523aafe34e869c425e2cdc4a1fcb11aa294d7983035bc38622 + md5: d47f9170e3933e53368e0d447c16856f + sha256: c26dfa2094949782db6ddbce2b6e03aff1e9e64c808fef68f66cfea72be18e1d category: main optional: false - name: pint - version: "0.22" + version: "0.23" manager: conda platform: osx-64 dependencies: typing_extensions: "" python: ">=3.9" - url: https://conda.anaconda.org/conda-forge/noarch/pint-0.22-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/pint-0.23-pyhd8ed1ab_0.conda hash: - md5: a719c3f3959c529e558e9ed9f98c3f30 - sha256: 49795ff6e5e634523aafe34e869c425e2cdc4a1fcb11aa294d7983035bc38622 + md5: d47f9170e3933e53368e0d447c16856f + sha256: c26dfa2094949782db6ddbce2b6e03aff1e9e64c808fef68f66cfea72be18e1d category: main optional: false - name: pint - version: "0.22" + version: "0.23" manager: conda platform: osx-arm64 dependencies: typing_extensions: "" python: ">=3.9" - url: https://conda.anaconda.org/conda-forge/noarch/pint-0.22-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/pint-0.23-pyhd8ed1ab_0.conda hash: - md5: a719c3f3959c529e558e9ed9f98c3f30 - sha256: 49795ff6e5e634523aafe34e869c425e2cdc4a1fcb11aa294d7983035bc38622 + md5: d47f9170e3933e53368e0d447c16856f + sha256: c26dfa2094949782db6ddbce2b6e03aff1e9e64c808fef68f66cfea72be18e1d category: main optional: false - name: pip @@ -16370,7 +16369,7 @@ package: category: main optional: false - name: poppler - version: 23.11.0 + version: 23.12.0 manager: conda platform: linux-64 dependencies: @@ -16381,7 +16380,7 @@ package: lcms2: ">=2.15,<3.0a0" libcurl: ">=8.4.0,<9.0a0" libgcc-ng: ">=12" - libglib: ">=2.78.0,<3.0a0" + libglib: ">=2.78.1,<3.0a0" libiconv: ">=1.17,<2.0a0" libjpeg-turbo: ">=3.0.0,<4.0a0" libpng: ">=1.6.39,<1.7.0a0" @@ -16389,17 +16388,17 @@ package: libtiff: ">=4.6.0,<4.7.0a0" libzlib: ">=1.2.13,<1.3.0a0" nspr: ">=4.35,<5.0a0" - nss: ">=3.94,<4.0a0" + nss: ">=3.95,<4.0a0" openjpeg: ">=2.5.0,<3.0a0" poppler-data: "" - url: https://conda.anaconda.org/conda-forge/linux-64/poppler-23.11.0-h590f24d_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/poppler-23.12.0-h590f24d_0.conda hash: - md5: 671439d8eca2084bb5a75561fff23a85 - sha256: 8050002e01be124efcb82e32e740676f5ed7dfe852f335408554e6dc3b060ad9 + md5: 480189ac126a8c6c61e14476c8ba7c9a + sha256: b313920277aca763b590dddf806c56b0aadcdff82f5ace39827cab4792ae4b20 category: main optional: false - name: poppler - version: 23.11.0 + version: 23.12.0 manager: conda platform: osx-64 dependencies: @@ -16412,24 +16411,24 @@ package: lcms2: ">=2.15,<3.0a0" libcurl: ">=8.4.0,<9.0a0" libcxx: ">=16.0.6" - libglib: ">=2.78.0,<3.0a0" + libglib: ">=2.78.1,<3.0a0" libiconv: ">=1.17,<2.0a0" libjpeg-turbo: ">=3.0.0,<4.0a0" libpng: ">=1.6.39,<1.7.0a0" libtiff: ">=4.6.0,<4.7.0a0" libzlib: ">=1.2.13,<1.3.0a0" nspr: ">=4.35,<5.0a0" - nss: ">=3.94,<4.0a0" + nss: ">=3.95,<4.0a0" openjpeg: ">=2.5.0,<3.0a0" poppler-data: "" - url: https://conda.anaconda.org/conda-forge/osx-64/poppler-23.11.0-hdd5a5e8_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/poppler-23.12.0-hdd5a5e8_0.conda hash: - md5: 60ffe2d3a09ff99eb2601487d6ddaeea - sha256: fb6a53ddac3fa8c097b4a0b7d2f40219b13bfa3324147aaf6c5a14ee5fb27521 + md5: e1cb9f8e9e21dfa600b08be85d905e5f + sha256: 1271e3c8163125fc1ff14833ddba3f2c6465df5b1d13db76912415bd5a39b492 category: main optional: false - name: poppler - version: 23.11.0 + version: 23.12.0 manager: conda platform: osx-arm64 dependencies: @@ -16442,20 +16441,20 @@ package: lcms2: ">=2.15,<3.0a0" libcurl: ">=8.4.0,<9.0a0" libcxx: ">=16.0.6" - libglib: ">=2.78.0,<3.0a0" + libglib: ">=2.78.1,<3.0a0" libiconv: ">=1.17,<2.0a0" libjpeg-turbo: ">=3.0.0,<4.0a0" libpng: ">=1.6.39,<1.7.0a0" libtiff: ">=4.6.0,<4.7.0a0" libzlib: ">=1.2.13,<1.3.0a0" nspr: ">=4.35,<5.0a0" - nss: ">=3.94,<4.0a0" + nss: ">=3.95,<4.0a0" openjpeg: ">=2.5.0,<3.0a0" poppler-data: "" - url: https://conda.anaconda.org/conda-forge/osx-arm64/poppler-23.11.0-hcdd998b_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/poppler-23.12.0-hcdd998b_0.conda hash: - md5: 19386a03a7c57a378953bafb4f598156 - sha256: a6677b507cbdb6202c872aa461b4bf8cfcbe5791721fe1f42615b89205d4a4a6 + md5: e072f524004eee193e30d243d68c520f + sha256: 13ebaac3bf9b77e92e777d3ed245c2f0a8ac93985e334b0cd797a39f321ae5dd category: main optional: false - name: poppler-data @@ -16499,17 +16498,16 @@ package: krb5: ">=1.21.2,<1.22.0a0" libgcc-ng: ">=12" libpq: "16.1" - libxml2: ">=2.11.5,<2.12.0a0" + libxml2: ">=2.11.6,<2.12.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.1.4,<4.0a0" + openssl: ">=3.2.0,<4.0a0" readline: ">=8.2,<9.0a0" tzcode: "" tzdata: "" - zlib: "" - url: https://conda.anaconda.org/conda-forge/linux-64/postgresql-16.1-h8972f4a_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/postgresql-16.1-h8972f4a_7.conda hash: - md5: 1e9ab0760262044fa00814088667e451 - sha256: 74dfb5793a00a0a9e85296ce0944d8af0f71758574b7c8f9e7d5590250441e24 + md5: 672069c684190f10e5a9bbb5b10d82bb + sha256: fbc18253dbc920034cebbee1ba8080e3e2edb7c0d01d5b2f7d37538da71bf8b7 category: main optional: false - name: postgresql @@ -16519,17 +16517,16 @@ package: dependencies: krb5: ">=1.21.2,<1.22.0a0" libpq: "16.1" - libxml2: ">=2.11.5,<2.12.0a0" + libxml2: ">=2.11.6,<2.12.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.1.4,<4.0a0" + openssl: ">=3.2.0,<4.0a0" readline: ">=8.2,<9.0a0" tzcode: "" tzdata: "" - zlib: "" - url: https://conda.anaconda.org/conda-forge/osx-64/postgresql-16.1-h413614c_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/postgresql-16.1-h413614c_7.conda hash: - md5: b7322d27093606b939fb92fa33b92beb - sha256: 612393024639882d7515429e639c85fa3b712d114c5a6b3a4b3891b061e1bc89 + md5: 6f83d0483ca6044b227a5547ea5b65df + sha256: 6aceedd6f5a72a0d2e64607b545acfafa015ab74e1264a58a4884ff189631680 category: main optional: false - name: postgresql @@ -16539,105 +16536,104 @@ package: dependencies: krb5: ">=1.21.2,<1.22.0a0" libpq: "16.1" - libxml2: ">=2.11.5,<2.12.0a0" + libxml2: ">=2.11.6,<2.12.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.1.4,<4.0a0" + openssl: ">=3.2.0,<4.0a0" readline: ">=8.2,<9.0a0" tzcode: "" tzdata: "" - zlib: "" - url: https://conda.anaconda.org/conda-forge/osx-arm64/postgresql-16.1-hc6ab77f_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/postgresql-16.1-hc6ab77f_7.conda hash: - md5: 37398d1ad2fbeaa7733711b845da863e - sha256: 441f5ad3fac42e7daf9c246ad0dc0962c7f0b4c9ac1044038d3a053d339320bf + md5: bba5c8dd372e5e2cf81bf71e6104fa7b + sha256: 5830151c5b72e95ecbff45b36a88405875514ea27cfce1b5381e98d6cee9974a category: main optional: false - name: pre-commit - version: 3.5.0 + version: 3.6.0 manager: conda platform: linux-64 dependencies: cfgv: ">=2.0.0" identify: ">=1.0.0" nodeenv: ">=0.11.1" - python: ">=3.8" + python: ">=3.9" pyyaml: ">=5.1" virtualenv: ">=20.10.0" - url: https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.5.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.6.0-pyha770c72_0.conda hash: - md5: 964e3d762e427661c59263435a14c492 - sha256: 51a4a17334a15ec92805cd075776563ff93b3b6c20732c4cb607c98a761ae02f + md5: 473a7cfca197da0a10cff3f6dded7d4b + sha256: 7d1f4b4a2eb4946b5808769642c5f643788c3a9e090f1c02a6c63f8794fb3d54 category: main optional: false - name: pre-commit - version: 3.5.0 + version: 3.6.0 manager: conda platform: osx-64 dependencies: - python: ">=3.8" + python: ">=3.9" pyyaml: ">=5.1" identify: ">=1.0.0" nodeenv: ">=0.11.1" cfgv: ">=2.0.0" virtualenv: ">=20.10.0" - url: https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.5.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.6.0-pyha770c72_0.conda hash: - md5: 964e3d762e427661c59263435a14c492 - sha256: 51a4a17334a15ec92805cd075776563ff93b3b6c20732c4cb607c98a761ae02f + md5: 473a7cfca197da0a10cff3f6dded7d4b + sha256: 7d1f4b4a2eb4946b5808769642c5f643788c3a9e090f1c02a6c63f8794fb3d54 category: main optional: false - name: pre-commit - version: 3.5.0 + version: 3.6.0 manager: conda platform: osx-arm64 dependencies: - python: ">=3.8" + python: ">=3.9" pyyaml: ">=5.1" identify: ">=1.0.0" nodeenv: ">=0.11.1" cfgv: ">=2.0.0" virtualenv: ">=20.10.0" - url: https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.5.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.6.0-pyha770c72_0.conda hash: - md5: 964e3d762e427661c59263435a14c492 - sha256: 51a4a17334a15ec92805cd075776563ff93b3b6c20732c4cb607c98a761ae02f + md5: 473a7cfca197da0a10cff3f6dded7d4b + sha256: 7d1f4b4a2eb4946b5808769642c5f643788c3a9e090f1c02a6c63f8794fb3d54 category: main optional: false - name: prettier - version: 3.1.0 + version: 3.1.1 manager: conda platform: linux-64 dependencies: __glibc: ">=2.17,<3.0.a0" - nodejs: ">=20.8.1,<21.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/prettier-3.1.0-h31abb78_0.conda + nodejs: ">=20.9.0,<21.0a0" + url: https://conda.anaconda.org/conda-forge/linux-64/prettier-3.1.1-h31abb78_0.conda hash: - md5: 825c43da21ded31f538a695cca2961ee - sha256: a836d8d87734c76e04b64f66d2a72262ac09ce7e23c92b3f77d47bdc20267a21 + md5: 9943537898b6e9763fde439fe40f481f + sha256: 3bd2b360fc709008f39315f92c6fbbbbe70f75f6665cf3ddf050130f7614d11a category: main optional: false - name: prettier - version: 3.1.0 + version: 3.1.1 manager: conda platform: osx-64 dependencies: - nodejs: ">=20.8.1,<21.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/prettier-3.1.0-hbd11d21_0.conda + nodejs: ">=20.9.0,<21.0a0" + url: https://conda.anaconda.org/conda-forge/osx-64/prettier-3.1.1-hbd11d21_0.conda hash: - md5: 0f2d6f2c329df13e0ff0bd3748b2f74f - sha256: 9dfd2b3d2d4c3cbdeb341263d5107b7018197ad167633387832def6f68154e55 + md5: bbc22967cb92235dfd93d9db8faed04f + sha256: 15d29a0e576acc8a37a7b00551ea6fd44819007cc77e4d7f55efb3ddd2a0a09f category: main optional: false - name: prettier - version: 3.1.0 + version: 3.1.1 manager: conda platform: osx-arm64 dependencies: - nodejs: ">=20.8.1,<21.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/prettier-3.1.0-hb67532b_0.conda + nodejs: ">=20.9.0,<21.0a0" + url: https://conda.anaconda.org/conda-forge/osx-arm64/prettier-3.1.1-hb67532b_0.conda hash: - md5: dfa0c94c177b8163579301aa4672f245 - sha256: c71c69ba2420da67a4bc1a5a85deab03e3c37cb4dea44a3bef01cc91e24bb1da + md5: c833fb7f54410404e1396868d5272da1 + sha256: de3504e85790bd79ff6206ad0708ddc68d26ce72a0b3478e7a084c6b8af93415 category: main optional: false - name: proj @@ -16908,33 +16904,33 @@ package: category: main optional: false - name: psycopg2 - version: 2.9.7 + version: 2.9.9 manager: conda platform: osx-64 dependencies: - libpq: ">=16.0,<17.0a0" - openssl: ">=3.1.3,<4.0a0" + libpq: ">=16.1,<17.0a0" + openssl: ">=3.2.0,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/psycopg2-2.9.7-py311h187f0af_1.conda + url: https://conda.anaconda.org/conda-forge/osx-64/psycopg2-2.9.9-py311h187f0af_0.conda hash: - md5: f777a0c47ebe4c2cc2eca6f19aea9347 - sha256: dce8bdee2b563927c71493ad26997c9897939d8fbb0376df80b6c04154ce0412 + md5: 2177c8943bbf9bfc45421ecaebd5be11 + sha256: 73c0cf543b0ddd41993956969f665999f5801e027e3d3524604892baedbd2626 category: main optional: false - name: psycopg2 - version: 2.9.7 + version: 2.9.9 manager: conda platform: osx-arm64 dependencies: - libpq: ">=16.0,<17.0a0" - openssl: ">=3.1.3,<4.0a0" + libpq: ">=16.1,<17.0a0" + openssl: ">=3.2.0,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/psycopg2-2.9.7-py311h589e011_1.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/psycopg2-2.9.9-py311h589e011_0.conda hash: - md5: e5fd933c7c34b5c02a95e28f05b07f46 - sha256: 30fb7c0c8e1651694dcb9b5b62b7cdc801ce45e06ead0a5d281ce950e1f498f5 + md5: cf560a3c0e56cf6a168f885958ec31ff + sha256: a6340fa9458824b9681ba6cc1de0a618ffd6b19272c4eedcf787a6e627025aa5 category: main optional: false - name: psycopg2-binary @@ -16951,29 +16947,29 @@ package: category: main optional: false - name: psycopg2-binary - version: 2.9.7 + version: 2.9.9 manager: conda platform: osx-64 dependencies: python: ">=3.6" - psycopg2: ">=2.9.7,<2.9.8.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/psycopg2-binary-2.9.7-pyhd8ed1ab_1.conda + psycopg2: ">=2.9.9,<2.9.10.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/psycopg2-binary-2.9.9-pyhd8ed1ab_0.conda hash: - md5: 0212a5c5ae1ab578853364bfc5d9f657 - sha256: 5d82cb8b90daff6c12a4b6e0848fd32172522d82ceb5f093bfd55bfec09b3797 + md5: c15b2ec0570f8988819eea58286dbc19 + sha256: bb6184a3de8a6fddaed9104539ada9ac7c5e2bd900284ccf96ef5e4e285e75db category: main optional: false - name: psycopg2-binary - version: 2.9.7 + version: 2.9.9 manager: conda platform: osx-arm64 dependencies: python: ">=3.6" - psycopg2: ">=2.9.7,<2.9.8.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/psycopg2-binary-2.9.7-pyhd8ed1ab_1.conda + psycopg2: ">=2.9.9,<2.9.10.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/psycopg2-binary-2.9.9-pyhd8ed1ab_0.conda hash: - md5: 0212a5c5ae1ab578853364bfc5d9f657 - sha256: 5d82cb8b90daff6c12a4b6e0848fd32172522d82ceb5f093bfd55bfec09b3797 + md5: c15b2ec0570f8988819eea58286dbc19 + sha256: bb6184a3de8a6fddaed9104539ada9ac7c5e2bd900284ccf96ef5e4e285e75db category: main optional: false - name: pthread-stubs @@ -17643,7 +17639,7 @@ package: category: main optional: false - name: pyobjc-core - version: "10.0" + version: "10.1" manager: conda platform: osx-64 dependencies: @@ -17651,14 +17647,14 @@ package: python: ">=3.11,<3.12.0a0" python_abi: 3.11.* setuptools: "" - url: https://conda.anaconda.org/conda-forge/osx-64/pyobjc-core-10.0-py311hf110eff_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/pyobjc-core-10.1-py311h9b70068_0.conda hash: - md5: d26705887703d13c655a6098516e06e2 - sha256: 031b8c48866f1f97a4a12d6a3ea0dc94cb6a735918871460b26f4779f5a01125 + md5: e5a3b39d0ad3ec4cad4438ca51ce6a65 + sha256: b3c7c35b52460bf64cf7854ea5dc083370419f16f3b4d5b16081be623bc52118 category: main optional: false - name: pyobjc-core - version: "10.0" + version: "10.1" manager: conda platform: osx-arm64 dependencies: @@ -17666,40 +17662,40 @@ package: python: ">=3.11,<3.12.0a0" python_abi: 3.11.* setuptools: "" - url: https://conda.anaconda.org/conda-forge/osx-arm64/pyobjc-core-10.0-py311hb702dc4_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/pyobjc-core-10.1-py311h665608e_0.conda hash: - md5: 5c441ab09e2d9faf6e875ea9c446b445 - sha256: d3bb68f8da77bffad5fa690d2cc1aeb0be0608ed0b6e08a96d8fc3613f2e7135 + md5: fbf6e60c57d27283b5e616a458e11ecf + sha256: 11437e8835d8637fce58bdb98a6f8e60455c7f11eea2fc2b85d38822c5a4c80f category: main optional: false - name: pyobjc-framework-cocoa - version: "10.0" + version: "10.1" manager: conda platform: osx-64 dependencies: libffi: ">=3.4,<4.0a0" - pyobjc-core: 10.0.* + pyobjc-core: 10.1.* python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/pyobjc-framework-cocoa-10.0-py311hf110eff_1.conda + url: https://conda.anaconda.org/conda-forge/osx-64/pyobjc-framework-cocoa-10.1-py311h9b70068_0.conda hash: - md5: 8fb67274a648901045368717d6221aed - sha256: 54530c1b3bfc361e027adbd8f9d9a23e7c102c7f58c04a169da1457f82975724 + md5: 03de24825bd26bf77746aa3eacb6f980 + sha256: 0062a6ec46b41845a97ca689e056e010fba98a0deaec0ff5d7dfe47eb14ccec4 category: main optional: false - name: pyobjc-framework-cocoa - version: "10.0" + version: "10.1" manager: conda platform: osx-arm64 dependencies: libffi: ">=3.4,<4.0a0" - pyobjc-core: 10.0.* + pyobjc-core: 10.1.* python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/pyobjc-framework-cocoa-10.0-py311hb702dc4_1.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/pyobjc-framework-cocoa-10.1-py311h665608e_0.conda hash: - md5: ee9430e4e9b69a6270c966bb7439c9a0 - sha256: 31a7542b8ced5cb3bc236be0b5777dab4bc0e57fbfc5423e9d0ae09ce8eae16c + md5: 8cbae911599bc02a8ce3b1b33d95abb0 + sha256: 81a15d9449d9570e997ee0cfd7e25c85ceb263915e34235900a1d12bc22c9f30 category: main optional: false - name: pyopenssl @@ -22187,75 +22183,75 @@ package: category: main optional: false - name: typing-extensions - version: 4.8.0 + version: 4.9.0 manager: conda platform: linux-64 dependencies: - typing_extensions: 4.8.0 - url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.8.0-hd8ed1ab_0.conda + typing_extensions: 4.9.0 + url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.9.0-hd8ed1ab_0.conda hash: - md5: 384462e63262a527bda564fa2d9126c0 - sha256: d6e1dddd0c372218ef15912383d351ac8c73465cbf16238017f0269813cafe2d + md5: c16524c1b7227dc80b36b4fa6f77cc86 + sha256: d795c1eb1db4ea147f01ece74e5a504d7c2e8d5ee8c11ec987884967dd938f9c category: main optional: false - name: typing-extensions - version: 4.8.0 + version: 4.9.0 manager: conda platform: osx-64 dependencies: - typing_extensions: 4.8.0 - url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.8.0-hd8ed1ab_0.conda + typing_extensions: 4.9.0 + url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.9.0-hd8ed1ab_0.conda hash: - md5: 384462e63262a527bda564fa2d9126c0 - sha256: d6e1dddd0c372218ef15912383d351ac8c73465cbf16238017f0269813cafe2d + md5: c16524c1b7227dc80b36b4fa6f77cc86 + sha256: d795c1eb1db4ea147f01ece74e5a504d7c2e8d5ee8c11ec987884967dd938f9c category: main optional: false - name: typing-extensions - version: 4.8.0 + version: 4.9.0 manager: conda platform: osx-arm64 dependencies: - typing_extensions: 4.8.0 - url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.8.0-hd8ed1ab_0.conda + typing_extensions: 4.9.0 + url: https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.9.0-hd8ed1ab_0.conda hash: - md5: 384462e63262a527bda564fa2d9126c0 - sha256: d6e1dddd0c372218ef15912383d351ac8c73465cbf16238017f0269813cafe2d + md5: c16524c1b7227dc80b36b4fa6f77cc86 + sha256: d795c1eb1db4ea147f01ece74e5a504d7c2e8d5ee8c11ec987884967dd938f9c category: main optional: false - name: typing_extensions - version: 4.8.0 + version: 4.9.0 manager: conda platform: linux-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.8.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.9.0-pyha770c72_0.conda hash: - md5: 5b1be40a26d10a06f6d4f1f9e19fa0c7 - sha256: 38d16b5c53ec1af845d37d22e7bb0e6c934c7f19499123507c5a470f6f8b7dde + md5: a92a6440c3fe7052d63244f3aba2a4a7 + sha256: f3c5be8673bfd905c4665efcb27fa50192f24f84fa8eff2f19cba5d09753d905 category: main optional: false - name: typing_extensions - version: 4.8.0 + version: 4.9.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.8.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.9.0-pyha770c72_0.conda hash: - md5: 5b1be40a26d10a06f6d4f1f9e19fa0c7 - sha256: 38d16b5c53ec1af845d37d22e7bb0e6c934c7f19499123507c5a470f6f8b7dde + md5: a92a6440c3fe7052d63244f3aba2a4a7 + sha256: f3c5be8673bfd905c4665efcb27fa50192f24f84fa8eff2f19cba5d09753d905 category: main optional: false - name: typing_extensions - version: 4.8.0 + version: 4.9.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.8.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.9.0-pyha770c72_0.conda hash: - md5: 5b1be40a26d10a06f6d4f1f9e19fa0c7 - sha256: 38d16b5c53ec1af845d37d22e7bb0e6c934c7f19499123507c5a470f6f8b7dde + md5: a92a6440c3fe7052d63244f3aba2a4a7 + sha256: f3c5be8673bfd905c4665efcb27fa50192f24f84fa8eff2f19cba5d09753d905 category: main optional: false - name: typing_inspect diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index b13e20814c..d49f5af20a 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -22,7 +22,7 @@ dependencies: - libbrotlicommon=1.1.0=h0dc2134_1 - libcxx=16.0.6=hd57cbcb_0 - libdeflate=1.19=ha4e1b8e_0 - - libev=4.33=haf1e3a3_1 + - libev=4.33=h10d778d_2 - libexpat=2.5.0=hf0c8a7f_1 - libffi=3.4.2=h0d85af4_5 - libiconv=1.17=hac89ed1_0 @@ -70,7 +70,7 @@ dependencies: - lz4-c=1.9.4=hf0c8a7f_0 - ncurses=6.4=h93d8f39_2 - nspr=4.35=hea0b92c_0 - - openssl=3.1.4=hd75f5a5_0 + - openssl=3.2.0=hd75f5a5_1 - pandoc=3.1.3=h9d075a6_0 - pcre2=10.42=h0ad2156_0 - pixman=0.42.2=he965462_0 @@ -93,7 +93,7 @@ dependencies: - libglib=2.78.3=h198397b_0 - libkml=1.3.0=hab3ca0e_1018 - libllvm15=15.0.7=he4b1e75_3 - - libnghttp2=1.58.0=h64cf6d3_0 + - libnghttp2=1.58.0=h64cf6d3_1 - libprotobuf=4.24.4=h0ee05dc_0 - libre2-11=2023.06.02=h4694dbf_0 - librttopo=1.1.0=hf05f67e_15 @@ -120,7 +120,7 @@ dependencies: - libwebp=1.3.2=h44782d1_1 - openjpeg=2.5.0=ha4da562_3 - orc=1.9.0=hd1092d7_4 - - prettier=3.1.0=hbd11d21_0 + - prettier=3.1.1=hbd11d21_0 - python=3.11.6=h30d4d87_0_cpython - re2=2023.06.02=hd34609a_0 - sqlite=3.44.2=h7461747_0 @@ -152,7 +152,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_0 - crashtest=0.4.1=pyhd8ed1ab_0 - cycler=0.12.1=pyhd8ed1ab_0 - - dagster-pipes=1.5.10=pyhd8ed1ab_0 + - dagster-pipes=1.5.11=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - debugpy=1.8.0=py311hdf8f085_1 - decorator=5.1.1=pyhd8ed1ab_0 @@ -169,7 +169,7 @@ dependencies: - frozenlist=1.4.0=py311h2725bcf_1 - fsspec=2023.12.1=pyhca7485f_0 - google-cloud-sdk=456.0.0=py311h6eed73b_0 - - greenlet=3.0.1=py311hd39e593_0 + - greenlet=3.0.2=py311hd39e593_0 - hpack=4.0.0=pyh9f0ad1d_0 - httptools=0.6.1=py311he705e18_0 - humanfriendly=10.0=pyhd8ed1ab_6 @@ -187,10 +187,10 @@ dependencies: - jupyterlab_widgets=3.0.9=pyhd8ed1ab_0 - kiwisolver=1.4.5=py311h5fe6e05_1 - libblas=3.9.0=20_osx64_openblas - - libcurl=8.4.0=h726d00d_0 + - libcurl=8.5.0=h726d00d_0 - libgd=2.3.3=h0dceb68_9 - libgrpc=1.59.2=ha7f534c_0 - - libpq=16.1=h6dd4ff7_0 + - libpq=16.1=ha925e61_7 - llvmlite=0.41.1=py311hb5c2e0a_0 - locket=1.0.0=pyhd8ed1ab_0 - lxml=4.9.3=py311h719c1e2_2 @@ -270,7 +270,7 @@ dependencies: - traitlets=5.14.0=pyhd8ed1ab_0 - types-python-dateutil=2.8.19.14=pyhd8ed1ab_0 - types-pyyaml=6.0.12.12=pyhd8ed1ab_0 - - typing_extensions=4.8.0=pyha770c72_0 + - typing_extensions=4.9.0=pyha770c72_0 - typing_utils=0.1.0=pyhd8ed1ab_0 - unicodecsv=0.14.1=pyhd8ed1ab_2 - uri-template=1.3.0=pyhd8ed1ab_0 @@ -300,7 +300,7 @@ dependencies: - bleach=6.1.0=pyhd8ed1ab_0 - cached-property=1.5.2=hd8ed1ab_1 - cffi=1.16.0=py311hc0b63fd_0 - - cfitsio=4.3.0=h66f91ea_0 + - cfitsio=4.3.1=h60fb419_0 - click-default-group=1.2.4=pyhd8ed1ab_0 - click-default-group-wheel=1.2.2=pyhd8ed1ab_0 - click-plugins=1.1.1=py_0 @@ -309,7 +309,7 @@ dependencies: - coloredlogs=14.0=pyhd8ed1ab_3 - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311h2725bcf_0 - - curl=8.4.0=h726d00d_0 + - curl=8.5.0=h726d00d_0 - fonttools=4.46.0=py311he705e18_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 @@ -317,9 +317,9 @@ dependencies: - h11=0.14.0=pyhd8ed1ab_0 - h2=4.1.0=pyhd8ed1ab_0 - harfbuzz=8.3.0=hf45c392_0 - - hdf5=1.14.2=nompi_hedada53_100 + - hdf5=1.14.3=nompi_h691f4bf_100 - html5lib=1.1=pyh9f0ad1d_0 - - hypothesis=6.91.0=pyha770c72_0 + - hypothesis=6.92.0=pyha770c72_0 - importlib-metadata=7.0.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 @@ -343,16 +343,16 @@ dependencies: - overrides=7.4.0=pyhd8ed1ab_0 - partd=1.4.1=pyhd8ed1ab_0 - pexpect=4.8.0=pyh1a96a4e_2 - - pint=0.22=pyhd8ed1ab_1 + - pint=0.23=pyhd8ed1ab_0 - pip=23.3.1=pyhd8ed1ab_0 - - poppler=23.11.0=hdd5a5e8_0 - - postgresql=16.1=h413614c_0 + - poppler=23.12.0=hdd5a5e8_0 + - postgresql=16.1=h413614c_7 - proj=9.3.0=h23b96cc_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h021eaf5_0 - - psycopg2=2.9.7=py311h187f0af_1 + - psycopg2=2.9.9=py311h187f0af_0 - pyasn1-modules=0.3.0=pyhd8ed1ab_0 - - pyobjc-core=10.0=py311hf110eff_0 + - pyobjc-core=10.1=py311h9b70068_0 - pyproject_hooks=1.0.0=pyhd8ed1ab_0 - pytest=7.4.3=pyhd8ed1ab_0 - python-dateutil=2.8.2=pyhd8ed1ab_0 @@ -367,7 +367,7 @@ dependencies: - terminado=0.18.0=pyh31c8845_0 - tinycss2=1.2.1=pyhd8ed1ab_0 - tqdm=4.66.1=pyhd8ed1ab_0 - - typing-extensions=4.8.0=hd8ed1ab_0 + - typing-extensions=4.9.0=hd8ed1ab_0 - typing_inspect=0.9.0=pyhd8ed1ab_0 - universal_pathlib=0.1.4=pyhd8ed1ab_0 - urllib3=1.26.18=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.9=pyhd8ed1ab_0 + - botocore=1.33.11=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.7=py311h48c7838_1 @@ -407,10 +407,10 @@ dependencies: - pbr=6.0.0=pyhd8ed1ab_0 - pendulum=2.1.2=py311h2725bcf_6 - prompt_toolkit=3.0.41=hd8ed1ab_0 - - psycopg2-binary=2.9.7=pyhd8ed1ab_1 + - psycopg2-binary=2.9.9=pyhd8ed1ab_0 - pybtex=0.24.0=pyhd8ed1ab_2 - pydantic-core=2.14.5=py311h5e0f0e4_0 - - pyobjc-framework-cocoa=10.0=py311hf110eff_1 + - pyobjc-framework-cocoa=10.1=py311h9b70068_0 - pyproj=3.6.1=py311he36daed_4 - pytest-console-scripts=1.4.1=pyhd8ed1ab_0 - pytest-cov=4.1.0=pyhd8ed1ab_0 @@ -450,12 +450,12 @@ dependencies: - jsonschema=4.20.0=pyhd8ed1ab_0 - jupyter_client=8.6.0=pyhd8ed1ab_0 - keyring=24.3.0=py311h6eed73b_0 - - libgdal=3.8.0=h5b0c7d5_6 + - libgdal=3.8.1=hb7f764b_1 - librsvg=2.56.3=hec3db73_0 - numba=0.58.1=py311h32f2313_0 - numexpr=2.8.7=py311h1eadf79_4 - oauthlib=3.2.2=pyhd8ed1ab_0 - - pandas=2.1.3=py311h1eadf79_0 + - pandas=2.1.4=py311h1eadf79_0 - pybtex-docutils=1.0.3=py311h6eed73b_1 - pydantic=2.5.2=pyhd8ed1ab_0 - pyopenssl=23.3.0=pyhd8ed1ab_0 @@ -470,16 +470,16 @@ dependencies: - typeguard=4.1.5=pyhd8ed1ab_1 - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0.post1=h6eed73b_0 - - boto3=1.33.9=pyhd8ed1ab_0 + - boto3=1.33.11=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - - dagster=1.5.10=pyhd8ed1ab_0 + - dagster=1.5.11=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=py311h5646c56_6 + - gdal=3.8.1=py311h5646c56_1 - geopandas-base=0.14.1=pyha770c72_0 - - google-auth=2.25.1=pyhca7485f_0 + - google-auth=2.25.2=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 - graphviz=9.0.0=hee74176_1 - ipykernel=6.26.0=pyh3cd1d5f_0 @@ -489,15 +489,15 @@ dependencies: - matplotlib-base=3.8.2=py311hd316c10_0 - nbformat=5.9.2=pyhd8ed1ab_0 - pandera-core=0.17.2=pyhd8ed1ab_1 - - pre-commit=3.5.0=pyha770c72_0 + - pre-commit=3.6.0=pyha770c72_0 - pydantic-settings=2.1.0=pyhd8ed1ab_1 - requests-oauthlib=1.3.1=pyhd8ed1ab_0 - scikit-learn=1.3.2=py311h66081b9_2 - 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.10=pyhd8ed1ab_0 - - dagster-postgres=0.21.10=pyhd8ed1ab_0 + - dagster-graphql=1.5.11=pyhd8ed1ab_0 + - dagster-postgres=0.21.11=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.10=pyhd8ed1ab_0 + - dagster-webserver=1.5.11=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 9f64382dfb..0f1bf0d83c 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -22,7 +22,7 @@ dependencies: - libbrotlicommon=1.1.0=hb547adb_1 - libcxx=16.0.6=h4653b0c_0 - libdeflate=1.19=hb547adb_0 - - libev=4.33=h642e427_1 + - libev=4.33=h93a5062_2 - libexpat=2.5.0=hb7217d7_1 - libffi=3.4.2=h3422bc3_5 - libiconv=1.17=he4db4b2_0 @@ -71,7 +71,7 @@ dependencies: - lz4-c=1.9.4=hb7217d7_0 - ncurses=6.4=h463b476_2 - nspr=4.35=hb7217d7_0 - - openssl=3.1.4=h0d3ecfb_0 + - openssl=3.2.0=h0d3ecfb_1 - pcre2=10.42=h26f9a81_0 - pixman=0.42.2=h13dd4ca_0 - snappy=1.1.10=h17c5cce_0 @@ -93,7 +93,7 @@ dependencies: - libglib=2.78.3=hb438215_0 - libkml=1.3.0=h1eb4d9f_1018 - libllvm15=15.0.7=h504e6bf_3 - - libnghttp2=1.58.0=ha4dd798_0 + - libnghttp2=1.58.0=ha4dd798_1 - libprotobuf=4.24.4=hc9861d8_0 - libre2-11=2023.06.02=h1753957_0 - librttopo=1.1.0=hc8f776e_15 @@ -120,7 +120,7 @@ dependencies: - libwebp=1.3.2=hf30222e_1 - openjpeg=2.5.0=h4c1507b_3 - orc=1.9.0=h7c018df_4 - - prettier=3.1.0=hb67532b_0 + - prettier=3.1.1=hb67532b_0 - python=3.11.6=h47c9636_0_cpython - re2=2023.06.02=h6135d0a_0 - sqlite=3.44.2=hf2abe2d_0 @@ -152,7 +152,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_0 - crashtest=0.4.1=pyhd8ed1ab_0 - cycler=0.12.1=pyhd8ed1ab_0 - - dagster-pipes=1.5.10=pyhd8ed1ab_0 + - dagster-pipes=1.5.11=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - debugpy=1.8.0=py311ha891d26_1 - decorator=5.1.1=pyhd8ed1ab_0 @@ -169,7 +169,7 @@ dependencies: - frozenlist=1.4.0=py311heffc1b2_1 - fsspec=2023.12.1=pyhca7485f_0 - google-cloud-sdk=456.0.0=py311h267d04e_0 - - greenlet=3.0.1=py311hbaf5611_0 + - greenlet=3.0.2=py311hbaf5611_0 - hpack=4.0.0=pyh9f0ad1d_0 - httptools=0.6.1=py311h05b510d_0 - humanfriendly=10.0=pyhd8ed1ab_6 @@ -187,10 +187,10 @@ dependencies: - jupyterlab_widgets=3.0.9=pyhd8ed1ab_0 - kiwisolver=1.4.5=py311he4fd1f5_1 - libblas=3.9.0=20_osxarm64_openblas - - libcurl=8.4.0=h2d989ff_0 + - libcurl=8.5.0=h2d989ff_0 - libgd=2.3.3=hfdf3952_9 - libgrpc=1.59.2=hbcf6334_0 - - libpq=16.1=hd435d45_0 + - libpq=16.1=h0f8b458_7 - llvmlite=0.41.1=py311hf5d242d_0 - locket=1.0.0=pyhd8ed1ab_0 - lxml=4.9.3=py311hdef8331_2 @@ -270,7 +270,7 @@ dependencies: - traitlets=5.14.0=pyhd8ed1ab_0 - types-python-dateutil=2.8.19.14=pyhd8ed1ab_0 - types-pyyaml=6.0.12.12=pyhd8ed1ab_0 - - typing_extensions=4.8.0=pyha770c72_0 + - typing_extensions=4.9.0=pyha770c72_0 - typing_utils=0.1.0=pyhd8ed1ab_0 - unicodecsv=0.14.1=pyhd8ed1ab_2 - uri-template=1.3.0=pyhd8ed1ab_0 @@ -300,7 +300,7 @@ dependencies: - bleach=6.1.0=pyhd8ed1ab_0 - cached-property=1.5.2=hd8ed1ab_1 - cffi=1.16.0=py311h4a08483_0 - - cfitsio=4.3.0=hca87796_0 + - cfitsio=4.3.1=h808cd33_0 - click-default-group=1.2.4=pyhd8ed1ab_0 - click-default-group-wheel=1.2.2=pyhd8ed1ab_0 - click-plugins=1.1.1=py_0 @@ -309,7 +309,7 @@ dependencies: - coloredlogs=14.0=pyhd8ed1ab_3 - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311heffc1b2_0 - - curl=8.4.0=h2d989ff_0 + - curl=8.5.0=h2d989ff_0 - fonttools=4.46.0=py311h05b510d_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 @@ -317,9 +317,9 @@ dependencies: - h11=0.14.0=pyhd8ed1ab_0 - h2=4.1.0=pyhd8ed1ab_0 - harfbuzz=8.3.0=h8f0ba13_0 - - hdf5=1.14.2=nompi_h3aba7b3_100 + - hdf5=1.14.3=nompi_h5bb55e9_100 - html5lib=1.1=pyh9f0ad1d_0 - - hypothesis=6.91.0=pyha770c72_0 + - hypothesis=6.92.0=pyha770c72_0 - importlib-metadata=7.0.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 @@ -343,16 +343,16 @@ dependencies: - overrides=7.4.0=pyhd8ed1ab_0 - partd=1.4.1=pyhd8ed1ab_0 - pexpect=4.8.0=pyh1a96a4e_2 - - pint=0.22=pyhd8ed1ab_1 + - pint=0.23=pyhd8ed1ab_0 - pip=23.3.1=pyhd8ed1ab_0 - - poppler=23.11.0=hcdd998b_0 - - postgresql=16.1=hc6ab77f_0 + - poppler=23.12.0=hcdd998b_0 + - postgresql=16.1=hc6ab77f_7 - proj=9.3.0=h52fb9d0_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h4d1eceb_0 - - psycopg2=2.9.7=py311h589e011_1 + - psycopg2=2.9.9=py311h589e011_0 - pyasn1-modules=0.3.0=pyhd8ed1ab_0 - - pyobjc-core=10.0=py311hb702dc4_0 + - pyobjc-core=10.1=py311h665608e_0 - pyproject_hooks=1.0.0=pyhd8ed1ab_0 - pytest=7.4.3=pyhd8ed1ab_0 - python-dateutil=2.8.2=pyhd8ed1ab_0 @@ -367,7 +367,7 @@ dependencies: - terminado=0.18.0=pyh31c8845_0 - tinycss2=1.2.1=pyhd8ed1ab_0 - tqdm=4.66.1=pyhd8ed1ab_0 - - typing-extensions=4.8.0=hd8ed1ab_0 + - typing-extensions=4.9.0=hd8ed1ab_0 - typing_inspect=0.9.0=pyhd8ed1ab_0 - universal_pathlib=0.1.4=pyhd8ed1ab_0 - urllib3=1.26.18=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.9=pyhd8ed1ab_0 + - botocore=1.33.11=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.7=py311h08c85a6_1 @@ -407,10 +407,10 @@ dependencies: - pbr=6.0.0=pyhd8ed1ab_0 - pendulum=2.1.2=py311heffc1b2_6 - prompt_toolkit=3.0.41=hd8ed1ab_0 - - psycopg2-binary=2.9.7=pyhd8ed1ab_1 + - psycopg2-binary=2.9.9=pyhd8ed1ab_0 - pybtex=0.24.0=pyhd8ed1ab_2 - pydantic-core=2.14.5=py311h94f323b_0 - - pyobjc-framework-cocoa=10.0=py311hb702dc4_1 + - pyobjc-framework-cocoa=10.1=py311h665608e_0 - pyproj=3.6.1=py311h20a9b75_4 - pytest-console-scripts=1.4.1=pyhd8ed1ab_0 - pytest-cov=4.1.0=pyhd8ed1ab_0 @@ -450,12 +450,12 @@ dependencies: - jsonschema=4.20.0=pyhd8ed1ab_0 - jupyter_client=8.6.0=pyhd8ed1ab_0 - keyring=24.3.0=py311h267d04e_0 - - libgdal=3.8.0=h76f3012_6 + - libgdal=3.8.1=hac00559_1 - librsvg=2.56.3=h0db3404_0 - numba=0.58.1=py311h9ec4793_0 - numexpr=2.8.7=py311h6e08293_4 - oauthlib=3.2.2=pyhd8ed1ab_0 - - pandas=2.1.3=py311h6e08293_0 + - pandas=2.1.4=py311h6e08293_0 - pybtex-docutils=1.0.3=py311h267d04e_1 - pydantic=2.5.2=pyhd8ed1ab_0 - pyopenssl=23.3.0=pyhd8ed1ab_0 @@ -470,16 +470,16 @@ dependencies: - typeguard=4.1.5=pyhd8ed1ab_1 - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0.post1=ha1ab1f8_0 - - boto3=1.33.9=pyhd8ed1ab_0 + - boto3=1.33.11=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - - dagster=1.5.10=pyhd8ed1ab_0 + - dagster=1.5.11=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=py311h32a4f3d_6 + - gdal=3.8.1=py311h32a4f3d_1 - geopandas-base=0.14.1=pyha770c72_0 - - google-auth=2.25.1=pyhca7485f_0 + - google-auth=2.25.2=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 - graphviz=9.0.0=h3face73_1 - ipykernel=6.26.0=pyh3cd1d5f_0 @@ -489,15 +489,15 @@ dependencies: - matplotlib-base=3.8.2=py311hfdba5f6_0 - nbformat=5.9.2=pyhd8ed1ab_0 - pandera-core=0.17.2=pyhd8ed1ab_1 - - pre-commit=3.5.0=pyha770c72_0 + - pre-commit=3.6.0=pyha770c72_0 - pydantic-settings=2.1.0=pyhd8ed1ab_1 - requests-oauthlib=1.3.1=pyhd8ed1ab_0 - scikit-learn=1.3.2=py311ha25ca4d_2 - 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.10=pyhd8ed1ab_0 - - dagster-postgres=0.21.10=pyhd8ed1ab_0 + - dagster-graphql=1.5.11=pyhd8ed1ab_0 + - dagster-postgres=0.21.11=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.10=pyhd8ed1ab_0 + - dagster-webserver=1.5.11=pyhd8ed1ab_0 - geopandas=0.14.1=pyhd8ed1ab_0 - google-cloud-core=2.4.1=pyhd8ed1ab_0 - libarrow-dataset=14.0.1=had9dd58_3_cpu From 99765782473baa57b49a07a80350564612555af3 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Sun, 10 Dec 2023 12:52:15 -0600 Subject: [PATCH 66/80] Cast 0 xbrl workers back to None. Turns out that 0 doesn't work deeper in the stack :-/ --- src/pudl/extract/xbrl.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pudl/extract/xbrl.py b/src/pudl/extract/xbrl.py index 108fa5e025..3343cf6694 100644 --- a/src/pudl/extract/xbrl.py +++ b/src/pudl/extract/xbrl.py @@ -68,6 +68,8 @@ def xbrl2sqlite(context) -> None: clobber = context.op_config["clobber"] batch_size = context.op_config["batch_size"] workers = context.op_config["workers"] + if workers == 0: + workers = None ferc_to_sqlite_settings = context.resources.ferc_to_sqlite_settings datastore = context.resources.datastore datastore = FercXbrlDatastore(datastore) From d5c5b915ce37702620066ecb84dc5dcf23f82bf3 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Sun, 10 Dec 2023 12:53:58 -0600 Subject: [PATCH 67/80] Drop COVERAGE_OPTIONS, everything is now in pyproject.toml --- .github/workflows/pytest.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 34b23a4e91..0c3623d9af 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -18,7 +18,6 @@ env: DAGSTER_HOME: /home/runner/pudl-work/dagster_home/ ETL_CONFIG: src/pudl/package_data/settings/etl_fast.yml ETL_COMMANDLINE_OPTIONS: --gcs-cache-path=gs://zenodo-cache.catalyst.coop - COVERAGE_OPTIONS: --concurrency=multiprocessing jobs: ci-docs: @@ -178,20 +177,20 @@ jobs: env: COVERAGE_FILE: .coverage.ferc_to_sqlite run: | - coverage run ${{ env.COVERAGE_OPTIONS }} \ + coverage run \ src/pudl/ferc_to_sqlite/cli.py --clobber ${{ env.ETL_COMMANDLINE_OPTIONS }} ${{ env.ETL_CONFIG }} - name: Run pudl_etl env: COVERAGE_FILE: .coverage.pudl_etl run: | alembic upgrade head - coverage run ${{ env.COVERAGE_OPTIONS }} \ + coverage run \ src/pudl/cli/etl.py ${{ env.ETL_COMMANDLINE_OPTIONS }} ${{ env.ETL_CONFIG }} - name: Run integration tests env: COVERAGE_FILE: .coverage.pytest run: | - coverage run ${{ env.COVERAGE_OPTIONS }} \ + coverage run \ -m pytest -n auto --live-dbs test/integration - name: Checksum coverage files run: ls .coverage* | xargs md5sum | sort From a8e0eaa63672b650039e380dfa4ccb1fd3e00083 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Tue, 12 Dec 2023 21:14:57 -0600 Subject: [PATCH 68/80] Fix command for pudl_etl --- .github/workflows/pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 0c3623d9af..499e173605 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -185,7 +185,7 @@ jobs: run: | alembic upgrade head coverage run \ - src/pudl/cli/etl.py ${{ env.ETL_COMMANDLINE_OPTIONS }} ${{ env.ETL_CONFIG }} + src/pudl/etl/cli.py ${{ env.ETL_COMMANDLINE_OPTIONS }} ${{ env.ETL_CONFIG }} - name: Run integration tests env: COVERAGE_FILE: .coverage.pytest From c65426b511e545d6896c6182c72e571d9f5e1066 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 13 Dec 2023 11:25:20 -0600 Subject: [PATCH 69/80] run coverage combine when building docs --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 9b952b956b..f36e38ad20 100644 --- a/Makefile +++ b/Makefile @@ -80,6 +80,7 @@ docs-clean: docs-build: docs-clean doc8 docs/ README.rst coverage run ${covargs} -- ${CONDA_PREFIX}/bin/sphinx-build -W -b html docs docs/_build/html + coverage combine coverage xml ######################################################################################## From 50eec4f5858858e673086a470992fbfaafb080ca Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 13 Dec 2023 11:27:29 -0600 Subject: [PATCH 70/80] Use multiprocessing only when dealing with ci-integration. --- .github/workflows/pytest.yml | 8 ++++---- Makefile | 1 - pyproject.toml | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 499e173605..fe0b46824b 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -177,27 +177,27 @@ jobs: env: COVERAGE_FILE: .coverage.ferc_to_sqlite run: | - coverage run \ + coverage run --concurrency=multiprocessing \ src/pudl/ferc_to_sqlite/cli.py --clobber ${{ env.ETL_COMMANDLINE_OPTIONS }} ${{ env.ETL_CONFIG }} - name: Run pudl_etl env: COVERAGE_FILE: .coverage.pudl_etl run: | alembic upgrade head - coverage run \ + coverage run --concurrency=multiprocessing \ src/pudl/etl/cli.py ${{ env.ETL_COMMANDLINE_OPTIONS }} ${{ env.ETL_CONFIG }} - name: Run integration tests env: COVERAGE_FILE: .coverage.pytest run: | - coverage run \ + coverage run --concurrency=multiprocessing \ -m pytest -n auto --live-dbs test/integration - name: Checksum coverage files run: ls .coverage* | xargs md5sum | sort - name: Generate coverage run: | coverage --version - coverage combine --append + coverage combine coverage xml coverage report - name: Upload coverage diff --git a/Makefile b/Makefile index f36e38ad20..9b952b956b 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,6 @@ docs-clean: docs-build: docs-clean doc8 docs/ README.rst coverage run ${covargs} -- ${CONDA_PREFIX}/bin/sphinx-build -W -b html docs docs/_build/html - coverage combine coverage xml ######################################################################################## diff --git a/pyproject.toml b/pyproject.toml index c9c00709d9..1420ef6867 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -312,7 +312,6 @@ omit = [ # Never hit by integration tests: "src/pudl/validate.py", ] -concurrency = ["multiprocessing"] [tool.coverage.paths] # When running pudl tools installed with pip, the sources are imported From da8dbcc1128d231cb791ff3b9121f2095ab50be2 Mon Sep 17 00:00:00 2001 From: rousik Date: Wed, 13 Dec 2023 17:29:44 +0000 Subject: [PATCH 71/80] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 52 +- environments/conda-lock.yml | 725 +++++++++++++------------- environments/conda-osx-64.lock.yml | 50 +- environments/conda-osx-arm64.lock.yml | 50 +- 4 files changed, 439 insertions(+), 438 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index 5d67d564c7..ad9c37ed2b 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -47,7 +47,7 @@ dependencies: - libexpat=2.5.0=hcb278e6_1 - libffi=3.4.2=h7f98852_5 - libgfortran5=13.2.0=ha4646dd_3 - - libiconv=1.17=h166bdaf_0 + - libiconv=1.17=hd590300_1 - libjpeg-turbo=3.0.0=hd590300_1 - libnsl=2.0.1=hd590300_0 - libnuma=2.0.16=h0b41bf4_1 @@ -106,7 +106,7 @@ dependencies: - readline=8.2=h8228510_1 - s2n=1.3.56=h06160fa_0 - tk=8.6.13=noxft_h4845f30_101 - - ucx=1.15.0=hae80064_1 + - ucx=1.15.0=h75e419f_2 - xorg-libsm=1.2.4=h7391055_0 - zeromq=4.3.5=h59595ed_0 - zlib=1.2.13=hd590300_5 @@ -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 @@ -178,9 +178,9 @@ dependencies: - fontconfig=2.14.2=h14ed4e7_0 - freexl=2.0.0=h743c826_0 - frozenlist=1.4.0=py311h459d7ec_1 - - fsspec=2023.12.1=pyhca7485f_0 + - fsspec=2023.12.2=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 @@ -315,7 +315,7 @@ dependencies: - async-lru=2.0.4=pyhd8ed1ab_0 - aws-c-auth=0.7.7=h4faf3ed_1 - aws-c-mqtt=0.9.10=hba57965_1 - - babel=2.13.1=pyhd8ed1ab_0 + - babel=2.14.0=pyhd8ed1ab_0 - beautifulsoup4=4.12.2=pyha770c72_0 - bleach=6.1.0=pyhd8ed1ab_0 - cached-property=1.5.2=hd8ed1ab_1 @@ -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.13=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.7=py311hcb13ee4_1 @@ -418,7 +418,7 @@ dependencies: - httpcore=1.0.2=pyhd8ed1ab_0 - importlib_metadata=7.0.0=hd8ed1ab_0 - jsonschema-specifications=2023.11.2=pyhd8ed1ab_0 - - jupyter_server_terminals=0.4.4=pyhd8ed1ab_1 + - jupyter_server_terminals=0.5.0=pyhd8ed1ab_0 - kealib=1.5.2=hcd42e92_1 - libnetcdf=4.9.2=nompi_h80fb2b6_112 - libspatialite=5.1.0=h7385560_2 @@ -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 @@ -442,13 +442,13 @@ dependencies: - sqlalchemy=2.0.23=py311h459d7ec_0 - stack_data=0.6.2=pyhd8ed1ab_0 - starlette=0.33.0=pyhd8ed1ab_0 - - tiledb=2.16.3=h8c794c1_3 + - tiledb=2.18.2=h8c794c1_0 - ukkonen=1.0.1=py311h9547e67_4 - uvicorn=0.24.0.post1=py311h38be061_0 - watchfiles=0.21.0=py311h46250e7_0 - aiohttp=3.8.6=py311h459d7ec_1 - alembic=1.13.0=pyhd8ed1ab_0 - - arelle-release=2.18.0=pyhd8ed1ab_0 + - arelle-release=2.19.0=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - aws-crt-cpp=0.24.7=h97e63c7_6 - bottleneck=1.3.7=py311h1f0f07a_1 @@ -458,7 +458,7 @@ dependencies: - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - folium=0.15.1=pyhd8ed1ab_0 - - google-resumable-media=2.6.0=pyhd8ed1ab_0 + - google-resumable-media=2.7.0=pyhd8ed1ab_0 - graphene=3.3=pyhd8ed1ab_0 - grpcio-status=1.59.2=pyhd8ed1ab_0 - h3-py=3.7.6=py311hb755f60_1 @@ -468,7 +468,7 @@ dependencies: - isoduration=20.11.0=pyhd8ed1ab_0 - jsonschema=4.20.0=pyhd8ed1ab_0 - jupyter_client=8.6.0=pyhd8ed1ab_0 - - libgdal=3.8.1=hcae7082_1 + - libgdal=3.8.1=hd0089ee_2 - numba=0.58.1=py311h96b013e_0 - numexpr=2.8.7=py311h039bad6_104 - oauthlib=3.2.2=pyhd8ed1ab_0 @@ -489,18 +489,18 @@ 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.13=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 - frictionless=4.40.8=pyh6c4a22f_0 - - gdal=3.8.1=py311h815a124_1 + - gdal=3.8.1=py311h67923c1_2 - 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,11 +516,11 @@ 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 + - 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 @@ -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 @@ -541,12 +541,12 @@ dependencies: - pygraphviz=1.11=py311hbf5cbc9_2 - tableschema=1.19.3=pyh9f0ad1d_0 - datapackage=1.15.2=pyh44b312d_0 - - google-cloud-storage=2.13.0=pyhca7485f_0 + - google-cloud-storage=2.14.0=pyhca7485f_0 - jupyter_server=2.12.1=pyhd8ed1ab_0 - libarrow-dataset=14.0.1=h59595ed_3_cpu - libarrow-flight-sql=14.0.1=h61ff412_3_cpu - nbconvert-pandoc=7.12.0=pyhd8ed1ab_0 - - gcsfs=2023.12.1=pyhd8ed1ab_0 + - gcsfs=2023.12.2.post1=pyhd8ed1ab_0 - jupyter-lsp=2.2.1=pyhd8ed1ab_0 - jupyter-resource-usage=1.0.1=pyhd8ed1ab_0 - jupyterlab_server=2.25.2=pyhd8ed1ab_0 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 3584f3f1ac..3b5727c17c 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -536,7 +536,7 @@ package: category: main optional: false - name: arelle-release - version: 2.18.0 + version: 2.19.0 manager: conda platform: linux-64 dependencies: @@ -549,14 +549,14 @@ package: python: ">=3.8" python-dateutil: 2.* regex: "" - url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.18.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.19.0-pyhd8ed1ab_0.conda hash: - md5: cf492dd79a1d1d1ef2af299da2a604ca - sha256: f3fa253f2a26faa56348acc2a76eaf55778f871b995af429c9636d9159a4b483 + md5: 068ef7fb7bf167aba90230d0e00f92e9 + sha256: 15befe5d71fd89539c54d963cb26baa05c6d511ebbc169b62ff2d72cb180259d category: main optional: false - name: arelle-release - version: 2.18.0 + version: 2.19.0 manager: conda platform: osx-64 dependencies: @@ -569,14 +569,14 @@ package: lxml: 4.* openpyxl: 3.* pyparsing: 3.* - url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.18.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.19.0-pyhd8ed1ab_0.conda hash: - md5: cf492dd79a1d1d1ef2af299da2a604ca - sha256: f3fa253f2a26faa56348acc2a76eaf55778f871b995af429c9636d9159a4b483 + md5: 068ef7fb7bf167aba90230d0e00f92e9 + sha256: 15befe5d71fd89539c54d963cb26baa05c6d511ebbc169b62ff2d72cb180259d category: main optional: false - name: arelle-release - version: 2.18.0 + version: 2.19.0 manager: conda platform: osx-arm64 dependencies: @@ -589,10 +589,10 @@ package: lxml: 4.* openpyxl: 3.* pyparsing: 3.* - url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.18.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.19.0-pyhd8ed1ab_0.conda hash: - md5: cf492dd79a1d1d1ef2af299da2a604ca - sha256: f3fa253f2a26faa56348acc2a76eaf55778f871b995af429c9636d9159a4b483 + md5: 068ef7fb7bf167aba90230d0e00f92e9 + sha256: 15befe5d71fd89539c54d963cb26baa05c6d511ebbc169b62ff2d72cb180259d category: main optional: false - name: argon2-cffi @@ -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 @@ -1625,45 +1625,45 @@ package: category: main optional: false - name: babel - version: 2.13.1 + version: 2.14.0 manager: conda platform: linux-64 dependencies: python: ">=3.7" pytz: "" setuptools: "" - url: https://conda.anaconda.org/conda-forge/noarch/babel-2.13.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/babel-2.14.0-pyhd8ed1ab_0.conda hash: - md5: 3ccff479c246692468f604df9c85ef26 - sha256: 1f955c700db16f65b16c9e9c1613436480d5497970b8030b7a9ebe1620cc2147 + md5: 9669586875baeced8fc30c0826c3270e + sha256: 8584e3da58e92b72641c89ff9b98c51f0d5dbe76e527867804cbdf03ac91d8e6 category: main optional: false - name: babel - version: 2.13.1 + version: 2.14.0 manager: conda platform: osx-64 dependencies: setuptools: "" pytz: "" python: ">=3.7" - url: https://conda.anaconda.org/conda-forge/noarch/babel-2.13.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/babel-2.14.0-pyhd8ed1ab_0.conda hash: - md5: 3ccff479c246692468f604df9c85ef26 - sha256: 1f955c700db16f65b16c9e9c1613436480d5497970b8030b7a9ebe1620cc2147 + md5: 9669586875baeced8fc30c0826c3270e + sha256: 8584e3da58e92b72641c89ff9b98c51f0d5dbe76e527867804cbdf03ac91d8e6 category: main optional: false - name: babel - version: 2.13.1 + version: 2.14.0 manager: conda platform: osx-arm64 dependencies: setuptools: "" pytz: "" python: ">=3.7" - url: https://conda.anaconda.org/conda-forge/noarch/babel-2.13.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/babel-2.14.0-pyhd8ed1ab_0.conda hash: - md5: 3ccff479c246692468f604df9c85ef26 - sha256: 1f955c700db16f65b16c9e9c1613436480d5497970b8030b7a9ebe1620cc2147 + md5: 9669586875baeced8fc30c0826c3270e + sha256: 8584e3da58e92b72641c89ff9b98c51f0d5dbe76e527867804cbdf03ac91d8e6 category: main optional: false - name: backoff @@ -1914,52 +1914,52 @@ package: category: main optional: false - name: boto3 - version: 1.33.11 + version: 1.33.13 manager: conda platform: linux-64 dependencies: - botocore: ">=1.33.11,<1.34.0" + botocore: ">=1.33.13,<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.13-pyhd8ed1ab_0.conda hash: - md5: 5bd2b183cccabe53846acc0bc36a701a - sha256: 9b30f449a8eb6e1e4a2b9ce8cf87d0348a92cad1a0df6819f458376dd2f2424d + md5: 4a1b38a0938b9fc23fb4fc202d832097 + sha256: 01f797f967ac92346a5bffdae165c5d4bacda8405b828fcd58534a0f82287f76 category: main optional: false - name: boto3 - version: 1.33.11 + version: 1.33.13 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.13,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.13-pyhd8ed1ab_0.conda hash: - md5: 5bd2b183cccabe53846acc0bc36a701a - sha256: 9b30f449a8eb6e1e4a2b9ce8cf87d0348a92cad1a0df6819f458376dd2f2424d + md5: 4a1b38a0938b9fc23fb4fc202d832097 + sha256: 01f797f967ac92346a5bffdae165c5d4bacda8405b828fcd58534a0f82287f76 category: main optional: false - name: boto3 - version: 1.33.11 + version: 1.33.13 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.13,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.13-pyhd8ed1ab_0.conda hash: - md5: 5bd2b183cccabe53846acc0bc36a701a - sha256: 9b30f449a8eb6e1e4a2b9ce8cf87d0348a92cad1a0df6819f458376dd2f2424d + md5: 4a1b38a0938b9fc23fb4fc202d832097 + sha256: 01f797f967ac92346a5bffdae165c5d4bacda8405b828fcd58534a0f82287f76 category: main optional: false - name: botocore - version: 1.33.11 + version: 1.33.13 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.13-pyhd8ed1ab_0.conda hash: - md5: 096f907152d65c6f5ba9d437e27a4074 - sha256: b3ddf4459fa887fc76d1a97eaa9da7a31bd84838bd35cbda72ff54949971dc8a + md5: d2566fd9134b6f8b8e69a07e9a1fa17e + sha256: 498d08274880ef279e9a6dd68f66b384d71321d92301fa60330712f9edceab0c category: main optional: false - name: botocore - version: 1.33.11 + version: 1.33.13 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.13-pyhd8ed1ab_0.conda hash: - md5: 096f907152d65c6f5ba9d437e27a4074 - sha256: b3ddf4459fa887fc76d1a97eaa9da7a31bd84838bd35cbda72ff54949971dc8a + md5: d2566fd9134b6f8b8e69a07e9a1fa17e + sha256: 498d08274880ef279e9a6dd68f66b384d71321d92301fa60330712f9edceab0c category: main optional: false - name: botocore - version: 1.33.11 + version: 1.33.13 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.13-pyhd8ed1ab_0.conda hash: - md5: 096f907152d65c6f5ba9d437e27a4074 - sha256: b3ddf4459fa887fc76d1a97eaa9da7a31bd84838bd35cbda72ff54949971dc8a + md5: d2566fd9134b6f8b8e69a07e9a1fa17e + sha256: 498d08274880ef279e9a6dd68f66b384d71321d92301fa60330712f9edceab0c 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 @@ -4298,9 +4298,9 @@ package: asgi-csrf: ">=0.9" itsdangerous: ">=1.1" click-default-group-wheel: ">=1.2.2" + pluggy: ">=1.0" hupper: ">=1.9" uvicorn: ">=0.11" - pluggy: ">=1.0" aiofiles: ">=0.4" asgiref: ">=3.2.10" janus: ">=0.6.2" @@ -4327,9 +4327,9 @@ package: asgi-csrf: ">=0.9" itsdangerous: ">=1.1" click-default-group-wheel: ">=1.2.2" + pluggy: ">=1.0" hupper: ">=1.9" uvicorn: ">=0.11" - pluggy: ">=1.0" aiofiles: ">=0.4" asgiref: ">=3.2.10" janus: ">=0.6.2" @@ -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 @@ -5732,39 +5732,39 @@ package: category: main optional: false - name: fsspec - version: 2023.12.1 + version: 2023.12.2 manager: conda platform: linux-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.1-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.2-pyhca7485f_0.conda hash: - md5: b38946846cdf39f9bce93f75f571d913 - sha256: 929e63a5916a8ebc50199d5404fdcedf75261580d8e229d9a1def57a05ef39eb + md5: bf40f2a8835b78b1f91083d306b493d2 + sha256: 9269a5464698e0fde1f9c78544552817370c26df86e2a5a7518544b6a55ae8ee category: main optional: false - name: fsspec - version: 2023.12.1 + version: 2023.12.2 manager: conda platform: osx-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.1-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.2-pyhca7485f_0.conda hash: - md5: b38946846cdf39f9bce93f75f571d913 - sha256: 929e63a5916a8ebc50199d5404fdcedf75261580d8e229d9a1def57a05ef39eb + md5: bf40f2a8835b78b1f91083d306b493d2 + sha256: 9269a5464698e0fde1f9c78544552817370c26df86e2a5a7518544b6a55ae8ee category: main optional: false - name: fsspec - version: 2023.12.1 + version: 2023.12.2 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.1-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.2-pyhca7485f_0.conda hash: - md5: b38946846cdf39f9bce93f75f571d913 - sha256: 929e63a5916a8ebc50199d5404fdcedf75261580d8e229d9a1def57a05ef39eb + md5: bf40f2a8835b78b1f91083d306b493d2 + sha256: 9269a5464698e0fde1f9c78544552817370c26df86e2a5a7518544b6a55ae8ee category: main optional: false - name: furo @@ -5816,26 +5816,26 @@ package: category: main optional: false - name: gcsfs - version: 2023.12.1 + version: 2023.12.2.post1 manager: conda platform: linux-64 dependencies: aiohttp: "" decorator: ">4.1.2" - fsspec: 2023.12.1 + fsspec: 2023.12.2 google-auth: ">=1.2" google-auth-oauthlib: "" google-cloud-storage: ">1.40" python: ">=3.7" requests: "" - url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.12.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.12.2.post1-pyhd8ed1ab_0.conda hash: - md5: 2f48942fbcd4c2ef56af0fbf3cc56fb0 - sha256: b5e02b08137b4e90d97f4f2d5ff3e06d7076cdba6873061ca2b346576923b093 + md5: adfc8c75a3b3cd33b3758f4c38558d12 + sha256: c7b3dd4c505dde5f5773904db587c1f2b6128cd35f942fb55f8d6af98247814d category: main optional: false - name: gcsfs - version: 2023.12.1 + version: 2023.12.2.post1 manager: conda platform: osx-64 dependencies: @@ -5846,15 +5846,15 @@ package: google-auth: ">=1.2" decorator: ">4.1.2" google-cloud-storage: ">1.40" - fsspec: 2023.12.1 - url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.12.1-pyhd8ed1ab_0.conda + fsspec: 2023.12.2 + url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.12.2.post1-pyhd8ed1ab_0.conda hash: - md5: 2f48942fbcd4c2ef56af0fbf3cc56fb0 - sha256: b5e02b08137b4e90d97f4f2d5ff3e06d7076cdba6873061ca2b346576923b093 + md5: adfc8c75a3b3cd33b3758f4c38558d12 + sha256: c7b3dd4c505dde5f5773904db587c1f2b6128cd35f942fb55f8d6af98247814d category: main optional: false - name: gcsfs - version: 2023.12.1 + version: 2023.12.2.post1 manager: conda platform: osx-arm64 dependencies: @@ -5865,11 +5865,11 @@ package: google-auth: ">=1.2" decorator: ">4.1.2" google-cloud-storage: ">1.40" - fsspec: 2023.12.1 - url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.12.1-pyhd8ed1ab_0.conda + fsspec: 2023.12.2 + url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.12.2.post1-pyhd8ed1ab_0.conda hash: - md5: 2f48942fbcd4c2ef56af0fbf3cc56fb0 - sha256: b5e02b08137b4e90d97f4f2d5ff3e06d7076cdba6873061ca2b346576923b093 + md5: adfc8c75a3b3cd33b3758f4c38558d12 + sha256: c7b3dd4c505dde5f5773904db587c1f2b6128cd35f942fb55f8d6af98247814d category: main optional: false - name: gdal @@ -5877,7 +5877,7 @@ package: manager: conda platform: linux-64 dependencies: - hdf5: ">=1.14.2,<1.14.4.0a0" + hdf5: ">=1.14.3,<1.14.4.0a0" libgcc-ng: ">=12" libgdal: 3.8.1 libstdcxx-ng: ">=12" @@ -5886,10 +5886,10 @@ package: openssl: ">=3.2.0,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/gdal-3.8.1-py311h815a124_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/gdal-3.8.1-py311h67923c1_2.conda hash: - md5: 6e9577466e5f1d18bd659746a5d948b7 - sha256: 6f1de976174089589b1ff7a6dd0d627f107f051a15cb046cb4703c0fc18480e3 + md5: 36bdf6d2872decceaa4e5c97e128351c + sha256: 18e1c4276dfa5c7b11a796f4317a57b288b1bca82dcab5c466c16694773afff2 category: main optional: false - name: gdal @@ -5898,7 +5898,7 @@ package: platform: osx-64 dependencies: __osx: ">=10.9" - hdf5: ">=1.14.2,<1.14.4.0a0" + hdf5: ">=1.14.3,<1.14.4.0a0" libcxx: ">=16.0.6" libgdal: 3.8.1 libxml2: ">=2.11.6,<2.12.0a0" @@ -5906,10 +5906,10 @@ package: openssl: ">=3.2.0,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/gdal-3.8.1-py311h5646c56_1.conda + url: https://conda.anaconda.org/conda-forge/osx-64/gdal-3.8.1-py311h06f03dd_2.conda hash: - md5: 040c7cfdae3033444b9f193f9ac7dda2 - sha256: dc12757089d571dc33a5be6428bb50374fcfe2839230d8bc2b6aecf019545e64 + md5: 9db36469ab5aad24176f0579c83d837c + sha256: 1f821540d3856eb0e341746acd7b506a137214030816b01df96b6272617c8d03 category: main optional: false - name: gdal @@ -5918,7 +5918,7 @@ package: platform: osx-arm64 dependencies: __osx: ">=10.9" - hdf5: ">=1.14.2,<1.14.4.0a0" + hdf5: ">=1.14.3,<1.14.4.0a0" libcxx: ">=16.0.6" libgdal: 3.8.1 libxml2: ">=2.11.6,<2.12.0a0" @@ -5926,10 +5926,10 @@ package: openssl: ">=3.2.0,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/gdal-3.8.1-py311h32a4f3d_1.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/gdal-3.8.1-py311hff5d751_2.conda hash: - md5: 22050ed6dfba916d82f470c4e5c820e9 - sha256: f6f8555e164a37371dc729b9aa0773e60716218ed706cd621b3f5cbfbe2ea51e + md5: bacb4115610a2238864ae8cdbd13e040 + sha256: bc852f0ec27d10a03334f2dceef34dfb8be05f76623a28d3fb51e20b0e096920 category: main optional: false - name: gdk-pixbuf @@ -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 @@ -6617,46 +6617,46 @@ 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 - version: 2.13.0 + version: 2.14.0 manager: conda platform: linux-64 dependencies: @@ -6668,14 +6668,14 @@ package: protobuf: <5.0.0dev python: ">=3.6" requests: ">=2.18.0,<3.0.0dev" - url: https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.13.0-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.14.0-pyhca7485f_0.conda hash: - md5: fa7d4b2576d98b63d8ca84c76052eb95 - sha256: 8aeb7dc1298845316e9289100c5e54a9eb403c4244621d15654266c7dd225f16 + md5: 7b2a2b429fd0b5571544019a6814cfe4 + sha256: 175e88ea6e9cf353d63dfbb0007cb6be9240ab795c38ca4b5d5101b576383698 category: main optional: false - name: google-cloud-storage - version: 2.13.0 + version: 2.14.0 manager: conda platform: osx-64 dependencies: @@ -6687,14 +6687,14 @@ package: protobuf: <5.0.0dev google-resumable-media: ">=2.6.0" google-auth: ">=2.23.3,<3.0dev" - url: https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.13.0-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.14.0-pyhca7485f_0.conda hash: - md5: fa7d4b2576d98b63d8ca84c76052eb95 - sha256: 8aeb7dc1298845316e9289100c5e54a9eb403c4244621d15654266c7dd225f16 + md5: 7b2a2b429fd0b5571544019a6814cfe4 + sha256: 175e88ea6e9cf353d63dfbb0007cb6be9240ab795c38ca4b5d5101b576383698 category: main optional: false - name: google-cloud-storage - version: 2.13.0 + version: 2.14.0 manager: conda platform: osx-arm64 dependencies: @@ -6706,10 +6706,10 @@ package: protobuf: <5.0.0dev google-resumable-media: ">=2.6.0" google-auth: ">=2.23.3,<3.0dev" - url: https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.13.0-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/google-cloud-storage-2.14.0-pyhca7485f_0.conda hash: - md5: fa7d4b2576d98b63d8ca84c76052eb95 - sha256: 8aeb7dc1298845316e9289100c5e54a9eb403c4244621d15654266c7dd225f16 + md5: 7b2a2b429fd0b5571544019a6814cfe4 + sha256: 175e88ea6e9cf353d63dfbb0007cb6be9240ab795c38ca4b5d5101b576383698 category: main optional: false - name: google-crc32c @@ -6759,42 +6759,42 @@ package: category: main optional: false - name: google-resumable-media - version: 2.6.0 + version: 2.7.0 manager: conda platform: linux-64 dependencies: google-crc32c: ">=1.0,<2.0.0dev" python: ">=3.7" - url: https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.6.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.7.0-pyhd8ed1ab_0.conda hash: - md5: 74fd9d08866e60fc412abc8dd7c5486c - sha256: 9e61d4ac7027b6447e83ab4b91fccc4baef6d1ba9490e20d06754254f7616bf5 + md5: 28d1e160d8b2e405b16bb40773135225 + sha256: b7f08e89a491cfaa904328b96c1700da18d2cc33affefc2d15077e03ad4ec8bf category: main optional: false - name: google-resumable-media - version: 2.6.0 + version: 2.7.0 manager: conda platform: osx-64 dependencies: python: ">=3.7" google-crc32c: ">=1.0,<2.0.0dev" - url: https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.6.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.7.0-pyhd8ed1ab_0.conda hash: - md5: 74fd9d08866e60fc412abc8dd7c5486c - sha256: 9e61d4ac7027b6447e83ab4b91fccc4baef6d1ba9490e20d06754254f7616bf5 + md5: 28d1e160d8b2e405b16bb40773135225 + sha256: b7f08e89a491cfaa904328b96c1700da18d2cc33affefc2d15077e03ad4ec8bf category: main optional: false - name: google-resumable-media - version: 2.6.0 + version: 2.7.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.7" google-crc32c: ">=1.0,<2.0.0dev" - url: https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.6.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/google-resumable-media-2.7.0-pyhd8ed1ab_0.conda hash: - md5: 74fd9d08866e60fc412abc8dd7c5486c - sha256: 9e61d4ac7027b6447e83ab4b91fccc4baef6d1ba9490e20d06754254f7616bf5 + md5: 28d1e160d8b2e405b16bb40773135225 + sha256: b7f08e89a491cfaa904328b96c1700da18d2cc33affefc2d15077e03ad4ec8bf category: main optional: false - name: googleapis-common-protos @@ -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 @@ -9795,42 +9795,42 @@ package: category: main optional: false - name: jupyter_server_terminals - version: 0.4.4 + version: 0.5.0 manager: conda platform: linux-64 dependencies: python: ">=3.8" terminado: ">=0.8.3" - url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server_terminals-0.4.4-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server_terminals-0.5.0-pyhd8ed1ab_0.conda hash: - md5: 7c0965e1d4a0ee1529e8eaa03a78a5b3 - sha256: 9f4c5fef9beef9fceed628db7a10b888f3308b37ae257ad3d50046088317ebf1 + md5: 37a8b4098d428ecd40e58f8ec8a8e77d + sha256: b2c769977c258e5a81d541fd526d01083fc6b8c8dfdd4822795a898626bc81e6 category: main optional: false - name: jupyter_server_terminals - version: 0.4.4 + version: 0.5.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" terminado: ">=0.8.3" - url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server_terminals-0.4.4-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server_terminals-0.5.0-pyhd8ed1ab_0.conda hash: - md5: 7c0965e1d4a0ee1529e8eaa03a78a5b3 - sha256: 9f4c5fef9beef9fceed628db7a10b888f3308b37ae257ad3d50046088317ebf1 + md5: 37a8b4098d428ecd40e58f8ec8a8e77d + sha256: b2c769977c258e5a81d541fd526d01083fc6b8c8dfdd4822795a898626bc81e6 category: main optional: false - name: jupyter_server_terminals - version: 0.4.4 + version: 0.5.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" terminado: ">=0.8.3" - url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server_terminals-0.4.4-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server_terminals-0.5.0-pyhd8ed1ab_0.conda hash: - md5: 7c0965e1d4a0ee1529e8eaa03a78a5b3 - sha256: 9f4c5fef9beef9fceed628db7a10b888f3308b37ae257ad3d50046088317ebf1 + md5: 37a8b4098d428ecd40e58f8ec8a8e77d + sha256: b2c769977c258e5a81d541fd526d01083fc6b8c8dfdd4822795a898626bc81e6 category: main optional: false - name: jupyterlab @@ -11513,13 +11513,13 @@ package: geotiff: ">=1.7.1,<1.8.0a0" giflib: ">=5.2.1,<5.3.0a0" hdf4: ">=4.2.15,<4.2.16.0a0" - hdf5: ">=1.14.2,<1.14.4.0a0" + hdf5: ">=1.14.3,<1.14.4.0a0" json-c: ">=0.17,<0.18.0a0" kealib: ">=1.5.2,<1.6.0a0" lerc: ">=4.0.0,<5.0a0" libaec: ">=1.1.2,<2.0a0" libarchive: ">=3.7.2,<3.8.0a0" - libcurl: ">=8.4.0,<9.0a0" + libcurl: ">=8.5.0,<9.0a0" libdeflate: ">=1.19,<1.20.0a0" libexpat: ">=2.5.0,<3.0a0" libgcc-ng: ">=12" @@ -11544,14 +11544,14 @@ package: poppler: ">=23.12.0,<23.13.0a0" postgresql: "" proj: ">=9.3.0,<9.3.1.0a0" - tiledb: ">=2.16,<2.17.0a0" + tiledb: ">=2.18.2,<2.19.0a0" xerces-c: ">=3.2.4,<3.3.0a0" xz: ">=5.2.6,<6.0a0" zstd: ">=1.5.5,<1.6.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/libgdal-3.8.1-hcae7082_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libgdal-3.8.1-hd0089ee_2.conda hash: - md5: e96d24ccc597439cda2859fe948aac77 - sha256: 9d6a19f03ea1437e951ba5e09c12faf11aa47a375a76f80f9bab1d2c3aed4aa9 + md5: feb838eaf49fd1608413759f7b54c74c + sha256: ba4431f8bf3ae13130827c4f81520ce49f9b22f6f44da137b516a1f51b9bdcb8 category: main optional: false - name: libgdal @@ -11567,13 +11567,13 @@ package: geotiff: ">=1.7.1,<1.8.0a0" giflib: ">=5.2.1,<5.3.0a0" hdf4: ">=4.2.15,<4.2.16.0a0" - hdf5: ">=1.14.2,<1.14.4.0a0" + hdf5: ">=1.14.3,<1.14.4.0a0" json-c: ">=0.17,<0.18.0a0" kealib: ">=1.5.2,<1.6.0a0" lerc: ">=4.0.0,<5.0a0" libaec: ">=1.1.2,<2.0a0" libarchive: ">=3.7.2,<3.8.0a0" - libcurl: ">=8.4.0,<9.0a0" + libcurl: ">=8.5.0,<9.0a0" libcxx: ">=16.0.6" libdeflate: ">=1.19,<1.20.0a0" libexpat: ">=2.5.0,<3.0a0" @@ -11596,14 +11596,14 @@ package: poppler: ">=23.12.0,<23.13.0a0" postgresql: "" proj: ">=9.3.0,<9.3.1.0a0" - tiledb: ">=2.16,<2.17.0a0" + tiledb: ">=2.18.2,<2.19.0a0" xerces-c: ">=3.2.4,<3.3.0a0" xz: ">=5.2.6,<6.0a0" zstd: ">=1.5.5,<1.6.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/libgdal-3.8.1-hb7f764b_1.conda + url: https://conda.anaconda.org/conda-forge/osx-64/libgdal-3.8.1-h7bb8e92_2.conda hash: - md5: eee8b19233a243e229af4399af2c4a10 - sha256: efe25d85efe856c1db71e2a40ce9736e07cf5c06e53285248866a62a43363a0d + md5: bf37886bd95ab0afcf6e07b51ae6b813 + sha256: b34bd433ae5a2378e472daa2ffdef4201ecbd654b1c62261e6c77d948efb689e category: main optional: false - name: libgdal @@ -11619,13 +11619,13 @@ package: geotiff: ">=1.7.1,<1.8.0a0" giflib: ">=5.2.1,<5.3.0a0" hdf4: ">=4.2.15,<4.2.16.0a0" - hdf5: ">=1.14.2,<1.14.4.0a0" + hdf5: ">=1.14.3,<1.14.4.0a0" json-c: ">=0.17,<0.18.0a0" kealib: ">=1.5.2,<1.6.0a0" lerc: ">=4.0.0,<5.0a0" libaec: ">=1.1.2,<2.0a0" libarchive: ">=3.7.2,<3.8.0a0" - libcurl: ">=8.4.0,<9.0a0" + libcurl: ">=8.5.0,<9.0a0" libcxx: ">=16.0.6" libdeflate: ">=1.19,<1.20.0a0" libexpat: ">=2.5.0,<3.0a0" @@ -11648,14 +11648,14 @@ package: poppler: ">=23.12.0,<23.13.0a0" postgresql: "" proj: ">=9.3.0,<9.3.1.0a0" - tiledb: ">=2.16,<2.17.0a0" + tiledb: ">=2.18.2,<2.19.0a0" xerces-c: ">=3.2.4,<3.3.0a0" xz: ">=5.2.6,<6.0a0" zstd: ">=1.5.5,<1.6.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/libgdal-3.8.1-hac00559_1.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/libgdal-3.8.1-h1ac08d9_2.conda hash: - md5: a65e999f85ab35663d7e9753ca7eaa13 - sha256: 636ff5b1f95edc083dc7b3ba9f35a87fe18695349b1bd57ae72c54d00ef5034e + md5: 01eb49a277330eaa5aba72efcfd78b85 + sha256: 8b4f6b74de89820dc02905ab97e0277ae654c062dd7b2106829bf9b7ffb545ed category: main optional: false - name: libgfortran @@ -11918,11 +11918,11 @@ package: manager: conda platform: linux-64 dependencies: - libgcc-ng: ">=10.3.0" - url: https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.17-h166bdaf_0.tar.bz2 + libgcc-ng: ">=12" + url: https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.17-hd590300_1.conda hash: - md5: b62b52da46c39ee2bc3c162ac7f1804d - sha256: 6a81ebac9f1aacdf2b4f945c87ad62b972f0f69c8e0981d68e111739e6720fd7 + md5: 4b06b43d0eca61db2899e4d7a289c302 + sha256: a9364735ef2542558ed59aa5f404707dab674df465cbdf312edeaf5e827b55ed category: main optional: false - name: libiconv @@ -11930,10 +11930,10 @@ package: manager: conda platform: osx-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/osx-64/libiconv-1.17-hac89ed1_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/osx-64/libiconv-1.17-hd75f5a5_1.conda hash: - md5: 691d103d11180486154af49c037b7ed9 - sha256: 4a3294037d595754f7da7c11a41f3922f995aaa333f3cb66f02d8afa032a7bc2 + md5: c4069fa5c051d41093d3fd52caffa285 + sha256: c479e7e0df4a59117ee02152fb85565aa6e4091bbb8e044f3367e52b0ccd8970 category: main optional: false - name: libiconv @@ -11941,10 +11941,10 @@ package: manager: conda platform: osx-arm64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/osx-arm64/libiconv-1.17-he4db4b2_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/osx-arm64/libiconv-1.17-h0d3ecfb_1.conda hash: - md5: 686f9c755574aa221f29fbcf36a67265 - sha256: 2eb33065783b802f71d52bef6f15ce0fafea0adc8506f10ebd0d490244087bec + md5: df3fbfc1fddc8fa40122206a4e47ea4e + sha256: d407ebd1e72ebb20716ea325cdebdd018bdc3c3d3424e67825db3eaa8809164e category: main optional: false - name: libjpeg-turbo @@ -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 @@ -21533,65 +21533,66 @@ package: category: main optional: false - name: tiledb - version: 2.16.3 + version: 2.18.2 manager: conda platform: linux-64 dependencies: bzip2: ">=1.0.8,<2.0a0" - libabseil: ">=20230802.0,<20230803.0a0" + libabseil: ">=20230802.1,<20230803.0a0" libgcc-ng: ">=12" libgoogle-cloud: ">=2.12.0,<2.13.0a0" libstdcxx-ng: ">=12" - libxml2: ">=2.11.5,<2.12.0a0" + libxml2: ">=2.11.6,<2.12.0a0" libzlib: ">=1.2.13,<1.3.0a0" lz4-c: ">=1.9.3,<1.10.0a0" - openssl: ">=3.1.2,<4.0a0" + openssl: ">=3.2.0,<4.0a0" zstd: ">=1.5.5,<1.6.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/tiledb-2.16.3-h8c794c1_3.conda + url: https://conda.anaconda.org/conda-forge/linux-64/tiledb-2.18.2-h8c794c1_0.conda hash: - md5: 7de728789b0aba16018f726dc5ddbec2 - sha256: f021df4b9cfd1a54aac87a6c0bac604edc8ffb36d5b2c4aa20bf2d759ae04a11 + md5: e824b951c15a74d0a2d3e42676370791 + sha256: c73704c36661193a040e4f1c454ef181277b97d3dc225febac9f3093e60f36bf category: main optional: false - name: tiledb - version: 2.16.3 + version: 2.18.2 manager: conda platform: osx-64 dependencies: - __osx: ">=10.13" + __osx: ">=10.9" bzip2: ">=1.0.8,<2.0a0" - libabseil: ">=20230802.0,<20230803.0a0" - libcxx: ">=15.0.7" + libabseil: ">=20230802.1,<20230803.0a0" + libcxx: ">=16.0.6" libgoogle-cloud: ">=2.12.0,<2.13.0a0" - libxml2: ">=2.11.5,<2.12.0a0" + libxml2: ">=2.11.6,<2.12.0a0" libzlib: ">=1.2.13,<1.3.0a0" lz4-c: ">=1.9.3,<1.10.0a0" - openssl: ">=3.1.2,<4.0a0" + openssl: ">=3.2.0,<4.0a0" zstd: ">=1.5.5,<1.6.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/tiledb-2.16.3-hd3a41d5_3.conda + url: https://conda.anaconda.org/conda-forge/osx-64/tiledb-2.18.2-h9fe0a6a_0.conda hash: - md5: 53c2d2746f21a60d0c498c36fb32ec56 - sha256: 9144ad40adb982107dd4f5084d1e488b216025eed91a3feeb3506ee4d5bc98dd + md5: 0615fdde1c114affe6a0250b9d342328 + sha256: daccccc133c363360379e9efa525835cd20ed8ca12381641ccb1353c3d7c34c0 category: main optional: false - name: tiledb - version: 2.16.3 + version: 2.18.2 manager: conda platform: osx-arm64 dependencies: + __osx: ">=10.9" bzip2: ">=1.0.8,<2.0a0" - libabseil: ">=20230802.0,<20230803.0a0" - libcxx: ">=15.0.7" + libabseil: ">=20230802.1,<20230803.0a0" + libcxx: ">=16.0.6" libgoogle-cloud: ">=2.12.0,<2.13.0a0" - libxml2: ">=2.11.5,<2.12.0a0" + libxml2: ">=2.11.6,<2.12.0a0" libzlib: ">=1.2.13,<1.3.0a0" lz4-c: ">=1.9.3,<1.10.0a0" - openssl: ">=3.1.2,<4.0a0" + openssl: ">=3.2.0,<4.0a0" zstd: ">=1.5.5,<1.6.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/tiledb-2.16.3-he15c4da_3.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/tiledb-2.18.2-h555b8a3_0.conda hash: - md5: fcf3711dd1817fd6e8ab59be86aa8dd9 - sha256: c2576bf0344b441f4c7d9212cfa68fe64de88dc9da735cb541c7faa0595d260f + md5: c223398e541fce9cfe1abe47df687909 + sha256: da9227601b2bf5607fee33b62ed364561363f994ba41fd82e48d45a2f584210e category: main optional: false - name: timezonefinder @@ -22408,11 +22409,11 @@ package: libgcc-ng: ">=12" libnuma: ">=2.0.16,<3.0a0" libstdcxx-ng: ">=12" - rdma-core: ">=48.0" - url: https://conda.anaconda.org/conda-forge/linux-64/ucx-1.15.0-hae80064_1.conda + rdma-core: ">=49" + url: https://conda.anaconda.org/conda-forge/linux-64/ucx-1.15.0-h75e419f_2.conda hash: - md5: c0413425844278251c1cc9459386339b - sha256: f511a735bf7a0b56c5ae48839e2248d46a922ffc6ad8ea2da7617485faa70c6f + md5: 5798de4587dc70fa6db81663e79f176a + sha256: 81fdea1a5ee5075bf4cbdc665b08d0e2ee9d3476f9d16acc58e2bbd913e9197b category: main optional: false - name: ukkonen diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index d49f5af20a..a64964cc19 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -25,7 +25,7 @@ dependencies: - libev=4.33=h10d778d_2 - libexpat=2.5.0=hf0c8a7f_1 - libffi=3.4.2=h0d85af4_5 - - libiconv=1.17=hac89ed1_0 + - libiconv=1.17=hd75f5a5_1 - libjpeg-turbo=3.0.0=h0dc2134_1 - libsodium=1.0.18=hbcb3906_1 - libutf8proc=2.8.0=hb7f2c08_0 @@ -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 @@ -167,8 +167,8 @@ dependencies: - executing=2.0.1=pyhd8ed1ab_0 - 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 + - fsspec=2023.12.2=pyhca7485f_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 @@ -295,7 +295,7 @@ dependencies: - asttokens=2.4.1=pyhd8ed1ab_0 - async-lru=2.0.4=pyhd8ed1ab_0 - aws-c-s3=0.4.1=h70a162a_0 - - babel=2.13.1=pyhd8ed1ab_0 + - babel=2.14.0=pyhd8ed1ab_0 - beautifulsoup4=4.12.2=pyha770c72_0 - bleach=6.1.0=pyhd8ed1ab_0 - cached-property=1.5.2=hd8ed1ab_1 @@ -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.13=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.7=py311h48c7838_1 @@ -397,7 +397,7 @@ dependencies: - httpcore=1.0.2=pyhd8ed1ab_0 - importlib_metadata=7.0.0=hd8ed1ab_0 - jsonschema-specifications=2023.11.2=pyhd8ed1ab_0 - - jupyter_server_terminals=0.4.4=pyhd8ed1ab_1 + - jupyter_server_terminals=0.5.0=pyhd8ed1ab_0 - kealib=1.5.2=h052fcf7_1 - libnetcdf=4.9.2=nompi_h6a32802_112 - libspatialite=5.1.0=hf63aa75_2 @@ -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 @@ -422,13 +422,13 @@ dependencies: - sqlalchemy=2.0.23=py311he705e18_0 - stack_data=0.6.2=pyhd8ed1ab_0 - starlette=0.33.0=pyhd8ed1ab_0 - - tiledb=2.16.3=hd3a41d5_3 + - tiledb=2.18.2=h9fe0a6a_0 - ukkonen=1.0.1=py311h5fe6e05_4 - uvicorn=0.24.0.post1=py311h6eed73b_0 - watchfiles=0.21.0=py311h5e0f0e4_0 - aiohttp=3.8.6=py311he705e18_1 - alembic=1.13.0=pyhd8ed1ab_0 - - arelle-release=2.18.0=pyhd8ed1ab_0 + - arelle-release=2.19.0=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - aws-sdk-cpp=1.11.182=h28d282b_7 - bottleneck=1.3.7=py311h4a70a88_1 @@ -438,10 +438,10 @@ dependencies: - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - folium=0.15.1=pyhd8ed1ab_0 - - google-resumable-media=2.6.0=pyhd8ed1ab_0 + - google-resumable-media=2.7.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 @@ -450,7 +450,7 @@ dependencies: - jsonschema=4.20.0=pyhd8ed1ab_0 - jupyter_client=8.6.0=pyhd8ed1ab_0 - keyring=24.3.0=py311h6eed73b_0 - - libgdal=3.8.1=hb7f764b_1 + - libgdal=3.8.1=h7bb8e92_2 - librsvg=2.56.3=hec3db73_0 - numba=0.58.1=py311h32f2313_0 - numexpr=2.8.7=py311h1eadf79_4 @@ -470,14 +470,14 @@ 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.13=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 - frictionless=4.40.8=pyh6c4a22f_0 - - gdal=3.8.1=py311h5646c56_1 + - gdal=3.8.1=py311h06f03dd_2 - geopandas-base=0.14.1=pyha770c72_0 - google-auth=2.25.2=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 @@ -496,11 +496,11 @@ 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 + - 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 @@ -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 @@ -521,11 +521,11 @@ dependencies: - nbconvert-core=7.12.0=pyhd8ed1ab_0 - tableschema=1.19.3=pyh9f0ad1d_0 - datapackage=1.15.2=pyh44b312d_0 - - google-cloud-storage=2.13.0=pyhca7485f_0 + - google-cloud-storage=2.14.0=pyhca7485f_0 - jupyter_server=2.12.1=pyhd8ed1ab_0 - libarrow-substrait=14.0.1=h2cc6c1c_3_cpu - nbconvert-pandoc=7.12.0=pyhd8ed1ab_0 - - gcsfs=2023.12.1=pyhd8ed1ab_0 + - gcsfs=2023.12.2.post1=pyhd8ed1ab_0 - jupyter-lsp=2.2.1=pyhd8ed1ab_0 - jupyter-resource-usage=1.0.1=pyhd8ed1ab_0 - jupyterlab_server=2.25.2=pyhd8ed1ab_0 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 0f1bf0d83c..067be46121 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -25,7 +25,7 @@ dependencies: - libev=4.33=h93a5062_2 - libexpat=2.5.0=hb7217d7_1 - libffi=3.4.2=h3422bc3_5 - - libiconv=1.17=he4db4b2_0 + - libiconv=1.17=h0d3ecfb_1 - libjpeg-turbo=3.0.0=hb547adb_1 - libsodium=1.0.18=h27ca646_1 - libutf8proc=2.8.0=h1a8c8d9_0 @@ -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 @@ -167,8 +167,8 @@ dependencies: - executing=2.0.1=pyhd8ed1ab_0 - 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 + - fsspec=2023.12.2=pyhca7485f_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 @@ -295,7 +295,7 @@ dependencies: - asttokens=2.4.1=pyhd8ed1ab_0 - async-lru=2.0.4=pyhd8ed1ab_0 - aws-c-s3=0.4.1=ha5b923c_0 - - babel=2.13.1=pyhd8ed1ab_0 + - babel=2.14.0=pyhd8ed1ab_0 - beautifulsoup4=4.12.2=pyha770c72_0 - bleach=6.1.0=pyhd8ed1ab_0 - cached-property=1.5.2=hd8ed1ab_1 @@ -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.13=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.7=py311h08c85a6_1 @@ -397,7 +397,7 @@ dependencies: - httpcore=1.0.2=pyhd8ed1ab_0 - importlib_metadata=7.0.0=hd8ed1ab_0 - jsonschema-specifications=2023.11.2=pyhd8ed1ab_0 - - jupyter_server_terminals=0.4.4=pyhd8ed1ab_1 + - jupyter_server_terminals=0.5.0=pyhd8ed1ab_0 - kealib=1.5.2=h47b5e36_1 - libnetcdf=4.9.2=nompi_hb2fb864_112 - libspatialite=5.1.0=h66af7d6_2 @@ -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 @@ -422,13 +422,13 @@ dependencies: - sqlalchemy=2.0.23=py311h05b510d_0 - stack_data=0.6.2=pyhd8ed1ab_0 - starlette=0.33.0=pyhd8ed1ab_0 - - tiledb=2.16.3=he15c4da_3 + - tiledb=2.18.2=h555b8a3_0 - ukkonen=1.0.1=py311he4fd1f5_4 - uvicorn=0.24.0.post1=py311h267d04e_0 - watchfiles=0.21.0=py311h94f323b_0 - aiohttp=3.8.6=py311h05b510d_1 - alembic=1.13.0=pyhd8ed1ab_0 - - arelle-release=2.18.0=pyhd8ed1ab_0 + - arelle-release=2.19.0=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - aws-sdk-cpp=1.11.182=h31542fa_7 - bottleneck=1.3.7=py311hb49d859_1 @@ -438,10 +438,10 @@ dependencies: - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - folium=0.15.1=pyhd8ed1ab_0 - - google-resumable-media=2.6.0=pyhd8ed1ab_0 + - google-resumable-media=2.7.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 @@ -450,7 +450,7 @@ dependencies: - jsonschema=4.20.0=pyhd8ed1ab_0 - jupyter_client=8.6.0=pyhd8ed1ab_0 - keyring=24.3.0=py311h267d04e_0 - - libgdal=3.8.1=hac00559_1 + - libgdal=3.8.1=h1ac08d9_2 - librsvg=2.56.3=h0db3404_0 - numba=0.58.1=py311h9ec4793_0 - numexpr=2.8.7=py311h6e08293_4 @@ -470,14 +470,14 @@ 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.13=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 - frictionless=4.40.8=pyh6c4a22f_0 - - gdal=3.8.1=py311h32a4f3d_1 + - gdal=3.8.1=py311hff5d751_2 - geopandas-base=0.14.1=pyha770c72_0 - google-auth=2.25.2=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 @@ -496,11 +496,11 @@ 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 + - 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 @@ -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 @@ -521,11 +521,11 @@ dependencies: - nbconvert-core=7.12.0=pyhd8ed1ab_0 - tableschema=1.19.3=pyh9f0ad1d_0 - datapackage=1.15.2=pyh44b312d_0 - - google-cloud-storage=2.13.0=pyhca7485f_0 + - google-cloud-storage=2.14.0=pyhca7485f_0 - jupyter_server=2.12.1=pyhd8ed1ab_0 - libarrow-substrait=14.0.1=h594d712_3_cpu - nbconvert-pandoc=7.12.0=pyhd8ed1ab_0 - - gcsfs=2023.12.1=pyhd8ed1ab_0 + - gcsfs=2023.12.2.post1=pyhd8ed1ab_0 - jupyter-lsp=2.2.1=pyhd8ed1ab_0 - jupyter-resource-usage=1.0.1=pyhd8ed1ab_0 - jupyterlab_server=2.25.2=pyhd8ed1ab_0 From 5c9a194a385507c1d92719c2179d02f78d8b027f Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Wed, 13 Dec 2023 14:58:26 -0600 Subject: [PATCH 72/80] Blablabla. --- Makefile | 1 + pyproject.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 9b952b956b..f36e38ad20 100644 --- a/Makefile +++ b/Makefile @@ -80,6 +80,7 @@ docs-clean: docs-build: docs-clean doc8 docs/ README.rst coverage run ${covargs} -- ${CONDA_PREFIX}/bin/sphinx-build -W -b html docs docs/_build/html + coverage combine coverage xml ######################################################################################## diff --git a/pyproject.toml b/pyproject.toml index 1420ef6867..fd5fe064de 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -312,6 +312,7 @@ omit = [ # Never hit by integration tests: "src/pudl/validate.py", ] +concurrency=["multiprocessing"] [tool.coverage.paths] # When running pudl tools installed with pip, the sources are imported From 72ce2f237065d296ef6d4b8f61180000539c2bda Mon Sep 17 00:00:00 2001 From: rousik Date: Wed, 13 Dec 2023 21:00:18 +0000 Subject: [PATCH 73/80] 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 ad9c37ed2b..c1e746c6af 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -477,7 +477,7 @@ dependencies: - pybtex-docutils=1.0.3=py311h38be061_1 - pydantic=2.5.2=pyhd8ed1ab_0 - pyopenssl=23.3.0=pyhd8ed1ab_0 - - readthedocs-sphinx-ext=2.2.3=pyhd8ed1ab_0 + - readthedocs-sphinx-ext=2.2.4=pyhd8ed1ab_0 - requests-toolbelt=0.10.1=pyhd8ed1ab_0 - responses=0.24.1=pyhd8ed1ab_0 - s3transfer=0.8.2=pyhd8ed1ab_0 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 3b5727c17c..81e9736e0e 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -18998,7 +18998,7 @@ package: category: main optional: false - name: readthedocs-sphinx-ext - version: 2.2.3 + version: 2.2.4 manager: conda platform: linux-64 dependencies: @@ -19006,14 +19006,14 @@ package: packaging: "" python: ">=3.6" requests: "" - url: https://conda.anaconda.org/conda-forge/noarch/readthedocs-sphinx-ext-2.2.3-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/readthedocs-sphinx-ext-2.2.4-pyhd8ed1ab_0.conda hash: - md5: 6bc1a00f5502f9ed13526e4c6bea6900 - sha256: 464cfb706266a2dfbee7d0226c83114c9868a65f9fc7e05b223faac8bd2b3f8e + md5: 86dd35106fb71b2e2060b557e3bdd49a + sha256: 9c0568d4df3b34a54e4c0a3c9780bf947797e4d453ad6c1511467eae188f8232 category: main optional: false - name: readthedocs-sphinx-ext - version: 2.2.3 + version: 2.2.4 manager: conda platform: osx-64 dependencies: @@ -19021,14 +19021,14 @@ package: packaging: "" python: ">=3.6" jinja2: ">=2.9" - url: https://conda.anaconda.org/conda-forge/noarch/readthedocs-sphinx-ext-2.2.3-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/readthedocs-sphinx-ext-2.2.4-pyhd8ed1ab_0.conda hash: - md5: 6bc1a00f5502f9ed13526e4c6bea6900 - sha256: 464cfb706266a2dfbee7d0226c83114c9868a65f9fc7e05b223faac8bd2b3f8e + md5: 86dd35106fb71b2e2060b557e3bdd49a + sha256: 9c0568d4df3b34a54e4c0a3c9780bf947797e4d453ad6c1511467eae188f8232 category: main optional: false - name: readthedocs-sphinx-ext - version: 2.2.3 + version: 2.2.4 manager: conda platform: osx-arm64 dependencies: @@ -19036,10 +19036,10 @@ package: packaging: "" python: ">=3.6" jinja2: ">=2.9" - url: https://conda.anaconda.org/conda-forge/noarch/readthedocs-sphinx-ext-2.2.3-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/readthedocs-sphinx-ext-2.2.4-pyhd8ed1ab_0.conda hash: - md5: 6bc1a00f5502f9ed13526e4c6bea6900 - sha256: 464cfb706266a2dfbee7d0226c83114c9868a65f9fc7e05b223faac8bd2b3f8e + md5: 86dd35106fb71b2e2060b557e3bdd49a + sha256: 9c0568d4df3b34a54e4c0a3c9780bf947797e4d453ad6c1511467eae188f8232 category: main optional: false - name: recordlinkage diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index a64964cc19..583c37d839 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -459,7 +459,7 @@ dependencies: - pybtex-docutils=1.0.3=py311h6eed73b_1 - pydantic=2.5.2=pyhd8ed1ab_0 - pyopenssl=23.3.0=pyhd8ed1ab_0 - - readthedocs-sphinx-ext=2.2.3=pyhd8ed1ab_0 + - readthedocs-sphinx-ext=2.2.4=pyhd8ed1ab_0 - requests-toolbelt=0.10.1=pyhd8ed1ab_0 - responses=0.24.1=pyhd8ed1ab_0 - s3transfer=0.8.2=pyhd8ed1ab_0 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 067be46121..a77431c14f 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -459,7 +459,7 @@ dependencies: - pybtex-docutils=1.0.3=py311h267d04e_1 - pydantic=2.5.2=pyhd8ed1ab_0 - pyopenssl=23.3.0=pyhd8ed1ab_0 - - readthedocs-sphinx-ext=2.2.3=pyhd8ed1ab_0 + - readthedocs-sphinx-ext=2.2.4=pyhd8ed1ab_0 - requests-toolbelt=0.10.1=pyhd8ed1ab_0 - responses=0.24.1=pyhd8ed1ab_0 - s3transfer=0.8.2=pyhd8ed1ab_0 From 6d032f9f3e039cb5aee080266bb5106c783b3816 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Thu, 14 Dec 2023 11:36:31 -0600 Subject: [PATCH 74/80] Try to tune coverage parameters once more. --- pyproject.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index fd5fe064de..9cd7de593b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -301,7 +301,7 @@ curl = ">=8.4.0" [tool.coverage.run] # See note above on need to specify separate sources for pytest-coverage and coverage. -source = ["src/pudl/", "test/integration/", "test/unit/"] +# source = ["src/pudl/", "test/integration/", "test/unit/"] include = [ "src/pudl/**", "test/integration/**", @@ -312,14 +312,16 @@ omit = [ # Never hit by integration tests: "src/pudl/validate.py", ] +sigterm = true concurrency=["multiprocessing"] +debug = ["config", "trace"] [tool.coverage.paths] # When running pudl tools installed with pip, the sources are imported # from package-data/pudl directory. The following maps this to raw # source files. pudl_sources = [ - "src/pudl", + "src/pudl/", "*/site-packages/pudl/", ] From 892adac5b6cf89aaac8930ffc02ede9ac284974f Mon Sep 17 00:00:00 2001 From: rousik Date: Thu, 14 Dec 2023 17:38:27 +0000 Subject: [PATCH 75/80] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 10 +- environments/conda-lock.yml | 156 +++++++++++++------------- environments/conda-osx-64.lock.yml | 10 +- environments/conda-osx-arm64.lock.yml | 10 +- 4 files changed, 92 insertions(+), 94 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index c1e746c6af..86fd04ce5d 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -262,7 +262,7 @@ dependencies: - rpds-py=0.13.2=py311h46250e7_0 - rtree=1.1.0=py311h3bb2b0f_0 - ruamel.yaml.clib=0.2.7=py311h459d7ec_2 - - ruff=0.1.7=py311h7145743_0 + - ruff=0.1.8=py311h7145743_0 - send2trash=1.8.2=pyh41d4057_0 - setuptools=68.2.2=pyhd8ed1ab_0 - shellingham=1.5.4=pyhd8ed1ab_0 @@ -329,7 +329,7 @@ dependencies: - clikit=0.6.2=pyhd8ed1ab_2 - coloredlogs=14.0=pyhd8ed1ab_3 - comm=0.1.4=pyhd8ed1ab_0 - - coverage=7.3.2=py311h459d7ec_0 + - coverage=7.3.3=py311h459d7ec_0 - curl=8.5.0=hca28451_0 - fonttools=4.46.0=py311h459d7ec_0 - gitdb=4.0.11=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.13=pyhd8ed1ab_0 + - botocore=1.34.0=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.7=py311hcb13ee4_1 @@ -480,7 +480,7 @@ dependencies: - readthedocs-sphinx-ext=2.2.4=pyhd8ed1ab_0 - requests-toolbelt=0.10.1=pyhd8ed1ab_0 - responses=0.24.1=pyhd8ed1ab_0 - - s3transfer=0.8.2=pyhd8ed1ab_0 + - s3transfer=0.9.0=pyhd8ed1ab_0 - scipy=1.11.4=py311h64a7726_0 - secretstorage=3.3.3=py311h38be061_2 - shapely=2.0.2=py311h2032efe_1 @@ -489,7 +489,7 @@ 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.13=pyhd8ed1ab_0 + - boto3=1.34.0=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - dagster=1.5.12=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 81e9736e0e..7180326982 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -1914,93 +1914,93 @@ package: category: main optional: false - name: boto3 - version: 1.33.13 + version: 1.34.0 manager: conda platform: linux-64 dependencies: - botocore: ">=1.33.13,<1.34.0" + botocore: ">=1.34.0,<1.35.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.13-pyhd8ed1ab_0.conda + python: ">=3.8" + s3transfer: ">=0.9.0,<0.10.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.34.0-pyhd8ed1ab_0.conda hash: - md5: 4a1b38a0938b9fc23fb4fc202d832097 - sha256: 01f797f967ac92346a5bffdae165c5d4bacda8405b828fcd58534a0f82287f76 + md5: 82cc20a8fee273e54cecf129a30745df + sha256: 1da6d4c5dcef598e75b44d54184c9b0495ee3adf8ed9c42ea14a867fd8aad60c category: main optional: false - name: boto3 - version: 1.33.13 + version: 1.34.0 manager: conda platform: osx-64 dependencies: - python: ">=3.7" + python: ">=3.8" jmespath: ">=0.7.1,<2.0.0" - s3transfer: ">=0.8.2,<0.9.0" - botocore: ">=1.33.13,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.13-pyhd8ed1ab_0.conda + s3transfer: ">=0.9.0,<0.10.0" + botocore: ">=1.34.0,<1.35.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.34.0-pyhd8ed1ab_0.conda hash: - md5: 4a1b38a0938b9fc23fb4fc202d832097 - sha256: 01f797f967ac92346a5bffdae165c5d4bacda8405b828fcd58534a0f82287f76 + md5: 82cc20a8fee273e54cecf129a30745df + sha256: 1da6d4c5dcef598e75b44d54184c9b0495ee3adf8ed9c42ea14a867fd8aad60c category: main optional: false - name: boto3 - version: 1.33.13 + version: 1.34.0 manager: conda platform: osx-arm64 dependencies: - python: ">=3.7" + python: ">=3.8" jmespath: ">=0.7.1,<2.0.0" - s3transfer: ">=0.8.2,<0.9.0" - botocore: ">=1.33.13,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.13-pyhd8ed1ab_0.conda + s3transfer: ">=0.9.0,<0.10.0" + botocore: ">=1.34.0,<1.35.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.34.0-pyhd8ed1ab_0.conda hash: - md5: 4a1b38a0938b9fc23fb4fc202d832097 - sha256: 01f797f967ac92346a5bffdae165c5d4bacda8405b828fcd58534a0f82287f76 + md5: 82cc20a8fee273e54cecf129a30745df + sha256: 1da6d4c5dcef598e75b44d54184c9b0495ee3adf8ed9c42ea14a867fd8aad60c category: main optional: false - name: botocore - version: 1.33.13 + version: 1.34.0 manager: conda platform: linux-64 dependencies: jmespath: ">=0.7.1,<2.0.0" - python: ">=3.7" + python: ">=3.8" python-dateutil: ">=2.1,<3.0.0" urllib3: ">=1.25.4,<1.27" - url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.13-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.34.0-pyhd8ed1ab_0.conda hash: - md5: d2566fd9134b6f8b8e69a07e9a1fa17e - sha256: 498d08274880ef279e9a6dd68f66b384d71321d92301fa60330712f9edceab0c + md5: 61c8f5df4abbfa8ab19b1b307913723c + sha256: 2d72f7a2703c1044a6532b353b6a7e553e587a4a5fae78745e35b55b5b3a7ad4 category: main optional: false - name: botocore - version: 1.33.13 + version: 1.34.0 manager: conda platform: osx-64 dependencies: - python: ">=3.7" + python: ">=3.8" 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.13-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.34.0-pyhd8ed1ab_0.conda hash: - md5: d2566fd9134b6f8b8e69a07e9a1fa17e - sha256: 498d08274880ef279e9a6dd68f66b384d71321d92301fa60330712f9edceab0c + md5: 61c8f5df4abbfa8ab19b1b307913723c + sha256: 2d72f7a2703c1044a6532b353b6a7e553e587a4a5fae78745e35b55b5b3a7ad4 category: main optional: false - name: botocore - version: 1.33.13 + version: 1.34.0 manager: conda platform: osx-arm64 dependencies: - python: ">=3.7" + python: ">=3.8" 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.13-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.34.0-pyhd8ed1ab_0.conda hash: - md5: d2566fd9134b6f8b8e69a07e9a1fa17e - sha256: 498d08274880ef279e9a6dd68f66b384d71321d92301fa60330712f9edceab0c + md5: 61c8f5df4abbfa8ab19b1b307913723c + sha256: 2d72f7a2703c1044a6532b353b6a7e553e587a4a5fae78745e35b55b5b3a7ad4 category: main optional: false - name: bottleneck @@ -3537,7 +3537,7 @@ package: category: main optional: false - name: coverage - version: 7.3.2 + version: 7.3.3 manager: conda platform: linux-64 dependencies: @@ -3545,38 +3545,38 @@ package: python: ">=3.11,<3.12.0a0" python_abi: 3.11.* tomli: "" - url: https://conda.anaconda.org/conda-forge/linux-64/coverage-7.3.2-py311h459d7ec_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/coverage-7.3.3-py311h459d7ec_0.conda hash: - md5: 7b3145fed7adc7c63a0e08f6f29f5480 - sha256: 8b56edd4336e7fc6ff9b73436a3a270cf835f57cf4d0565c6e240c40f1981085 + md5: 9db2c1316e96068c0189beaeb716f3fe + sha256: 9a0236150852e33c52d91d5503975b8e559e533ac8f85e95224ce2b17faef9c1 category: main optional: false - name: coverage - version: 7.3.2 + version: 7.3.3 manager: conda platform: osx-64 dependencies: python: ">=3.11,<3.12.0a0" python_abi: 3.11.* tomli: "" - url: https://conda.anaconda.org/conda-forge/osx-64/coverage-7.3.2-py311h2725bcf_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/coverage-7.3.3-py311he705e18_0.conda hash: - md5: 0ce651c68a0322a6eacef726025b938a - sha256: ada34f95907fe0cd98d4d12e439bd1508363738f8b0fbe88d14cb398f4235af6 + md5: 80615a35595d46e9786d28ec61ceec9a + sha256: baf2c9e923646abf228cc3655d9080f7e2ade0f70472974a37a4fa4b3ae4410b category: main optional: false - name: coverage - version: 7.3.2 + version: 7.3.3 manager: conda platform: osx-arm64 dependencies: python: ">=3.11,<3.12.0a0" python_abi: 3.11.* tomli: "" - url: https://conda.anaconda.org/conda-forge/osx-arm64/coverage-7.3.2-py311heffc1b2_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/coverage-7.3.3-py311h05b510d_0.conda hash: - md5: 75928ad6625a73ff93f08be98014248c - sha256: 88d116c4c51a106c43937b950d3fd14007800fb7b3945573a5a117533c450e6b + md5: 15f7a4fdf06d5d1383dc0b2257279cfa + sha256: 38ad704411b491eaaf5db61aca8b05e33d2d827eaf54580203b2d5e1cbc411af category: main optional: false - name: crashtest @@ -19764,7 +19764,7 @@ package: category: main optional: false - name: ruff - version: 0.1.7 + version: 0.1.8 manager: conda platform: linux-64 dependencies: @@ -19772,40 +19772,38 @@ package: libstdcxx-ng: ">=12" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/ruff-0.1.7-py311h7145743_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/ruff-0.1.8-py311h7145743_0.conda hash: - md5: 7e4329efd6a902a64470bfbe21a83e21 - sha256: c82eb1b904671ab0eb3212f18aa7af14e51b66a8e893d18a3089d29a334e1e0d + md5: ed03c6cf88c287ce426c4d93013fbcbe + sha256: 4424017fbda80241dcd2b1b524605db1100c9e3061bbcb3a7d64e624acdae3dc category: main optional: false - name: ruff - version: 0.1.7 + version: 0.1.8 manager: conda platform: osx-64 dependencies: - __osx: ">=10.9" - libcxx: ">=16.0.6" + libcxx: ">=15" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/ruff-0.1.7-py311hec6fdf1_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/ruff-0.1.8-py311ha071555_0.conda hash: - md5: d21a7d577aa62ce3a2b1eb124da50446 - sha256: 8aac6c5324504cd6b453be725b0ba8cca478468fb5c328cec79301b552477dc7 + md5: 04b9bfe5f5d9703ceb20dc6fe2f39b04 + sha256: b60d25d4ebd0fd3f3a99c7cd5f70bdb4d20bd7f8ecebe038d62d459bf1212069 category: main optional: false - name: ruff - version: 0.1.7 + version: 0.1.8 manager: conda platform: osx-arm64 dependencies: - __osx: ">=10.9" - libcxx: ">=16.0.6" + libcxx: ">=15" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/ruff-0.1.7-py311h6fc163c_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/ruff-0.1.8-py311h8c97afb_0.conda hash: - md5: 86298e47df0a6b448df8632df3d1f4a9 - sha256: 37d5b2a72c3a5114d43d49a250dffd81d1b064d673e5faf3932c6bf56f2e7c76 + md5: 4a7cd1ed55f1c2b280682e5fc919d8b9 + sha256: 57b99e0af55d4a8188e5ec6e25c1da9a6b3e55a9ab7c87848aad12a158fddf76 category: main optional: false - name: s2n @@ -19822,42 +19820,42 @@ package: category: main optional: false - name: s3transfer - version: 0.8.2 + version: 0.9.0 manager: conda platform: linux-64 dependencies: botocore: ">=1.33.2,<2.0a.0" - python: ">=3.7" - url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.2-pyhd8ed1ab_0.conda + python: ">=3.8" + url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.9.0-pyhd8ed1ab_0.conda hash: - md5: 75e12933f4bf755c9cdd37072bcb6203 - sha256: 2e5679abcec8eb646df37518ecdbdaa224d7ff5295a1e56707317d52b47d9c79 + md5: 27ad14e5fc6a13f05b90140debc72cd2 + sha256: c9fc315d830238113160471467259740593966bcf59f17287a0baeaf1f6a76d8 category: main optional: false - name: s3transfer - version: 0.8.2 + version: 0.9.0 manager: conda platform: osx-64 dependencies: - python: ">=3.7" + python: ">=3.8" botocore: ">=1.33.2,<2.0a.0" - url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.9.0-pyhd8ed1ab_0.conda hash: - md5: 75e12933f4bf755c9cdd37072bcb6203 - sha256: 2e5679abcec8eb646df37518ecdbdaa224d7ff5295a1e56707317d52b47d9c79 + md5: 27ad14e5fc6a13f05b90140debc72cd2 + sha256: c9fc315d830238113160471467259740593966bcf59f17287a0baeaf1f6a76d8 category: main optional: false - name: s3transfer - version: 0.8.2 + version: 0.9.0 manager: conda platform: osx-arm64 dependencies: - python: ">=3.7" + python: ">=3.8" botocore: ">=1.33.2,<2.0a.0" - url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.9.0-pyhd8ed1ab_0.conda hash: - md5: 75e12933f4bf755c9cdd37072bcb6203 - sha256: 2e5679abcec8eb646df37518ecdbdaa224d7ff5295a1e56707317d52b47d9c79 + md5: 27ad14e5fc6a13f05b90140debc72cd2 + sha256: c9fc315d830238113160471467259740593966bcf59f17287a0baeaf1f6a76d8 category: main optional: false - name: scikit-learn diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index 583c37d839..2f729ed58a 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -246,7 +246,7 @@ dependencies: - rpds-py=0.13.2=py311h5e0f0e4_0 - rtree=1.1.0=py311hbc1f44b_0 - ruamel.yaml.clib=0.2.7=py311h2725bcf_2 - - ruff=0.1.7=py311hec6fdf1_0 + - ruff=0.1.8=py311ha071555_0 - setuptools=68.2.2=pyhd8ed1ab_0 - shellingham=1.5.4=pyhd8ed1ab_0 - simpleeval=0.9.13=pyhd8ed1ab_1 @@ -308,7 +308,7 @@ dependencies: - clikit=0.6.2=pyhd8ed1ab_2 - coloredlogs=14.0=pyhd8ed1ab_3 - comm=0.1.4=pyhd8ed1ab_0 - - coverage=7.3.2=py311h2725bcf_0 + - coverage=7.3.3=py311he705e18_0 - curl=8.5.0=h726d00d_0 - fonttools=4.46.0=py311he705e18_0 - gitdb=4.0.11=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.13=pyhd8ed1ab_0 + - botocore=1.34.0=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.7=py311h48c7838_1 @@ -462,7 +462,7 @@ dependencies: - readthedocs-sphinx-ext=2.2.4=pyhd8ed1ab_0 - requests-toolbelt=0.10.1=pyhd8ed1ab_0 - responses=0.24.1=pyhd8ed1ab_0 - - s3transfer=0.8.2=pyhd8ed1ab_0 + - s3transfer=0.9.0=pyhd8ed1ab_0 - scipy=1.11.4=py311he0bea55_0 - send2trash=1.8.2=pyhd1c38e8_0 - shapely=2.0.2=py311h4c12f3d_1 @@ -470,7 +470,7 @@ dependencies: - typeguard=4.1.5=pyhd8ed1ab_1 - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0.post1=h6eed73b_0 - - boto3=1.33.13=pyhd8ed1ab_0 + - boto3=1.34.0=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - dagster=1.5.12=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index a77431c14f..224feec656 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -246,7 +246,7 @@ dependencies: - rpds-py=0.13.2=py311h94f323b_0 - rtree=1.1.0=py311hd698ff7_0 - ruamel.yaml.clib=0.2.7=py311heffc1b2_2 - - ruff=0.1.7=py311h6fc163c_0 + - ruff=0.1.8=py311h8c97afb_0 - setuptools=68.2.2=pyhd8ed1ab_0 - shellingham=1.5.4=pyhd8ed1ab_0 - simpleeval=0.9.13=pyhd8ed1ab_1 @@ -308,7 +308,7 @@ dependencies: - clikit=0.6.2=pyhd8ed1ab_2 - coloredlogs=14.0=pyhd8ed1ab_3 - comm=0.1.4=pyhd8ed1ab_0 - - coverage=7.3.2=py311heffc1b2_0 + - coverage=7.3.3=py311h05b510d_0 - curl=8.5.0=h2d989ff_0 - fonttools=4.46.0=py311h05b510d_0 - gitdb=4.0.11=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.13=pyhd8ed1ab_0 + - botocore=1.34.0=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.7=py311h08c85a6_1 @@ -462,7 +462,7 @@ dependencies: - readthedocs-sphinx-ext=2.2.4=pyhd8ed1ab_0 - requests-toolbelt=0.10.1=pyhd8ed1ab_0 - responses=0.24.1=pyhd8ed1ab_0 - - s3transfer=0.8.2=pyhd8ed1ab_0 + - s3transfer=0.9.0=pyhd8ed1ab_0 - scipy=1.11.4=py311h2b215a9_0 - send2trash=1.8.2=pyhd1c38e8_0 - shapely=2.0.2=py311h0815064_1 @@ -470,7 +470,7 @@ dependencies: - typeguard=4.1.5=pyhd8ed1ab_1 - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0.post1=ha1ab1f8_0 - - boto3=1.33.13=pyhd8ed1ab_0 + - boto3=1.34.0=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - dagster=1.5.12=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 From e94e2776c5b71b3b8eecdfb29a2c378b23889429 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Thu, 14 Dec 2023 12:06:05 -0600 Subject: [PATCH 76/80] Reset lock files to match dev branch. --- environments/conda-linux-64.lock.yml | 10 +- environments/conda-lock.yml | 156 +++++++++++++------------- environments/conda-osx-64.lock.yml | 10 +- environments/conda-osx-arm64.lock.yml | 10 +- 4 files changed, 94 insertions(+), 92 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index 86fd04ce5d..c1e746c6af 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -262,7 +262,7 @@ dependencies: - rpds-py=0.13.2=py311h46250e7_0 - rtree=1.1.0=py311h3bb2b0f_0 - ruamel.yaml.clib=0.2.7=py311h459d7ec_2 - - ruff=0.1.8=py311h7145743_0 + - ruff=0.1.7=py311h7145743_0 - send2trash=1.8.2=pyh41d4057_0 - setuptools=68.2.2=pyhd8ed1ab_0 - shellingham=1.5.4=pyhd8ed1ab_0 @@ -329,7 +329,7 @@ dependencies: - clikit=0.6.2=pyhd8ed1ab_2 - coloredlogs=14.0=pyhd8ed1ab_3 - comm=0.1.4=pyhd8ed1ab_0 - - coverage=7.3.3=py311h459d7ec_0 + - coverage=7.3.2=py311h459d7ec_0 - curl=8.5.0=hca28451_0 - fonttools=4.46.0=py311h459d7ec_0 - gitdb=4.0.11=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.34.0=pyhd8ed1ab_0 + - botocore=1.33.13=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.7=py311hcb13ee4_1 @@ -480,7 +480,7 @@ dependencies: - readthedocs-sphinx-ext=2.2.4=pyhd8ed1ab_0 - requests-toolbelt=0.10.1=pyhd8ed1ab_0 - responses=0.24.1=pyhd8ed1ab_0 - - s3transfer=0.9.0=pyhd8ed1ab_0 + - s3transfer=0.8.2=pyhd8ed1ab_0 - scipy=1.11.4=py311h64a7726_0 - secretstorage=3.3.3=py311h38be061_2 - shapely=2.0.2=py311h2032efe_1 @@ -489,7 +489,7 @@ 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.34.0=pyhd8ed1ab_0 + - boto3=1.33.13=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - dagster=1.5.12=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 7180326982..81e9736e0e 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -1914,93 +1914,93 @@ package: category: main optional: false - name: boto3 - version: 1.34.0 + version: 1.33.13 manager: conda platform: linux-64 dependencies: - botocore: ">=1.34.0,<1.35.0" + botocore: ">=1.33.13,<1.34.0" jmespath: ">=0.7.1,<2.0.0" - python: ">=3.8" - s3transfer: ">=0.9.0,<0.10.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.34.0-pyhd8ed1ab_0.conda + python: ">=3.7" + s3transfer: ">=0.8.2,<0.9.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.13-pyhd8ed1ab_0.conda hash: - md5: 82cc20a8fee273e54cecf129a30745df - sha256: 1da6d4c5dcef598e75b44d54184c9b0495ee3adf8ed9c42ea14a867fd8aad60c + md5: 4a1b38a0938b9fc23fb4fc202d832097 + sha256: 01f797f967ac92346a5bffdae165c5d4bacda8405b828fcd58534a0f82287f76 category: main optional: false - name: boto3 - version: 1.34.0 + version: 1.33.13 manager: conda platform: osx-64 dependencies: - python: ">=3.8" + python: ">=3.7" jmespath: ">=0.7.1,<2.0.0" - s3transfer: ">=0.9.0,<0.10.0" - botocore: ">=1.34.0,<1.35.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.34.0-pyhd8ed1ab_0.conda + s3transfer: ">=0.8.2,<0.9.0" + botocore: ">=1.33.13,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.13-pyhd8ed1ab_0.conda hash: - md5: 82cc20a8fee273e54cecf129a30745df - sha256: 1da6d4c5dcef598e75b44d54184c9b0495ee3adf8ed9c42ea14a867fd8aad60c + md5: 4a1b38a0938b9fc23fb4fc202d832097 + sha256: 01f797f967ac92346a5bffdae165c5d4bacda8405b828fcd58534a0f82287f76 category: main optional: false - name: boto3 - version: 1.34.0 + version: 1.33.13 manager: conda platform: osx-arm64 dependencies: - python: ">=3.8" + python: ">=3.7" jmespath: ">=0.7.1,<2.0.0" - s3transfer: ">=0.9.0,<0.10.0" - botocore: ">=1.34.0,<1.35.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.34.0-pyhd8ed1ab_0.conda + s3transfer: ">=0.8.2,<0.9.0" + botocore: ">=1.33.13,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.13-pyhd8ed1ab_0.conda hash: - md5: 82cc20a8fee273e54cecf129a30745df - sha256: 1da6d4c5dcef598e75b44d54184c9b0495ee3adf8ed9c42ea14a867fd8aad60c + md5: 4a1b38a0938b9fc23fb4fc202d832097 + sha256: 01f797f967ac92346a5bffdae165c5d4bacda8405b828fcd58534a0f82287f76 category: main optional: false - name: botocore - version: 1.34.0 + version: 1.33.13 manager: conda platform: linux-64 dependencies: jmespath: ">=0.7.1,<2.0.0" - python: ">=3.8" + 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.34.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.13-pyhd8ed1ab_0.conda hash: - md5: 61c8f5df4abbfa8ab19b1b307913723c - sha256: 2d72f7a2703c1044a6532b353b6a7e553e587a4a5fae78745e35b55b5b3a7ad4 + md5: d2566fd9134b6f8b8e69a07e9a1fa17e + sha256: 498d08274880ef279e9a6dd68f66b384d71321d92301fa60330712f9edceab0c category: main optional: false - name: botocore - version: 1.34.0 + version: 1.33.13 manager: conda platform: osx-64 dependencies: - python: ">=3.8" + python: ">=3.7" 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.34.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.13-pyhd8ed1ab_0.conda hash: - md5: 61c8f5df4abbfa8ab19b1b307913723c - sha256: 2d72f7a2703c1044a6532b353b6a7e553e587a4a5fae78745e35b55b5b3a7ad4 + md5: d2566fd9134b6f8b8e69a07e9a1fa17e + sha256: 498d08274880ef279e9a6dd68f66b384d71321d92301fa60330712f9edceab0c category: main optional: false - name: botocore - version: 1.34.0 + version: 1.33.13 manager: conda platform: osx-arm64 dependencies: - python: ">=3.8" + python: ">=3.7" 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.34.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.13-pyhd8ed1ab_0.conda hash: - md5: 61c8f5df4abbfa8ab19b1b307913723c - sha256: 2d72f7a2703c1044a6532b353b6a7e553e587a4a5fae78745e35b55b5b3a7ad4 + md5: d2566fd9134b6f8b8e69a07e9a1fa17e + sha256: 498d08274880ef279e9a6dd68f66b384d71321d92301fa60330712f9edceab0c category: main optional: false - name: bottleneck @@ -3537,7 +3537,7 @@ package: category: main optional: false - name: coverage - version: 7.3.3 + version: 7.3.2 manager: conda platform: linux-64 dependencies: @@ -3545,38 +3545,38 @@ package: python: ">=3.11,<3.12.0a0" python_abi: 3.11.* tomli: "" - url: https://conda.anaconda.org/conda-forge/linux-64/coverage-7.3.3-py311h459d7ec_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/coverage-7.3.2-py311h459d7ec_0.conda hash: - md5: 9db2c1316e96068c0189beaeb716f3fe - sha256: 9a0236150852e33c52d91d5503975b8e559e533ac8f85e95224ce2b17faef9c1 + md5: 7b3145fed7adc7c63a0e08f6f29f5480 + sha256: 8b56edd4336e7fc6ff9b73436a3a270cf835f57cf4d0565c6e240c40f1981085 category: main optional: false - name: coverage - version: 7.3.3 + version: 7.3.2 manager: conda platform: osx-64 dependencies: python: ">=3.11,<3.12.0a0" python_abi: 3.11.* tomli: "" - url: https://conda.anaconda.org/conda-forge/osx-64/coverage-7.3.3-py311he705e18_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/coverage-7.3.2-py311h2725bcf_0.conda hash: - md5: 80615a35595d46e9786d28ec61ceec9a - sha256: baf2c9e923646abf228cc3655d9080f7e2ade0f70472974a37a4fa4b3ae4410b + md5: 0ce651c68a0322a6eacef726025b938a + sha256: ada34f95907fe0cd98d4d12e439bd1508363738f8b0fbe88d14cb398f4235af6 category: main optional: false - name: coverage - version: 7.3.3 + version: 7.3.2 manager: conda platform: osx-arm64 dependencies: python: ">=3.11,<3.12.0a0" python_abi: 3.11.* tomli: "" - url: https://conda.anaconda.org/conda-forge/osx-arm64/coverage-7.3.3-py311h05b510d_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/coverage-7.3.2-py311heffc1b2_0.conda hash: - md5: 15f7a4fdf06d5d1383dc0b2257279cfa - sha256: 38ad704411b491eaaf5db61aca8b05e33d2d827eaf54580203b2d5e1cbc411af + md5: 75928ad6625a73ff93f08be98014248c + sha256: 88d116c4c51a106c43937b950d3fd14007800fb7b3945573a5a117533c450e6b category: main optional: false - name: crashtest @@ -19764,7 +19764,7 @@ package: category: main optional: false - name: ruff - version: 0.1.8 + version: 0.1.7 manager: conda platform: linux-64 dependencies: @@ -19772,38 +19772,40 @@ package: libstdcxx-ng: ">=12" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/ruff-0.1.8-py311h7145743_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/ruff-0.1.7-py311h7145743_0.conda hash: - md5: ed03c6cf88c287ce426c4d93013fbcbe - sha256: 4424017fbda80241dcd2b1b524605db1100c9e3061bbcb3a7d64e624acdae3dc + md5: 7e4329efd6a902a64470bfbe21a83e21 + sha256: c82eb1b904671ab0eb3212f18aa7af14e51b66a8e893d18a3089d29a334e1e0d category: main optional: false - name: ruff - version: 0.1.8 + version: 0.1.7 manager: conda platform: osx-64 dependencies: - libcxx: ">=15" + __osx: ">=10.9" + libcxx: ">=16.0.6" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/ruff-0.1.8-py311ha071555_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/ruff-0.1.7-py311hec6fdf1_0.conda hash: - md5: 04b9bfe5f5d9703ceb20dc6fe2f39b04 - sha256: b60d25d4ebd0fd3f3a99c7cd5f70bdb4d20bd7f8ecebe038d62d459bf1212069 + md5: d21a7d577aa62ce3a2b1eb124da50446 + sha256: 8aac6c5324504cd6b453be725b0ba8cca478468fb5c328cec79301b552477dc7 category: main optional: false - name: ruff - version: 0.1.8 + version: 0.1.7 manager: conda platform: osx-arm64 dependencies: - libcxx: ">=15" + __osx: ">=10.9" + libcxx: ">=16.0.6" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/ruff-0.1.8-py311h8c97afb_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/ruff-0.1.7-py311h6fc163c_0.conda hash: - md5: 4a7cd1ed55f1c2b280682e5fc919d8b9 - sha256: 57b99e0af55d4a8188e5ec6e25c1da9a6b3e55a9ab7c87848aad12a158fddf76 + md5: 86298e47df0a6b448df8632df3d1f4a9 + sha256: 37d5b2a72c3a5114d43d49a250dffd81d1b064d673e5faf3932c6bf56f2e7c76 category: main optional: false - name: s2n @@ -19820,42 +19822,42 @@ package: category: main optional: false - name: s3transfer - version: 0.9.0 + version: 0.8.2 manager: conda platform: linux-64 dependencies: botocore: ">=1.33.2,<2.0a.0" - python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.9.0-pyhd8ed1ab_0.conda + python: ">=3.7" + url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.2-pyhd8ed1ab_0.conda hash: - md5: 27ad14e5fc6a13f05b90140debc72cd2 - sha256: c9fc315d830238113160471467259740593966bcf59f17287a0baeaf1f6a76d8 + md5: 75e12933f4bf755c9cdd37072bcb6203 + sha256: 2e5679abcec8eb646df37518ecdbdaa224d7ff5295a1e56707317d52b47d9c79 category: main optional: false - name: s3transfer - version: 0.9.0 + version: 0.8.2 manager: conda platform: osx-64 dependencies: - python: ">=3.8" + python: ">=3.7" botocore: ">=1.33.2,<2.0a.0" - url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.9.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.2-pyhd8ed1ab_0.conda hash: - md5: 27ad14e5fc6a13f05b90140debc72cd2 - sha256: c9fc315d830238113160471467259740593966bcf59f17287a0baeaf1f6a76d8 + md5: 75e12933f4bf755c9cdd37072bcb6203 + sha256: 2e5679abcec8eb646df37518ecdbdaa224d7ff5295a1e56707317d52b47d9c79 category: main optional: false - name: s3transfer - version: 0.9.0 + version: 0.8.2 manager: conda platform: osx-arm64 dependencies: - python: ">=3.8" + python: ">=3.7" botocore: ">=1.33.2,<2.0a.0" - url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.9.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.2-pyhd8ed1ab_0.conda hash: - md5: 27ad14e5fc6a13f05b90140debc72cd2 - sha256: c9fc315d830238113160471467259740593966bcf59f17287a0baeaf1f6a76d8 + md5: 75e12933f4bf755c9cdd37072bcb6203 + sha256: 2e5679abcec8eb646df37518ecdbdaa224d7ff5295a1e56707317d52b47d9c79 category: main optional: false - name: scikit-learn diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index 2f729ed58a..583c37d839 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -246,7 +246,7 @@ dependencies: - rpds-py=0.13.2=py311h5e0f0e4_0 - rtree=1.1.0=py311hbc1f44b_0 - ruamel.yaml.clib=0.2.7=py311h2725bcf_2 - - ruff=0.1.8=py311ha071555_0 + - ruff=0.1.7=py311hec6fdf1_0 - setuptools=68.2.2=pyhd8ed1ab_0 - shellingham=1.5.4=pyhd8ed1ab_0 - simpleeval=0.9.13=pyhd8ed1ab_1 @@ -308,7 +308,7 @@ dependencies: - clikit=0.6.2=pyhd8ed1ab_2 - coloredlogs=14.0=pyhd8ed1ab_3 - comm=0.1.4=pyhd8ed1ab_0 - - coverage=7.3.3=py311he705e18_0 + - coverage=7.3.2=py311h2725bcf_0 - curl=8.5.0=h726d00d_0 - fonttools=4.46.0=py311he705e18_0 - gitdb=4.0.11=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.34.0=pyhd8ed1ab_0 + - botocore=1.33.13=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.7=py311h48c7838_1 @@ -462,7 +462,7 @@ dependencies: - readthedocs-sphinx-ext=2.2.4=pyhd8ed1ab_0 - requests-toolbelt=0.10.1=pyhd8ed1ab_0 - responses=0.24.1=pyhd8ed1ab_0 - - s3transfer=0.9.0=pyhd8ed1ab_0 + - s3transfer=0.8.2=pyhd8ed1ab_0 - scipy=1.11.4=py311he0bea55_0 - send2trash=1.8.2=pyhd1c38e8_0 - shapely=2.0.2=py311h4c12f3d_1 @@ -470,7 +470,7 @@ dependencies: - typeguard=4.1.5=pyhd8ed1ab_1 - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0.post1=h6eed73b_0 - - boto3=1.34.0=pyhd8ed1ab_0 + - boto3=1.33.13=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - dagster=1.5.12=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 224feec656..a77431c14f 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -246,7 +246,7 @@ dependencies: - rpds-py=0.13.2=py311h94f323b_0 - rtree=1.1.0=py311hd698ff7_0 - ruamel.yaml.clib=0.2.7=py311heffc1b2_2 - - ruff=0.1.8=py311h8c97afb_0 + - ruff=0.1.7=py311h6fc163c_0 - setuptools=68.2.2=pyhd8ed1ab_0 - shellingham=1.5.4=pyhd8ed1ab_0 - simpleeval=0.9.13=pyhd8ed1ab_1 @@ -308,7 +308,7 @@ dependencies: - clikit=0.6.2=pyhd8ed1ab_2 - coloredlogs=14.0=pyhd8ed1ab_3 - comm=0.1.4=pyhd8ed1ab_0 - - coverage=7.3.3=py311h05b510d_0 + - coverage=7.3.2=py311heffc1b2_0 - curl=8.5.0=h2d989ff_0 - fonttools=4.46.0=py311h05b510d_0 - gitdb=4.0.11=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.34.0=pyhd8ed1ab_0 + - botocore=1.33.13=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.7=py311h08c85a6_1 @@ -462,7 +462,7 @@ dependencies: - readthedocs-sphinx-ext=2.2.4=pyhd8ed1ab_0 - requests-toolbelt=0.10.1=pyhd8ed1ab_0 - responses=0.24.1=pyhd8ed1ab_0 - - s3transfer=0.9.0=pyhd8ed1ab_0 + - s3transfer=0.8.2=pyhd8ed1ab_0 - scipy=1.11.4=py311h2b215a9_0 - send2trash=1.8.2=pyhd1c38e8_0 - shapely=2.0.2=py311h0815064_1 @@ -470,7 +470,7 @@ dependencies: - typeguard=4.1.5=pyhd8ed1ab_1 - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0.post1=ha1ab1f8_0 - - boto3=1.34.0=pyhd8ed1ab_0 + - boto3=1.33.13=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - dagster=1.5.12=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 From 6696f2f3c1aa200d9cdd79ff7f84fbab57c81d54 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Thu, 14 Dec 2023 23:09:52 -0500 Subject: [PATCH 77/80] Record coverage of unit and integration tests themselves --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 9cd7de593b..39fbb25049 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -323,6 +323,8 @@ debug = ["config", "trace"] pudl_sources = [ "src/pudl/", "*/site-packages/pudl/", + "test/unit", + "test/integration", ] [tool.coverage.report] From 131b9fa7d6f47648960926e6638b1e358aa33ad8 Mon Sep 17 00:00:00 2001 From: Jan Rous Date: Thu, 18 Jan 2024 13:14:53 -0700 Subject: [PATCH 78/80] Make some changes as per feedback. --- .github/workflows/pytest.yml | 33 +-------------------------------- pyproject.toml | 1 - 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index fa05592803..f528ebc68f 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -226,35 +226,4 @@ jobs: uses: codecov/codecov-action@v3 with: directory: coverage - fail_ci_if_error: true - - # TODO(rousik): The following slack notification gives no value and - # needs to be fixed. Until then, it might be better to do nothing - # at all. - # ci-notify: - # name: Notify slack - # runs-on: ubuntu-latest - # if: ${{ always() }} - # needs: - # - ci-unit - # - ci-integration - # steps: - # - name: Inform the Codemonkeys - # uses: 8398a7/action-slack@v3 - # continue-on-error: true - # with: - # status: custom - # fields: workflow,job,commit,repo,ref,author,took - # custom_payload: | - # { - # username: 'action-slack', - # icon_emoji: ':octocat:', - # attachments: [{ - # color: '${{ needs.ci-test.result }}' === 'success' ? 'good' : '${{ needs.ci-test.result }}' === 'failure' ? 'danger' : 'warning', - # text: `${process.env.AS_REPO}@${process.env.AS_REF}\n ${process.env.AS_WORKFLOW} (${process.env.AS_COMMIT})\n by ${process.env.AS_AUTHOR}\n Status: ${{ needs.ci-test.result }}`, - # }] - # } - # env: - # GITHUB_TOKEN: ${{ github.token }} # required - # SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} # required - # MATRIX_CONTEXT: ${{ toJson(matrix) }} # required + fail_ci_if_error: true \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index ff84086da2..a8d9e5ec11 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -310,7 +310,6 @@ curl = ">=8.4.0" [tool.coverage.run] # See note above on need to specify separate sources for pytest-coverage and coverage. -# source = ["src/pudl/", "test/integration/", "test/unit/"] include = [ "src/pudl/**", "test/integration/**", From d17fa54e3d28ffef4c1fc0fab7498c0085901e79 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 20:15:22 +0000 Subject: [PATCH 79/80] [pre-commit.ci] auto fixes from pre-commit.com hooks For more information, see https://pre-commit.ci --- .github/workflows/pytest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index f528ebc68f..5e8e434661 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -226,4 +226,4 @@ jobs: uses: codecov/codecov-action@v3 with: directory: coverage - fail_ci_if_error: true \ No newline at end of file + fail_ci_if_error: true From c51d8e2ba8028f16dc122ff89fab6196a43e90c5 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Fri, 19 Jan 2024 08:50:34 -0600 Subject: [PATCH 80/80] Rename glue.py unit tests so pytest picks them up. --- test/unit/{glue.py => glue_test.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/unit/{glue.py => glue_test.py} (100%) diff --git a/test/unit/glue.py b/test/unit/glue_test.py similarity index 100% rename from test/unit/glue.py rename to test/unit/glue_test.py