From c287d2462860f84a8db76b4b4f19ab90050caa90 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Thu, 23 Nov 2023 00:26:06 -0600 Subject: [PATCH 01/47] Use click for ETL CLI. Consolidate CLI under etl subpackage. --- Makefile | 5 +- docs/release_notes.rst | 2 +- pyproject.toml | 3 +- src/pudl/__init__.py | 1 - src/pudl/__main__.py | 4 +- src/pudl/cli/__init__.py | 3 - src/pudl/etl/__init__.py | 1 + src/pudl/{cli/etl.py => etl/cli.py} | 128 +++++++++++++--------------- test/conftest.py | 2 +- 9 files changed, 71 insertions(+), 78 deletions(-) delete mode 100644 src/pudl/cli/__init__.py rename src/pudl/{cli/etl.py => etl/cli.py} (61%) diff --git a/Makefile b/Makefile index 68a91bc709..0c8bef8636 100644 --- a/Makefile +++ b/Makefile @@ -107,7 +107,10 @@ ferc: pudl: rm -f ${PUDL_OUTPUT}/pudl.sqlite alembic upgrade head - coverage run ${covargs} -- src/pudl/cli/etl.py ${gcs_cache_path} ${etl_full_yml} + coverage run ${covargs} -- \ + src/pudl/etl/cli.py \ + ${gcs_cache_path} \ + ${etl_full_yml} ######################################################################################## # Targets that are coordinated by pytest -- mostly they're actual tests. diff --git a/docs/release_notes.rst b/docs/release_notes.rst index 83d23ca103..60edfbbbd3 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -744,7 +744,7 @@ SQLite and Parquet Outputs :issue:`1176,806`. * Data types, specified value constraints, and the uniqueness / non-null constraints on primary keys are validated during insertion into the SQLite DB. -* The PUDL ETL CLI :mod:`pudl.cli` now has flags to toggle various constraint +* The PUDL ETL CLI :mod:`pudl.etl.cli` now has flags to toggle various constraint checks including ``--ignore-foreign-key-constraints`` ``--ignore-type-constraints`` and ``--ignore-value-constraints``. diff --git a/pyproject.toml b/pyproject.toml index 295eeef315..2750d447d1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,6 +18,7 @@ dependencies = [ "build>=1.0", "catalystcoop.dbfread>=3.0,<3.1", "catalystcoop.ferc-xbrl-extractor>=1.2.0,<2", + "click>=8", "coloredlogs>=14.0", # Dagster requires 14.0 "conda-lock>=2.5.1", "coverage>=7", @@ -122,7 +123,7 @@ metadata_to_rst = "pudl.convert.metadata_to_rst:main" epacems_to_parquet = "pudl.convert.epacems_to_parquet:main" ferc_to_sqlite = "pudl.ferc_to_sqlite.cli:main" pudl_datastore = "pudl.workspace.datastore:main" -pudl_etl = "pudl.cli.etl:main" +pudl_etl = "pudl.etl.cli:pudl_etl" pudl_setup = "pudl.workspace.setup_cli:main" state_demand = "pudl.analysis.state_demand:main" pudl_check_fks = "pudl.etl.check_foreign_keys:main" diff --git a/src/pudl/__init__.py b/src/pudl/__init__.py index a578d8f855..0496f353e7 100644 --- a/src/pudl/__init__.py +++ b/src/pudl/__init__.py @@ -4,7 +4,6 @@ from . import ( analysis, - cli, convert, etl, extract, diff --git a/src/pudl/__main__.py b/src/pudl/__main__.py index bf9e0ad091..8f238a831d 100644 --- a/src/pudl/__main__.py +++ b/src/pudl/__main__.py @@ -2,7 +2,7 @@ import sys -import pudl.cli +from pudl.etl.cli import pudl_etl if __name__ == "__main__": - sys.exit(pudl.cli.etl.main()) + sys.exit(pudl_etl()) diff --git a/src/pudl/cli/__init__.py b/src/pudl/cli/__init__.py deleted file mode 100644 index 2e91185eee..0000000000 --- a/src/pudl/cli/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -"""Holds various command-line interfaces for PUDL.""" - -from . import etl diff --git a/src/pudl/etl/__init__.py b/src/pudl/etl/__init__.py index bb8fcddc1a..ce9f2cc4a2 100644 --- a/src/pudl/etl/__init__.py +++ b/src/pudl/etl/__init__.py @@ -22,6 +22,7 @@ from . import ( check_foreign_keys, + cli, eia_bulk_elec_assets, epacems_assets, glue_assets, diff --git a/src/pudl/cli/etl.py b/src/pudl/etl/cli.py similarity index 61% rename from src/pudl/cli/etl.py rename to src/pudl/etl/cli.py index 9972ff1ff3..ef075b7ce2 100644 --- a/src/pudl/cli/etl.py +++ b/src/pudl/etl/cli.py @@ -1,20 +1,9 @@ -"""A command line interface (CLI) to the main PUDL ETL functionality. - -This script cordinates the PUDL ETL process, based on parameters provided via a YAML -settings file. - -If the settings for a dataset has empty parameters (meaning there are no years or tables -included), no outputs will be generated. See :doc:`/dev/run_the_etl` for details. - -The output SQLite and Parquet files will be stored in ``PUDL_OUTPUT``. To -setup your default ``PUDL_INPUT`` and ``PUDL_OUTPUT`` directories see -``pudl_setup --help``. -""" - -import argparse +"""A command line interface (CLI) to the main PUDL ETL functionality.""" +import pathlib import sys from collections.abc import Callable +import click import fsspec from dagster import ( DagsterInstance, @@ -32,43 +21,6 @@ logger = pudl.logging_helpers.get_logger(__name__) -def parse_command_line(argv): - """Parse script command line arguments. See the -h option. - - Args: - argv (list): command line arguments including caller file name. - - Returns: - dict: A dictionary mapping command line arguments to their values. - """ - parser = argparse.ArgumentParser(description=__doc__) - parser.add_argument( - dest="settings_file", type=str, default="", help="path to ETL settings file." - ) - parser.add_argument( - "--logfile", - default=None, - help="If specified, write logs to this file.", - ) - parser.add_argument( - "--gcs-cache-path", - type=str, - help="Load datastore resources from Google Cloud Storage. Should be gs://bucket[/path_prefix]", - ) - parser.add_argument( - "--loglevel", - help="Set logging level (DEBUG, INFO, WARNING, ERROR, or CRITICAL).", - default="INFO", - ) - parser.add_argument( - "--max-concurrent", - help="Set the max number of processes dagster can launch. Defaults to use the number of CPUs on the machine.", - default=0, - ) - arguments = parser.parse_args(argv[1:]) - return arguments - - def pudl_etl_job_factory( logfile: str | None = None, loglevel: str = "INFO", process_epacems: bool = True ) -> Callable[[], JobDefinition]: @@ -105,16 +57,58 @@ def get_pudl_etl_job(): return get_pudl_etl_job -def main(): - """Parse command line and initialize PUDL DB.""" - args = parse_command_line(sys.argv) - +@click.command() +@click.argument( + "etl_settings_yml", + type=click.Path( + exists=True, + dir_okay=False, + resolve_path=True, + path_type=pathlib.Path, + ), +) +@click.option( + "--max-concurrent", + default=0, + type=int, + help="Max number of processes Dagster can launch. Defaults to the number of CPUs.", +) +@click.option( + "--gcs-cache-path", + default="gs://internal-zenodo-cache.catalyst.coop", + type=str, + help=( + "Load datastore resources from Google Cloud Storage if possible. " + "Path should be a URL of the form gs://bucket[/path_prefix]" + ), +) +@click.option( + "--logfile", + help="If specified, write logs to this file.", + type=click.Path( + exists=False, + resolve_path=True, + path_type=pathlib.Path, + ), +) +@click.option( + "--loglevel", + default="INFO", + type=click.Choice( + ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], case_sensitive=False + ), +) +def pudl_etl( + etl_settings_yml: pathlib.Path, + max_concurrent: int, + gcs_cache_path: str, + logfile: pathlib.Path, + loglevel: str, +): + """Use Dagster to run the PUDL ETL, as specified by the file ETL_SETTINGS_YML.""" # Display logged output from the PUDL package: - pudl.logging_helpers.configure_root_logger( - logfile=args.logfile, loglevel=args.loglevel - ) - - etl_settings = EtlSettings.from_yaml(args.settings_file) + pudl.logging_helpers.configure_root_logger(logfile=logfile, loglevel=loglevel) + etl_settings = EtlSettings.from_yaml(etl_settings_yml) dataset_settings_config = etl_settings.datasets.model_dump() process_epacems = True @@ -127,11 +121,11 @@ def main(): dataset_settings_config["epacems"] = EpaCemsSettings().model_dump() pudl_etl_reconstructable_job = build_reconstructable_job( - "pudl.cli.etl", + "pudl.etl.cli", "pudl_etl_job_factory", reconstructable_kwargs={ - "loglevel": args.loglevel, - "logfile": args.logfile, + "loglevel": loglevel, + "logfile": logfile, "process_epacems": process_epacems, }, ) @@ -142,7 +136,7 @@ def main(): "execution": { "config": { "multiprocess": { - "max_concurrent": int(args.max_concurrent), + "max_concurrent": max_concurrent, }, } }, @@ -150,9 +144,7 @@ def main(): "dataset_settings": {"config": dataset_settings_config}, "datastore": { "config": { - "gcs_cache_path": args.gcs_cache_path - if args.gcs_cache_path - else "", + "gcs_cache_path": gcs_cache_path if gcs_cache_path else "", }, }, }, @@ -177,4 +169,4 @@ def main(): if __name__ == "__main__": - sys.exit(main()) + sys.exit(pudl_etl()) diff --git a/test/conftest.py b/test/conftest.py index 61ae0b7d5b..1b9f751a47 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -13,7 +13,7 @@ import pudl from pudl import resources -from pudl.cli.etl import pudl_etl_job_factory +from pudl.etl.cli import pudl_etl_job_factory from pudl.extract.ferc1 import raw_xbrl_metadata_json from pudl.ferc_to_sqlite.cli import ferc_to_sqlite_job_factory from pudl.io_managers import ( From 395731cb95960b2980bd9dbf6f450611b78db92f Mon Sep 17 00:00:00 2001 From: zaneselvans Date: Sat, 25 Nov 2023 23:53:53 +0000 Subject: [PATCH 02/47] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 4 ++-- environments/conda-lock.yml | 28 +++++++++++++-------------- environments/conda-osx-64.lock.yml | 4 ++-- environments/conda-osx-arm64.lock.yml | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index b8e9555fbe..684b35b0f4 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: b9f8826532896e72ca49913a87e8be150e02e08901365edadcf42074ef6dec9c +# input_hash: f2183bab7eaf713e5e8558e6a94ecff41bfe50481d8921378a998a13cfda5ee7 channels: - conda-forge @@ -11,7 +11,7 @@ dependencies: - font-ttf-dejavu-sans-mono=2.37=hab24e00_0 - font-ttf-inconsolata=3.000=h77eed37_0 - font-ttf-source-code-pro=2.038=h77eed37_0 - - font-ttf-ubuntu=0.83=hab24e00_0 + - font-ttf-ubuntu=0.83=h77eed37_1 - ld_impl_linux-64=2.40=h41732ed_0 - libboost-headers=1.83.0=ha770c72_0 - libstdcxx-ng=13.2.0=h7e041cc_3 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 50ff62f2ed..a11ac8475e 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -15,9 +15,9 @@ version: 1 metadata: content_hash: - linux-64: b9f8826532896e72ca49913a87e8be150e02e08901365edadcf42074ef6dec9c - osx-64: 7df4f348c0efa8196db99028aba374d08e559c0d59480100dc244a1070fdf8c0 - osx-arm64: d8713e5226fa38c644a6b4d9373fd0e32f49a61a8325d64e9cd932f0f91ed1e3 + linux-64: f2183bab7eaf713e5e8558e6a94ecff41bfe50481d8921378a998a13cfda5ee7 + osx-64: ddd7413694550c64aa8b2dc594234a5d0a89f19b10a7741ef0631ee46ae89b66 + osx-arm64: 5075c3c6a027c8530f5d5907bcbb2a7dc1f333c1ea80b671cbbadb5e1fb5159c channels: - url: conda-forge used_env_vars: [] @@ -5203,10 +5203,10 @@ package: manager: conda platform: linux-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-h77eed37_1.conda hash: - md5: 19410c3df09dfb12d1206132a1d357c5 - sha256: 470d5db54102bd51dbb0c5990324a2f4a0bc976faa493b22193338adb9882e2e + md5: 6185f640c43843e5ad6fd1c5372c3f80 + sha256: 056c85b482d58faab5fd4670b6c1f5df0986314cca3bc831d458b22e4ef2c792 category: main optional: false - name: font-ttf-ubuntu @@ -5214,10 +5214,10 @@ package: manager: conda platform: osx-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-h77eed37_1.conda hash: - md5: 19410c3df09dfb12d1206132a1d357c5 - sha256: 470d5db54102bd51dbb0c5990324a2f4a0bc976faa493b22193338adb9882e2e + md5: 6185f640c43843e5ad6fd1c5372c3f80 + sha256: 056c85b482d58faab5fd4670b6c1f5df0986314cca3bc831d458b22e4ef2c792 category: main optional: false - name: font-ttf-ubuntu @@ -5225,10 +5225,10 @@ package: manager: conda platform: osx-arm64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-h77eed37_1.conda hash: - md5: 19410c3df09dfb12d1206132a1d357c5 - sha256: 470d5db54102bd51dbb0c5990324a2f4a0bc976faa493b22193338adb9882e2e + md5: 6185f640c43843e5ad6fd1c5372c3f80 + sha256: 056c85b482d58faab5fd4670b6c1f5df0986314cca3bc831d458b22e4ef2c792 category: main optional: false - name: fontconfig @@ -5333,8 +5333,8 @@ package: dependencies: font-ttf-inconsolata: "" font-ttf-source-code-pro: "" - font-ttf-dejavu-sans-mono: "" font-ttf-ubuntu: "" + font-ttf-dejavu-sans-mono: "" url: https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2 hash: md5: f766549260d6815b0c52253f1fb1bb29 @@ -5348,8 +5348,8 @@ package: dependencies: font-ttf-inconsolata: "" font-ttf-source-code-pro: "" - font-ttf-dejavu-sans-mono: "" font-ttf-ubuntu: "" + font-ttf-dejavu-sans-mono: "" url: https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2 hash: md5: f766549260d6815b0c52253f1fb1bb29 diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index dcebd3379e..481a9d3484 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: 7df4f348c0efa8196db99028aba374d08e559c0d59480100dc244a1070fdf8c0 +# input_hash: ddd7413694550c64aa8b2dc594234a5d0a89f19b10a7741ef0631ee46ae89b66 channels: - conda-forge @@ -13,7 +13,7 @@ dependencies: - font-ttf-dejavu-sans-mono=2.37=hab24e00_0 - font-ttf-inconsolata=3.000=h77eed37_0 - font-ttf-source-code-pro=2.038=h77eed37_0 - - font-ttf-ubuntu=0.83=hab24e00_0 + - font-ttf-ubuntu=0.83=h77eed37_1 - fribidi=1.0.10=hbcb3906_0 - giflib=5.2.1=hb7f2c08_3 - icu=73.2=hf5e326d_0 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 39b88ff492..f9b67d3cec 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: d8713e5226fa38c644a6b4d9373fd0e32f49a61a8325d64e9cd932f0f91ed1e3 +# input_hash: 5075c3c6a027c8530f5d5907bcbb2a7dc1f333c1ea80b671cbbadb5e1fb5159c channels: - conda-forge @@ -13,7 +13,7 @@ dependencies: - font-ttf-dejavu-sans-mono=2.37=hab24e00_0 - font-ttf-inconsolata=3.000=h77eed37_0 - font-ttf-source-code-pro=2.038=h77eed37_0 - - font-ttf-ubuntu=0.83=hab24e00_0 + - font-ttf-ubuntu=0.83=h77eed37_1 - fribidi=1.0.10=h27ca646_0 - giflib=5.2.1=h1a8c8d9_3 - icu=73.2=hc8870d7_0 From 543b8d02a002bf42a3b603ce60af4995e9b5251a Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Sun, 26 Nov 2023 01:58:48 -0600 Subject: [PATCH 03/47] Migrate ferc_to_sqlite to the click CLI framework. --- src/pudl/etl/cli.py | 13 ++- src/pudl/ferc_to_sqlite/cli.py | 174 +++++++++++++++++--------------- src/pudl/workspace/datastore.py | 1 + 3 files changed, 104 insertions(+), 84 deletions(-) diff --git a/src/pudl/etl/cli.py b/src/pudl/etl/cli.py index ef075b7ce2..2fefcd97aa 100644 --- a/src/pudl/etl/cli.py +++ b/src/pudl/etl/cli.py @@ -57,7 +57,9 @@ def get_pudl_etl_job(): return get_pudl_etl_job -@click.command() +@click.command( + context_settings={"help_option_names": ["-h", "--help"]}, +) @click.argument( "etl_settings_yml", type=click.Path( @@ -75,11 +77,14 @@ def get_pudl_etl_job(): ) @click.option( "--gcs-cache-path", - default="gs://internal-zenodo-cache.catalyst.coop", type=str, help=( - "Load datastore resources from Google Cloud Storage if possible. " - "Path should be a URL of the form gs://bucket[/path_prefix]" + "Load cached inputs from Google Cloud Storage if possible. This is usually " + "much faster and more reliable than downloading from Zenodo directly. The " + "path should be a URL of the form gs://bucket[/path_prefix]. Internally we use " + "gs://internal-zenodo-cache.catalyst.coop. A public cache is available at " + "gs://zenodo-cache.catalyst.coop but requires GCS authentication and a billing " + "project to pay data egress costs." ), ) @click.option( diff --git a/src/pudl/ferc_to_sqlite/cli.py b/src/pudl/ferc_to_sqlite/cli.py index 5754ee97df..23c745b12b 100644 --- a/src/pudl/ferc_to_sqlite/cli.py +++ b/src/pudl/ferc_to_sqlite/cli.py @@ -1,14 +1,9 @@ -"""A script for cloning the FERC Form 1 database into SQLite. - -This script generates a SQLite database that is a clone/mirror of the original -FERC Form1 database. We use this cloned database as the starting point for the -main PUDL ETL process. The underlying work in the script is being done in -:mod:`pudl.extract.ferc1`. -""" -import argparse +"""A script using Dagster to convert FERC data fom DBF and XBRL to SQLite databases.""" +import pathlib import sys from collections.abc import Callable +import click from dagster import ( DagsterInstance, JobDefinition, @@ -24,62 +19,6 @@ logger = pudl.logging_helpers.get_logger(__name__) -def parse_command_line(argv): - """Parse command line arguments. See the -h option. - - Args: - argv (str): Command line arguments, including caller filename. - - Returns: - dict: Dictionary of command line arguments and their parsed values. - """ - parser = argparse.ArgumentParser(description=__doc__) - parser.add_argument( - "settings_file", type=str, default="", help="path to YAML settings file." - ) - parser.add_argument( - "--logfile", - default=None, - type=str, - help="If specified, write logs to this file.", - ) - parser.add_argument( - "-c", - "--clobber", - action="store_true", - help="""Clobber existing sqlite database if it exists. If clobber is - not included but the sqlite databse already exists the build will - fail.""", - default=False, - ) - parser.add_argument( - "-b", - "--batch-size", - default=50, - type=int, - help="Specify number of XBRL instances to be processed at a time (defaults to 50)", - ) - parser.add_argument( - "-w", - "--workers", - default=None, - type=int, - help="Specify number of worker processes for parsing XBRL filings.", - ) - parser.add_argument( - "--gcs-cache-path", - type=str, - help="Load datastore resources from Google Cloud Storage. Should be gs://bucket[/path_prefix]", - ) - parser.add_argument( - "--loglevel", - help="Set logging level (DEBUG, INFO, WARNING, ERROR, or CRITICAL).", - default="INFO", - ) - arguments = parser.parse_args(argv[1:]) - return arguments - - def ferc_to_sqlite_job_factory( logfile: str | None = None, loglevel: str = "INFO", @@ -122,21 +61,98 @@ def get_ferc_to_sqlite_job(): return get_ferc_to_sqlite_job -def main(): # noqa: C901 - """Clone the FERC Form 1 FoxPro database into SQLite.""" - args = parse_command_line(sys.argv) - +@click.command( + name="ferc_to_sqlite", + context_settings={"help_option_names": ["-h", "--help"]}, +) +@click.argument( + "etl_settings_yml", + type=click.Path( + exists=True, + dir_okay=False, + resolve_path=True, + path_type=pathlib.Path, + ), +) +@click.option( + "-b", + "--batch-size", + default=50, + type=int, + help="Number of XBRL instances to be processed at a time.", +) +@click.option( + "--clobber/--no-clobber", + type=bool, + default=False, + help=( + "Clobber existing FERC SQLite databases if they exist. If clobber is not " + "specified but the SQLite database already exists the run will fail." + ), +) +@click.option( + "-w", + "--workers", + default=0, + type=int, + help=( + "Number of worker processes to use when parsing XBRL filings. " + "Defaults to using the number of CPUs." + ), +) +@click.option( + "--gcs-cache-path", + type=str, + help=( + "Load cached inputs from Google Cloud Storage if possible. This is usually " + "much faster and more reliable than downloading from Zenodo directly. The " + "path should be a URL of the form gs://bucket[/path_prefix]. Internally we use " + "gs://internal-zenodo-cache.catalyst.coop. A public cache is available at " + "gs://zenodo-cache.catalyst.coop but requires GCS authentication and a billing " + "project to pay data egress costs." + ), +) +@click.option( + "--logfile", + help="If specified, write logs to this file.", + type=click.Path( + exists=False, + resolve_path=True, + path_type=pathlib.Path, + ), +) +@click.option( + "--loglevel", + default="INFO", + type=click.Choice( + ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], case_sensitive=False + ), +) +def main( + etl_settings_yml: pathlib.Path, + batch_size: int, + workers: int, + clobber: bool, + gcs_cache_path: str, + logfile: pathlib.Path, + loglevel: str, +): + """Use Dagster to convert FERC data fom DBF and XBRL to SQLite databases. + + Reads settings specifying which forms and years to convert from ETL_SETTINGS_YML. + + Also produces JSON versions of XBRL taxonomies and datapackage descriptors which + annotate the XBRL derived SQLite databases. + """ # Display logged output from the PUDL package: - pudl.logging_helpers.configure_root_logger( - logfile=args.logfile, loglevel=args.loglevel - ) + pudl.logging_helpers.configure_root_logger(logfile=logfile, loglevel=loglevel) - etl_settings = EtlSettings.from_yaml(args.settings_file) + etl_settings = EtlSettings.from_yaml(etl_settings_yml) ferc_to_sqlite_reconstructable_job = build_reconstructable_job( "pudl.ferc_to_sqlite.cli", "ferc_to_sqlite_job_factory", - reconstructable_kwargs={"loglevel": args.loglevel, "logfile": args.logfile}, + reconstructable_kwargs={"loglevel": loglevel, "logfile": logfile}, ) result = execute_job( @@ -149,22 +165,20 @@ def main(): # noqa: C901 }, "datastore": { "config": { - "gcs_cache_path": args.gcs_cache_path - if args.gcs_cache_path - else "", + "gcs_cache_path": gcs_cache_path if gcs_cache_path else "", }, }, }, "ops": { "xbrl2sqlite": { "config": { - "workers": args.workers, - "batch_size": args.batch_size, - "clobber": args.clobber, + "workers": workers, + "batch_size": batch_size, + "clobber": clobber, }, }, "dbf2sqlite": { - "config": {"clobber": args.clobber}, + "config": {"clobber": clobber}, }, }, }, diff --git a/src/pudl/workspace/datastore.py b/src/pudl/workspace/datastore.py index 374a580d94..51e64a2db2 100644 --- a/src/pudl/workspace/datastore.py +++ b/src/pudl/workspace/datastore.py @@ -184,6 +184,7 @@ class ZenodoDoiSettings(BaseSettings): ferc60: ZenodoDoi = "10.5281/zenodo.8326695" ferc714: ZenodoDoi = "10.5281/zenodo.8326694" phmsagas: ZenodoDoi = "10.5281/zenodo.8346646" + model_config = SettingsConfigDict(env_prefix="pudl_zenodo_doi_", env_file=".env") From e94ed5690caca9125c35f94b9e263ba650ca2dba Mon Sep 17 00:00:00 2001 From: zaneselvans Date: Wed, 29 Nov 2023 09:54:09 +0000 Subject: [PATCH 04/47] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 17 +- environments/conda-lock.yml | 254 ++++++++++++++++---------- environments/conda-osx-64.lock.yml | 19 +- environments/conda-osx-arm64.lock.yml | 19 +- 4 files changed, 182 insertions(+), 127 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index 9bd2a3d750..2878f02634 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: f2183bab7eaf713e5e8558e6a94ecff41bfe50481d8921378a998a13cfda5ee7 +# input_hash: 25338bdeb54a81fb064efcdf38a56212bb8da4efc4654985f265ded511dcb38f channels: - conda-forge @@ -330,6 +330,7 @@ dependencies: - coloredlogs=14.0=pyhd8ed1ab_3 - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311h459d7ec_0 + - curl=8.4.0=hca28451_0 - fonttools=4.45.1=py311h459d7ec_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 @@ -392,7 +393,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 +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.0=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 @@ -448,7 +449,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 @@ -480,7 +481,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.8.0=pyhd8ed1ab_0 + - s3transfer=0.8.1=pyhd8ed1ab_0 - scipy=1.11.4=py311h64a7726_0 - secretstorage=3.3.3=py311h38be061_2 - shapely=2.0.2=py311h2032efe_1 @@ -489,7 +490,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.2=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - dagster=1.5.9=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 @@ -514,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.2.1=pyhd8ed1ab_0 + - 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-postgres=0.21.9=pyhd8ed1ab_1 - fiona=1.9.5=py311hf8e0aa6_1 - google-api-core=2.14.0=pyhd8ed1ab_0 - google-auth-oauthlib=1.1.0=pyhd8ed1ab_0 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 24246044c9..e26cc46fc7 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -15,9 +15,9 @@ version: 1 metadata: content_hash: - linux-64: f2183bab7eaf713e5e8558e6a94ecff41bfe50481d8921378a998a13cfda5ee7 - osx-64: ddd7413694550c64aa8b2dc594234a5d0a89f19b10a7741ef0631ee46ae89b66 - osx-arm64: 5075c3c6a027c8530f5d5907bcbb2a7dc1f333c1ea80b671cbbadb5e1fb5159c + linux-64: 25338bdeb54a81fb064efcdf38a56212bb8da4efc4654985f265ded511dcb38f + osx-64: 0c46f3c7a9c86a583e588c727d6a7e7d3214ce9d048dd4e49df3a792c36b3e9c + osx-arm64: 3e57b04f7b2300284a5c81502687a5c373c4be31786246211ea23f019d4a513f channels: - url: conda-forge used_env_vars: [] @@ -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.2 manager: conda platform: linux-64 dependencies: - botocore: ">=1.33.0,<1.34.0" + botocore: ">=1.33.2,<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.2-pyhd8ed1ab_0.conda hash: - md5: d308c65184cef05b98cb4461d220e5af - sha256: c9f512549b95ff0db24b2727ccf6822520e1ee0544b6d4769bb6db1645f40765 + md5: f741a9ed50587ba063b732cebdd71ab1 + sha256: 74944ee7c894ce009c1f1d86aa521c2af22ede018093eee03c1d002113246774 category: main optional: false - name: boto3 - version: 1.33.0 + version: 1.33.2 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.2,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.2-pyhd8ed1ab_0.conda hash: - md5: d308c65184cef05b98cb4461d220e5af - sha256: c9f512549b95ff0db24b2727ccf6822520e1ee0544b6d4769bb6db1645f40765 + md5: f741a9ed50587ba063b732cebdd71ab1 + sha256: 74944ee7c894ce009c1f1d86aa521c2af22ede018093eee03c1d002113246774 category: main optional: false - name: boto3 - version: 1.33.0 + version: 1.33.2 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.2,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.2-pyhd8ed1ab_0.conda hash: - md5: d308c65184cef05b98cb4461d220e5af - sha256: c9f512549b95ff0db24b2727ccf6822520e1ee0544b6d4769bb6db1645f40765 + md5: f741a9ed50587ba063b732cebdd71ab1 + sha256: 74944ee7c894ce009c1f1d86aa521c2af22ede018093eee03c1d002113246774 category: main optional: false - name: botocore - version: 1.33.0 + 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.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.2-pyhd8ed1ab_0.conda hash: - md5: 8c33d5b6003262d71c73383b04813d59 - sha256: 705517443318c269a7a78b30f4df14755636b0e799ac91af19857b4849eb9a78 + md5: 40348da60b8d2e53619ef16966cc18b8 + sha256: 3c221bec785d2d7e9940bb0c57261f1dcacc7e906a4955ed88390f554881bdf3 category: main optional: false - name: botocore - version: 1.33.0 + 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.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.2-pyhd8ed1ab_0.conda hash: - md5: 8c33d5b6003262d71c73383b04813d59 - sha256: 705517443318c269a7a78b30f4df14755636b0e799ac91af19857b4849eb9a78 + md5: 40348da60b8d2e53619ef16966cc18b8 + sha256: 3c221bec785d2d7e9940bb0c57261f1dcacc7e906a4955ed88390f554881bdf3 category: main optional: false - name: botocore - version: 1.33.0 + 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.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.2-pyhd8ed1ab_0.conda hash: - md5: 8c33d5b6003262d71c73383b04813d59 - sha256: 705517443318c269a7a78b30f4df14755636b0e799ac91af19857b4849eb9a78 + 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.1 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.1-pyhd8ed1ab_0.conda hash: - md5: 901c0be7848920eeaeb14bce747c589c - sha256: f70614208da7b61b41ead6d2260ca3b0d6c0785388b09f7aa4615b56fbf3ce37 + md5: 223cdad8b8eee98aae17835e4e34103d + sha256: d0588a3009fd8d2fbde979f3a518f7a1383f052f01a46022c541551adc413da8 category: main optional: false - name: catalystcoop.ferc_xbrl_extractor - version: 1.2.1 + version: 1.3.1 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.1-pyhd8ed1ab_0.conda hash: - md5: 901c0be7848920eeaeb14bce747c589c - sha256: f70614208da7b61b41ead6d2260ca3b0d6c0785388b09f7aa4615b56fbf3ce37 + md5: 223cdad8b8eee98aae17835e4e34103d + sha256: d0588a3009fd8d2fbde979f3a518f7a1383f052f01a46022c541551adc413da8 category: main optional: false - name: catalystcoop.ferc_xbrl_extractor - version: 1.2.1 + version: 1.3.1 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.1-pyhd8ed1ab_0.conda hash: - md5: 901c0be7848920eeaeb14bce747c589c - sha256: f70614208da7b61b41ead6d2260ca3b0d6c0785388b09f7aa4615b56fbf3ce37 + md5: 223cdad8b8eee98aae17835e4e34103d + sha256: d0588a3009fd8d2fbde979f3a518f7a1383f052f01a46022c541551adc413da8 category: main optional: false - name: cchardet @@ -3703,6 +3703,58 @@ package: sha256: 00c9b389b51b6e951a1f639aa04dceca9e329e144275c79b4f6baacd3fb90345 category: main optional: false + - name: curl + version: 8.4.0 + manager: conda + platform: linux-64 + dependencies: + krb5: ">=1.21.2,<1.22.0a0" + libcurl: 8.4.0 + libgcc-ng: ">=12" + libssh2: ">=1.11.0,<2.0a0" + libzlib: ">=1.2.13,<1.3.0a0" + openssl: ">=3.1.3,<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 + hash: + md5: 2bcf7689cae931dd35d9a45626f49fce + sha256: 373c50b5b668cf39a71d17a42a96144d5efc1e62e7d81c1dd830e2493cefc8cc + category: main + optional: false + - name: curl + version: 8.4.0 + manager: conda + platform: osx-64 + dependencies: + krb5: ">=1.21.2,<1.22.0a0" + libcurl: 8.4.0 + libssh2: ">=1.11.0,<2.0a0" + libzlib: ">=1.2.13,<1.3.0a0" + openssl: ">=3.1.3,<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 + hash: + md5: e1de44cac6e7774dd2c1e074f5d637a9 + sha256: 32cb23c91dd4cd88d3e6c7adb38ea3d1a1e5da79c63a20ec27d3d0924fcf644c + category: main + optional: false + - name: curl + version: 8.4.0 + manager: conda + platform: osx-arm64 + dependencies: + krb5: ">=1.21.2,<1.22.0a0" + libcurl: 8.4.0 + libssh2: ">=1.11.0,<2.0a0" + libzlib: ">=1.2.13,<1.3.0a0" + openssl: ">=3.1.3,<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 + hash: + md5: ae975c2ea5334bd8a8ddecb5013a30c6 + sha256: d0fa5d1a7a6d0e9dcf930db1e4a750991244567ea5e09a15a00c163a52113465 + category: main + optional: false - name: cycler version: 0.12.1 manager: conda @@ -3957,10 +4009,10 @@ package: dagster: 1.5.9.* 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.9-pyhd8ed1ab_1.conda hash: - md5: 18c5dd009bd4d99ec38003583134c9fc - sha256: 83ad5a4eca4698b1258398bcd405665bbd8e41464124221cf477bb78bdc22100 + md5: 8c1a941fe77b920b1c7933a7a0c6bf2e + sha256: 0e947f376d6878bd8e505932277e84c373da492a38d2c4ef9d96fc25f5327845 category: main optional: false - name: dagster-postgres @@ -3971,10 +4023,10 @@ package: 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 + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.9-pyhd8ed1ab_1.conda hash: - md5: 18c5dd009bd4d99ec38003583134c9fc - sha256: 83ad5a4eca4698b1258398bcd405665bbd8e41464124221cf477bb78bdc22100 + md5: 8c1a941fe77b920b1c7933a7a0c6bf2e + sha256: 0e947f376d6878bd8e505932277e84c373da492a38d2c4ef9d96fc25f5327845 category: main optional: false - name: dagster-postgres @@ -3985,10 +4037,10 @@ package: 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 + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.9-pyhd8ed1ab_1.conda hash: - md5: 18c5dd009bd4d99ec38003583134c9fc - sha256: 83ad5a4eca4698b1258398bcd405665bbd8e41464124221cf477bb78bdc22100 + md5: 8c1a941fe77b920b1c7933a7a0c6bf2e + sha256: 0e947f376d6878bd8e505932277e84c373da492a38d2c4ef9d96fc25f5327845 category: main optional: false - name: dagster-webserver @@ -13336,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 @@ -19812,42 +19864,42 @@ package: category: main optional: false - name: s3transfer - version: 0.8.0 + version: 0.8.1 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.1-pyhd8ed1ab_0.conda hash: - md5: 9d4e095f2a2e84d0a3f54e3d9f13f9b2 - sha256: cedf5d2e5da3dcd14d7da767a0cee8ef18938af724fdcf2fec682d44024cc2e8 + md5: c7de76b4b1db01f4c51ce1e4896da288 + sha256: e2972e371a6c64888a9783c3a645ad4283d4de01c93992ff836bf0e1a1dcdc87 category: main optional: false - name: s3transfer - version: 0.8.0 + version: 0.8.1 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.1-pyhd8ed1ab_0.conda hash: - md5: 9d4e095f2a2e84d0a3f54e3d9f13f9b2 - sha256: cedf5d2e5da3dcd14d7da767a0cee8ef18938af724fdcf2fec682d44024cc2e8 + md5: c7de76b4b1db01f4c51ce1e4896da288 + sha256: e2972e371a6c64888a9783c3a645ad4283d4de01c93992ff836bf0e1a1dcdc87 category: main optional: false - name: s3transfer - version: 0.8.0 + version: 0.8.1 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.1-pyhd8ed1ab_0.conda hash: - md5: 9d4e095f2a2e84d0a3f54e3d9f13f9b2 - sha256: cedf5d2e5da3dcd14d7da767a0cee8ef18938af724fdcf2fec682d44024cc2e8 + md5: c7de76b4b1db01f4c51ce1e4896da288 + sha256: e2972e371a6c64888a9783c3a645ad4283d4de01c93992ff836bf0e1a1dcdc87 category: main optional: false - name: scikit-learn @@ -23656,7 +23708,7 @@ package: category: main optional: false - name: yarl - version: 1.9.2 + version: 1.9.3 manager: conda platform: linux-64 dependencies: @@ -23665,14 +23717,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 +23732,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 +23747,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 6cc8f5f766..687f953791 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: ddd7413694550c64aa8b2dc594234a5d0a89f19b10a7741ef0631ee46ae89b66 +# input_hash: 0c46f3c7a9c86a583e588c727d6a7e7d3214ce9d048dd4e49df3a792c36b3e9c channels: - conda-forge @@ -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 @@ -309,6 +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 - fonttools=4.45.1=py311he705e18_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 @@ -372,7 +373,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 +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.0=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 @@ -428,7 +429,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 @@ -462,7 +463,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.8.0=pyhd8ed1ab_0 + - s3transfer=0.8.1=pyhd8ed1ab_0 - scipy=1.11.4=py311he0bea55_0 - send2trash=1.8.2=pyhd1c38e8_0 - shapely=2.0.2=py311h4c12f3d_1 @@ -470,7 +471,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.2=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - dagster=1.5.9=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 @@ -494,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.2.1=pyhd8ed1ab_0 + - 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-postgres=0.21.9=pyhd8ed1ab_1 - fiona=1.9.5=py311h809632c_1 - google-api-core=2.14.0=pyhd8ed1ab_0 - google-auth-oauthlib=1.1.0=pyhd8ed1ab_0 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 9c7ecfd5ff..2161d6af87 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: 5075c3c6a027c8530f5d5907bcbb2a7dc1f333c1ea80b671cbbadb5e1fb5159c +# input_hash: 3e57b04f7b2300284a5c81502687a5c373c4be31786246211ea23f019d4a513f channels: - conda-forge @@ -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 @@ -309,6 +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 - fonttools=4.45.1=py311h05b510d_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 @@ -372,7 +373,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 +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.0=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 @@ -428,7 +429,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 @@ -462,7 +463,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.8.0=pyhd8ed1ab_0 + - s3transfer=0.8.1=pyhd8ed1ab_0 - scipy=1.11.4=py311h2b215a9_0 - send2trash=1.8.2=pyhd1c38e8_0 - shapely=2.0.2=py311h0815064_1 @@ -470,7 +471,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.2=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - dagster=1.5.9=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 @@ -494,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.2.1=pyhd8ed1ab_0 + - 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-postgres=0.21.9=pyhd8ed1ab_1 - fiona=1.9.5=py311h4760b73_1 - google-api-core=2.14.0=pyhd8ed1ab_0 - google-auth-oauthlib=1.1.0=pyhd8ed1ab_0 From 84ab7b3340e27efbf092b441d58bda94aedf1524 Mon Sep 17 00:00:00 2001 From: zaneselvans Date: Fri, 1 Dec 2023 04:30:57 +0000 Subject: [PATCH 05/47] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 26 +-- environments/conda-lock.yml | 302 +++++++++++++------------- environments/conda-osx-64.lock.yml | 22 +- environments/conda-osx-arm64.lock.yml | 22 +- 4 files changed, 186 insertions(+), 186 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index 2878f02634..8a9c480e14 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -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 @@ -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 @@ -444,7 +444,7 @@ dependencies: - starlette=0.32.0.post1=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,16 +481,16 @@ 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.1=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.2=pyhd8ed1ab_0 + - boto3=1.33.5=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - dagster=1.5.9=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 @@ -499,7 +499,7 @@ dependencies: - 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 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index e26cc46fc7..7e6a1381df 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.2 + version: 1.33.5 manager: conda platform: linux-64 dependencies: - botocore: ">=1.33.2,<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.2-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: f741a9ed50587ba063b732cebdd71ab1 - sha256: 74944ee7c894ce009c1f1d86aa521c2af22ede018093eee03c1d002113246774 + md5: 7485d3ee00269cd33baa2ad64a0923ee + sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 category: main optional: false - name: boto3 - version: 1.33.2 + 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.2,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.2-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: f741a9ed50587ba063b732cebdd71ab1 - sha256: 74944ee7c894ce009c1f1d86aa521c2af22ede018093eee03c1d002113246774 + md5: 7485d3ee00269cd33baa2ad64a0923ee + sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 category: main optional: false - name: boto3 - version: 1.33.2 + 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.2,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.2-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: f741a9ed50587ba063b732cebdd71ab1 - sha256: 74944ee7c894ce009c1f1d86aa521c2af22ede018093eee03c1d002113246774 + 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 @@ -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.1 + version: 0.8.2 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.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.2-pyhd8ed1ab_0.conda hash: - md5: c7de76b4b1db01f4c51ce1e4896da288 - sha256: e2972e371a6c64888a9783c3a645ad4283d4de01c93992ff836bf0e1a1dcdc87 + md5: 75e12933f4bf755c9cdd37072bcb6203 + sha256: 2e5679abcec8eb646df37518ecdbdaa224d7ff5295a1e56707317d52b47d9c79 category: main optional: false - name: s3transfer - version: 0.8.1 + version: 0.8.2 manager: conda platform: osx-64 dependencies: python: ">=3.7" botocore: ">=1.33.2,<2.0a.0" - url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.2-pyhd8ed1ab_0.conda hash: - md5: c7de76b4b1db01f4c51ce1e4896da288 - sha256: e2972e371a6c64888a9783c3a645ad4283d4de01c93992ff836bf0e1a1dcdc87 + md5: 75e12933f4bf755c9cdd37072bcb6203 + sha256: 2e5679abcec8eb646df37518ecdbdaa224d7ff5295a1e56707317d52b47d9c79 category: main optional: false - name: s3transfer - version: 0.8.1 + version: 0.8.2 manager: conda platform: osx-arm64 dependencies: python: ">=3.7" botocore: ">=1.33.2,<2.0a.0" - url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/s3transfer-0.8.2-pyhd8ed1ab_0.conda hash: - md5: c7de76b4b1db01f4c51ce1e4896da288 - sha256: e2972e371a6c64888a9783c3a645ad4283d4de01c93992ff836bf0e1a1dcdc87 + md5: 75e12933f4bf755c9cdd37072bcb6203 + sha256: 2e5679abcec8eb646df37518ecdbdaa224d7ff5295a1e56707317d52b47d9c79 category: main optional: false - name: scikit-learn @@ -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 687f953791..c267405dde 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -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 @@ -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 @@ -424,7 +424,7 @@ dependencies: - starlette=0.32.0.post1=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,15 +463,15 @@ 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.1=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.2=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 - datasette=0.64.4=pyhd8ed1ab_1 @@ -480,7 +480,7 @@ dependencies: - 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 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 2161d6af87..a670b3e378 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -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 @@ -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 @@ -424,7 +424,7 @@ dependencies: - starlette=0.32.0.post1=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,15 +463,15 @@ 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.1=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.2=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 - datasette=0.64.4=pyhd8ed1ab_1 @@ -480,7 +480,7 @@ dependencies: - 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 From 6b2f8366d13d0d65ac5c572e8ea08677ab5837e1 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Fri, 1 Dec 2023 20:17:08 -0600 Subject: [PATCH 06/47] Remove epacems_to_parquet script --- docs/dev/run_the_etl.rst | 50 ++------ docs/release_notes.rst | 5 +- pyproject.toml | 1 - src/pudl/convert/__init__.py | 8 -- src/pudl/convert/epacems_to_parquet.py | 162 ------------------------- 5 files changed, 12 insertions(+), 214 deletions(-) delete mode 100644 src/pudl/convert/epacems_to_parquet.py diff --git a/docs/dev/run_the_etl.rst b/docs/dev/run_the_etl.rst index 7c1a6a6094..dd101d6385 100644 --- a/docs/dev/run_the_etl.rst +++ b/docs/dev/run_the_etl.rst @@ -427,7 +427,7 @@ settings: - EPA CEMS cannot be loaded without EIA data unless you have existing PUDL database. -Now that your settings are configured, you're ready to run the scripts +Now that your settings are configured, you're ready to run the scripts. The Fast ETL ------------ @@ -450,8 +450,8 @@ CEMS should take around 2 hours. .. code-block:: console - $ ferc_to_sqlite settings/etl_full.yml - $ pudl_etl settings/etl_full.yml + $ ferc_to_sqlite src/pudl/package_data/settings/etl_full.yml + $ pudl_etl src/pudl/package_data/settings/etl_full.yml Custom ETL ---------- @@ -459,45 +459,17 @@ You've changed the settings and renamed the file to CUSTOM_ETL.yml .. code-block:: console - $ ferc_to_sqlite settings/CUSTOM_ETL.yml - $ pudl_etl settings/CUSTOM_ETL.yml + $ ferc_to_sqlite the/path/to/your/custom_etl.yml + $ pudl_etl the/path/to/your/custom_etl.yml -.. _add-cems-later: - -Processing EPA CEMS Separately ------------------------------- -As mentioned above, CEMS takes a while to process. Luckily, we've designed PUDL so that -if you delete or comment out CEMS lines in the settings file, you can process it -independently later without reprocessing the FERC and EIA data. The following script -will refer to your existing PUDL database for the information it needs and act as if the -FERC and EIA ETL had just been run. This may go without saying, but you need an existing -PUDL DB with the appropriate EIA files in order for the script to work. - -.. code-block:: console - - $ epacems_to_parquet -y [YEARS] -s [STATES] - -This script does not have a YAML settings file, so you must specify which years and -states to include via command line arguments. Run ``epacems_to_parquet --help`` to -verify your options. Changing CEMS settings in a YAML file will not inform this script! -Running the script without any arguments will automatically process all states and -years. - -.. warning:: - - If you process the EPA CEMS data after the fact (i.e., with the - ``epacems_to_parquet`` script), be careful that the version of PUDL used to generate - the DB is the same as the one you're using to process the CEMS data. Otherwise the - process and data may be incompatible with unpredictable results. - Additional Notes ---------------- The commands above should result in a bunch of Python :mod:`logging` output describing -what the script is doing, and file outputs in your ``$PUDL_OUTPUT`` directory. When the -ETL is complete, you should see new files at e.g. ``$PUDL_OUTPUT/ferc1_dbf.sqlite`` and -``output/pudl.sqlite`` as well as a new directory at ``output/hourly_emissions_epacems`` -containing nested directories named by year and state. +what the script is doing, and file outputs the directory you specified via the +``$PUDL_OUTPUT`` environment variable. When the ETL is complete, you should see new +files at e.g. ``$PUDL_OUTPUT/ferc1_dbf.sqlite``, ``$PUDL_OUTPUT/pudl.sqlite`` and +``$PUDL_OUTPUT/hourly_emissions_epacems.parquet``. If you need to re-run ``ferc_to_sqlite`` and want to overwrite their previous outputs you can add ``--clobber`` (run ``ferc_to_sqlite --clobber``). All of the PUDL scripts @@ -506,8 +478,8 @@ also have help messages if you want additional information (run ``script_name -- .. note:: The ``pudl_etl`` command does not have a ``--clobber`` option because each etl run - uses the same database file to read and write tables. This enables re-running - portions of the ETL. + uses the same database file to read and write tables. This facilitates re-running + small portions of the ETL using Dagster. Foreign Keys ------------ diff --git a/docs/release_notes.rst b/docs/release_notes.rst index 1f638a9075..c4d7d5997d 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -295,10 +295,6 @@ Deprecations * ``pudl.transform.eia860.transform()`` and ``pudl.transform.eia923.transform()`` functions have been deprecated. The table level EIA cleaning funtions are now coordinated using dagster. -* The :mod:`pudl.convert.epacems_to_parquet` command now executes the - ``hourly_emissions_epacems`` asset as a dagster job. The ``—partition`` option - is no longer supported. Now only creates a directory of parquet files - for each year/state partition. * ``pudl.transform.ferc1.transform()`` has been removed. The ferc1 table transformations are now being orchestrated with Dagster. * ``pudl.transform.ferc1.transform`` can no longer be executed as a script. @@ -316,6 +312,7 @@ Deprecations :mod:`pudl.settings` no longer have table attributes because the ETL no longer supports loading specific tables via settings. Use dagster to select subsets of tables to process. +* The ``epacems_to_parquet`` script has been retired in favor of using the Dagster UI. Miscellaneous ^^^^^^^^^^^^^ diff --git a/pyproject.toml b/pyproject.toml index 0dfe039d5a..3aaf3429f3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -120,7 +120,6 @@ keywords = [ [project.scripts] metadata_to_rst = "pudl.convert.metadata_to_rst:main" -epacems_to_parquet = "pudl.convert.epacems_to_parquet:main" ferc_to_sqlite = "pudl.ferc_to_sqlite.cli:main" pudl_datastore = "pudl.workspace.datastore:main" pudl_etl = "pudl.etl.cli:pudl_etl" diff --git a/src/pudl/convert/__init__.py b/src/pudl/convert/__init__.py index 02676d1eeb..1e39a45c9e 100644 --- a/src/pudl/convert/__init__.py +++ b/src/pudl/convert/__init__.py @@ -3,16 +3,8 @@ It's often useful to be able to convert entire datasets in bulk from one format to another, both independent of and within the context of the ETL pipeline. This subpackage collects those tools together in one place. - -Currently the tools use a mix of idioms, referring either to a particular -dataset and a particular format, or two formats. Some of them read from the -original raw data as organized by the :mod:`pudl.workspace` package (e.g. -:mod:`pudl.convert.ferc_to_sqlite` or :mod:`pudl.convert.epacems_to_parquet`), -and others convert metadata into RST for use in documentation -(e.g. :mod:`pudl.convert.metadata_to_rst`). """ from . import ( censusdp1tract_to_sqlite, - epacems_to_parquet, metadata_to_rst, ) diff --git a/src/pudl/convert/epacems_to_parquet.py b/src/pudl/convert/epacems_to_parquet.py deleted file mode 100644 index f15d462acc..0000000000 --- a/src/pudl/convert/epacems_to_parquet.py +++ /dev/null @@ -1,162 +0,0 @@ -"""Process raw EPA CEMS data into a Parquet dataset outside of the PUDL ETL. - -This script transforms the raw EPA CEMS data from Zip compressed CSV files into an -Apache Parquet dataset partitioned by year and state. - -Processing the EPA CEMS data requires information that's stored in the main PUDL -database, so to run this script, you must already have a PUDL database available on your -system. -""" -import argparse -import sys -from collections.abc import Callable - -from dagster import ( - DagsterInstance, - Definitions, - JobDefinition, - build_reconstructable_job, - define_asset_job, - execute_job, -) -from dotenv import load_dotenv - -import pudl -from pudl.metadata.classes import DataSource - -logger = pudl.logging_helpers.get_logger(__name__) - - -def parse_command_line(argv): - """Parse command line arguments. See the -h option. - - Args: - argv (str): Command line arguments, including caller filename. - - Returns: - dict: Dictionary of command line arguments and their parsed values. - """ - parser = argparse.ArgumentParser(description=__doc__) - - parser.add_argument( - "-y", - "--years", - nargs="+", - type=int, - help="""Which years of EPA CEMS data should be converted to Apache - Parquet format. Default is all available years, ranging from 1995 to - the present. Note that data is typically incomplete before ~2000.""", - default=DataSource.from_id("epacems").working_partitions["years"], - ) - parser.add_argument( - "-s", - "--states", - nargs="+", - type=str.upper, - help="""Which states EPA CEMS data should be converted to Apache - Parquet format, as a list of two letter US state abbreviations. Default - is everything: all 48 continental US states plus Washington DC.""", - default=DataSource.from_id("epacems").working_partitions["states"], - ) - parser.add_argument( - "-c", - "--clobber", - action="store_true", - help="""Clobber existing parquet files if they exist. If clobber is not - included but the parquet directory already exists the _build will - fail.""", - default=False, - ) - parser.add_argument( - "--gcs-cache-path", - type=str, - help="""Load datastore resources from Google Cloud Storage. - Should be gs://bucket[/path_prefix]""", - ) - parser.add_argument( - "--bypass-local-cache", - action="store_true", - default=False, - help="If enabled, the local file cache for datastore will not be used.", - ) - parser.add_argument( - "--loglevel", - help="Set logging level (DEBUG, INFO, WARNING, ERROR, or CRITICAL).", - default="INFO", - ) - parser.add_argument( - "--logfile", - default=None, - help="If specified, write logs to this file.", - ) - arguments = parser.parse_args(argv[1:]) - return arguments - - -def epacems_job_factory(loglevel: str, logfile: str) -> Callable[[], JobDefinition]: - """Factory for parameterizing a reconstructable epacems job. - - Args: - loglevel: The log level for the job's execution. - logfile: Path to a log file for the job's execution. - - Returns: - The job definition to be executed. - """ - - def get_epacems_job(): - """Create an epacems_job wrapped by to be wrapped by reconstructable.""" - pudl.logging_helpers.configure_root_logger(logfile=logfile, loglevel=loglevel) - return Definitions( - assets=pudl.etl.default_assets, - resources=pudl.etl.default_resources, - jobs=[ - define_asset_job("epacems_job", selection="hourly_emissions_epacems") - ], - ).get_job_def("epacems_job") - - return get_epacems_job - - -def main(): - """Convert zipped EPA CEMS Hourly data to Apache Parquet format.""" - load_dotenv() - args = parse_command_line(sys.argv) - # Display logged output from the PUDL package: - pudl.logging_helpers.configure_root_logger( - logfile=args.logfile, loglevel=args.loglevel - ) - - epacems_reconstructable_job = build_reconstructable_job( - "pudl.convert.epacems_to_parquet", - "epacems_job_factory", - reconstructable_kwargs={"loglevel": args.loglevel, "logfile": args.logfile}, - ) - result = execute_job( - epacems_reconstructable_job, - instance=DagsterInstance.get(), - run_config={ - "resources": { - "dataset_settings": { - "config": {"epacems": {"years": args.years, "states": args.states}} - }, - "datastore": { - "config": { - "gcs_cache_path": args.gcs_cache_path - if args.gcs_cache_path - else "", - }, - }, - }, - }, - ) - - # Workaround to reliably getting full stack trace - if not result.success: - for event in result.all_events: - if event.event_type_value == "STEP_FAILURE": - raise Exception(event.event_specific_data.error) - - -if __name__ == "__main__": - sys.exit(main()) From 4293db982a18fdd77e1544de5eeaf0111345c0c4 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Fri, 1 Dec 2023 22:40:39 -0600 Subject: [PATCH 07/47] Migrate state_demand analysis script to Kaggle example notebook. --- pyproject.toml | 1 - src/pudl/analysis/state_demand.py | 249 +----------------------------- 2 files changed, 6 insertions(+), 244 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 3aaf3429f3..e9370d4a9a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -124,7 +124,6 @@ ferc_to_sqlite = "pudl.ferc_to_sqlite.cli:main" pudl_datastore = "pudl.workspace.datastore:main" pudl_etl = "pudl.etl.cli:pudl_etl" pudl_setup = "pudl.workspace.setup_cli:main" -state_demand = "pudl.analysis.state_demand:main" pudl_check_fks = "pudl.etl.check_foreign_keys:main" # pudl_territories currently blows up memory usage to 100+ GB. # See https://github.com/catalyst-cooperative/pudl/issues/1174 diff --git a/src/pudl/analysis/state_demand.py b/src/pudl/analysis/state_demand.py index bcec43c064..d946ad11d8 100644 --- a/src/pudl/analysis/state_demand.py +++ b/src/pudl/analysis/state_demand.py @@ -1,4 +1,4 @@ -"""Predict state-level electricity demand. +"""Estimate historical hourly state-level electricity demand. Using hourly electricity demand reported at the balancing authority and utility level in the FERC 714, and service territories for utilities and balancing autorities inferred @@ -15,22 +15,15 @@ manual and could certainly be improved, but overall the results seem reasonable. Additional predictive spatial variables will be required to obtain more granular electricity demand estimates (e.g. at the county level). - -Currently the script takes no arguments and simply runs a predefined analysis across all -states and all years for which both EIA 861 and FERC 714 data are available, and outputs -the results as a CSV in PUDL_DIR/local/state-demand/demand.csv """ -import argparse import datetime -import sys from collections.abc import Iterable from typing import Any import geopandas as gpd -import matplotlib.pyplot as plt import numpy as np import pandas as pd -from dagster import AssetKey, AssetOut, Field, asset, multi_asset +from dagster import AssetOut, Field, asset, multi_asset import pudl.analysis.timeseries_cleaning import pudl.logging_helpers @@ -592,7 +585,8 @@ def predicted_state_hourly_demand( Args: imputed_hourly_demand_ferc714: Hourly demand timeseries, with columns - `respondent_id_ferc714`, report `year`, `utc_datetime`, and `demand_mwh`. + ``respondent_id_ferc714``, report ``year``, ``utc_datetime``, and + ``demand_mwh``. county_censusdp1: The county layer of the Census DP1 shapefile. fipsified_respondents_ferc714: Annual respondents with the county FIPS IDs for their service territories. @@ -600,9 +594,8 @@ def predicted_state_hourly_demand( scaled to match these totals. Returns: - Dataframe with columns - `state_id_fips`, `utc_datetime`, `demand_mwh`, and - (if `state_totals` was provided) `scaled_demand_mwh`. + Dataframe with columns ``state_id_fips``, ``utc_datetime``, ``demand_mwh``, and + (if ``state_totals`` was provided) ``scaled_demand_mwh``. """ # Get config mean_overlaps = context.op_config["mean_overlaps"] @@ -665,233 +658,3 @@ def predicted_state_hourly_demand( # Sum demand by state by matching UTC time fields = [x for x in ["demand_mwh", "scaled_demand_mwh"] if x in df] return df.groupby(["state_id_fips", "utc_datetime"], as_index=False)[fields].sum() - - -def plot_demand_timeseries( - a: pd.DataFrame, - b: pd.DataFrame = None, - window: int = 168, - title: str = None, - path: str = None, -) -> None: - """Make a timeseries plot of predicted and reference demand. - - Args: - a: Predicted demand with columns `utc_datetime` and any of - `demand_mwh` (in grey) and `scaled_demand_mwh` (in orange). - b: Reference demand with columns `utc_datetime` and `demand_mwh` (in red). - window: Width of window (in rows) to use to compute rolling means, - or `None` to plot raw values. - title: Plot title. - path: Plot path. If provided, the figure is saved to file and closed. - """ - plt.figure(figsize=(16, 8)) - # Plot predicted - for field, color in [("demand_mwh", "grey"), ("scaled_demand_mwh", "orange")]: - if field not in a: - continue - y = a[field] - if window: - y = y.rolling(window).mean() - plt.plot( - a["utc_datetime"], y, color=color, alpha=0.5, label=f"Predicted ({field})" - ) - # Plot expected - if b is not None: - y = b["demand_mwh"] - if window: - y = y.rolling(window).mean() - plt.plot( - b["utc_datetime"], y, color="red", alpha=0.5, label="Reference (demand_mwh)" - ) - if title: - plt.title(title) - plt.ylabel("Demand (MWh)") - plt.legend() - if path: - plt.savefig(path, bbox_inches="tight") - plt.close() - - -def plot_demand_scatter( - a: pd.DataFrame, - b: pd.DataFrame, - title: str = None, - path: str = None, -) -> None: - """Make a scatter plot comparing predicted and reference demand. - - Args: - a: Predicted demand with columns `utc_datetime` and any of - `demand_mwh` (in grey) and `scaled_demand_mwh` (in orange). - b: Reference demand with columns `utc_datetime` and `demand_mwh`. - Every element in `utc_datetime` must match the one in `a`. - title: Plot title. - path: Plot path. If provided, the figure is saved to file and closed. - - Raises: - ValueError: Datetime columns do not match. - """ - if not a["utc_datetime"].equals(b["utc_datetime"]): - raise ValueError("Datetime columns do not match") - plt.figure(figsize=(8, 8)) - plt.gca().set_aspect("equal") - plt.axline((0, 0), (1, 1), linestyle=":", color="grey") - for field, color in [("demand_mwh", "grey"), ("scaled_demand_mwh", "orange")]: - if field not in a: - continue - plt.scatter( - b["demand_mwh"], - a[field], - c=color, - s=0.1, - alpha=0.5, - label=f"Prediction ({field})", - ) - if title: - plt.title(title) - plt.xlabel("Reference (MWh)") - plt.ylabel("Predicted (MWh)") - plt.legend() - if path: - plt.savefig(path, bbox_inches="tight") - plt.close() - - -def compare_state_demand( - a: pd.DataFrame, b: pd.DataFrame, scaled: bool = True -) -> pd.DataFrame: - """Compute statistics comparing predicted and reference demand. - - Statistics are computed for each year. - - Args: - a: Predicted demand with columns `utc_datetime` and either - `demand_mwh` (if `scaled=False) or `scaled_demand_mwh` (if `scaled=True`). - b: Reference demand with columns `utc_datetime` and `demand_mwh`. - Every element in `utc_datetime` must match the one in `a`. - - Returns: - Dataframe with columns `year`, - `rmse` (root mean square error), and `mae` (mean absolute error). - - Raises: - ValueError: Datetime columns do not match. - """ - if not a["utc_datetime"].equals(b["utc_datetime"]): - raise ValueError("Datetime columns do not match") - field = "scaled_demand_mwh" if scaled else "demand_mwh" - df = pd.DataFrame( - { - "year": a["utc_datetime"].dt.year, - "diff": a[field] - b["demand_mwh"], - } - ) - return df.groupby(["year"], as_index=False)["diff"].agg( - { - "rmse": lambda x: np.sqrt(np.sum(x**2) / x.size), - "mae": lambda x: np.sum(np.abs(x)) / x.size, - } - ) - - -# --- Parse Command Line Args --- # -def parse_command_line(argv): - """Skeletal command line argument parser to provide a help message.""" - parser = argparse.ArgumentParser(description=__doc__) - parser.add_argument( - "--logfile", - default=None, - type=str, - help="If specified, write logs to this file.", - ) - parser.add_argument( - "--loglevel", - help="Set logging level (DEBUG, INFO, WARNING, ERROR, or CRITICAL).", - default="INFO", - ) - return parser.parse_args(argv[1:]) - - -# --- Example usage --- # - - -def main(): - """Predict state demand.""" - # --- Parse command line args --- # - args = parse_command_line(sys.argv) - - # --- Connect to PUDL logger --- # - pudl.logging_helpers.configure_root_logger( - logfile=args.logfile, loglevel=args.loglevel - ) - - # --- Connect to PUDL database --- # - - # --- Read in inputs from PUDL + dagster cache --- # - prediction = pudl.etl.defs.load_asset_value( - AssetKey("predicted_state_hourly_demand") - ) - - # --- Export results --- # - - local_dir = pudl.workspace.setup.PudlPaths().data_dir / "local" - ventyx_path = local_dir / "ventyx/state_level_load_2007_2018.csv" - base_dir = local_dir / "state-demand" - base_dir.mkdir(parents=True, exist_ok=True) - demand_path = base_dir / "demand.csv" - stats_path = base_dir / "demand-stats.csv" - timeseries_dir = base_dir / "timeseries" - timeseries_dir.mkdir(parents=True, exist_ok=True) - scatter_dir = base_dir / "scatter" - scatter_dir.mkdir(parents=True, exist_ok=True) - - # Write predicted hourly state demand - prediction.to_csv( - demand_path, index=False, date_format="%Y%m%dT%H", float_format="%.1f" - ) - - # Load Ventyx as reference if available - reference = None - if ventyx_path.exists(): - reference = load_ventyx_hourly_state_demand(ventyx_path) - - # Plots and statistics - stats = [] - for fips in prediction["state_id_fips"].unique(): - state = lookup_state(fips) - # Filter demand by state - a = prediction.query(f"state_id_fips == '{fips}'") - b = None - title = f'{state["fips"]}: {state["name"]} ({state["code"]})' - plot_name = f'{state["fips"]}-{state["name"]}.png' - if reference is not None: - b = reference.query(f"state_id_fips == '{fips}'") - # Save timeseries plot - plot_demand_timeseries( - a, b=b, window=168, title=title, path=timeseries_dir / plot_name - ) - if b is None or b.empty: - continue - # Align predicted and reference demand - a = a.set_index("utc_datetime") - b = b.set_index("utc_datetime") - index = a.index.intersection(b.index) - a = a.loc[index].reset_index() - b = b.loc[index].reset_index() - # Compute statistics - stat = compare_state_demand(a, b, scaled=True) - stat["state_id_fips"] = fips - stats.append(stat) - # Save scatter plot - plot_demand_scatter(a, b=b, title=title, path=scatter_dir / plot_name) - - # Write statistics - if reference is not None: - pd.concat(stats, ignore_index=True).to_csv( - stats_path, index=False, float_format="%.1f" - ) - - -if __name__ == "__main__": - sys.exit(main()) From bb18fdb345f632c5b15148431e2f4524535a2fdb Mon Sep 17 00:00:00 2001 From: zaneselvans Date: Sat, 2 Dec 2023 04:43:00 +0000 Subject: [PATCH 08/47] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 26 +- environments/conda-lock.yml | 354 +++++++++++++------------- environments/conda-osx-64.lock.yml | 26 +- environments/conda-osx-arm64.lock.yml | 26 +- 4 files changed, 216 insertions(+), 216 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index 8a9c480e14..20a2308441 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -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 @@ -340,7 +340,7 @@ dependencies: - hdf5=1.14.2=nompi_h4f84152_100 - html5lib=1.1=pyh9f0ad1d_0 - hypothesis=6.91.0=pyha770c72_0 - - importlib-metadata=6.8.0=pyha770c72_0 + - importlib-metadata=6.9.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 - janus=1.0.0=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.5=pyhd8ed1ab_0 + - botocore=1.33.6=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.5=py311h63ff55d_0 @@ -415,7 +415,7 @@ dependencies: - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - harfbuzz=8.3.0=h3d44ed6_0 - httpcore=1.0.2=pyhd8ed1ab_0 - - importlib_metadata=6.8.0=hd8ed1ab_0 + - importlib_metadata=6.9.0=hd8ed1ab_0 - jsonschema-specifications=2023.11.2=pyhd8ed1ab_0 - jupyter_core=5.5.0=py311h38be061_0 - jupyter_server_terminals=0.4.4=pyhd8ed1ab_1 @@ -441,21 +441,21 @@ 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.post1=py311h38be061_0 - - virtualenv=20.24.7=pyhd8ed1ab_0 + - virtualenv=20.25.0=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h46250e7_0 - aiohttp=3.8.6=py311h459d7ec_1 - - alembic=1.12.1=pyhd8ed1ab_0 + - alembic=1.13.0=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 - cachecontrol=0.13.1=pyhd8ed1ab_0 - contourpy=1.2.0=py311h9547e67_0 - - dask-core=2023.11.0=pyhd8ed1ab_0 + - dask-core=2023.12.0=pyhd8ed1ab_0 - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - folium=0.15.0=pyhd8ed1ab_0 @@ -490,9 +490,9 @@ dependencies: - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0.post1=h38be061_0 - aws-sdk-cpp=1.11.182=h8beafcf_7 - - boto3=1.33.5=pyhd8ed1ab_0 + - boto3=1.33.6=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 @@ -517,8 +517,8 @@ dependencies: - timezonefinder=6.2.0=py311h459d7ec_2 - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.9=pyhd8ed1ab_0 - - dagster-postgres=0.21.9=pyhd8ed1ab_1 + - 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 7e6a1381df..36ae4c22b6 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -266,7 +266,7 @@ package: category: main optional: false - name: alembic - version: 1.12.1 + version: 1.13.0 manager: conda platform: linux-64 dependencies: @@ -276,14 +276,14 @@ package: python: ">=3.7" sqlalchemy: ">=1.3.0" typing-extensions: ">=4" - url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.12.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.13.0-pyhd8ed1ab_0.conda hash: - md5: 15de9992b4096a2a6656ca202fde6e4c - sha256: 24019b1af4777e32843b230dd7a9bf7082943eb21bba03379ceed0bda50facf9 + md5: 7f0372c1cfa41891787ddf267334c0c7 + sha256: d6dd010632bc5272fe7e51646651c5fb9ae9b7663113b94aa585d6bcb43834b0 category: main optional: false - name: alembic - version: 1.12.1 + version: 1.13.0 manager: conda platform: osx-64 dependencies: @@ -293,14 +293,14 @@ package: python: ">=3.7" sqlalchemy: ">=1.3.0" typing-extensions: ">=4" - url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.12.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.13.0-pyhd8ed1ab_0.conda hash: - md5: 15de9992b4096a2a6656ca202fde6e4c - sha256: 24019b1af4777e32843b230dd7a9bf7082943eb21bba03379ceed0bda50facf9 + md5: 7f0372c1cfa41891787ddf267334c0c7 + sha256: d6dd010632bc5272fe7e51646651c5fb9ae9b7663113b94aa585d6bcb43834b0 category: main optional: false - name: alembic - version: 1.12.1 + version: 1.13.0 manager: conda platform: osx-arm64 dependencies: @@ -310,10 +310,10 @@ package: python: ">=3.7" sqlalchemy: ">=1.3.0" typing-extensions: ">=4" - url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.12.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.13.0-pyhd8ed1ab_0.conda hash: - md5: 15de9992b4096a2a6656ca202fde6e4c - sha256: 24019b1af4777e32843b230dd7a9bf7082943eb21bba03379ceed0bda50facf9 + md5: 7f0372c1cfa41891787ddf267334c0c7 + sha256: d6dd010632bc5272fe7e51646651c5fb9ae9b7663113b94aa585d6bcb43834b0 category: main optional: false - name: aniso8601 @@ -1914,52 +1914,52 @@ package: category: main optional: false - name: boto3 - version: 1.33.5 + version: 1.33.6 manager: conda platform: linux-64 dependencies: - botocore: ">=1.33.5,<1.34.0" + botocore: ">=1.33.6,<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.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.6-pyhd8ed1ab_0.conda hash: - md5: 7485d3ee00269cd33baa2ad64a0923ee - sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 + md5: fff8f43d8786f4e2a0ab4ed431f8c511 + sha256: 7fad398c6730cb751de3495b8204a7cd133aeecdd684273bc3359f31e1c01eca category: main optional: false - name: boto3 - version: 1.33.5 + version: 1.33.6 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.5,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.5-pyhd8ed1ab_0.conda + botocore: ">=1.33.6,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.6-pyhd8ed1ab_0.conda hash: - md5: 7485d3ee00269cd33baa2ad64a0923ee - sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 + md5: fff8f43d8786f4e2a0ab4ed431f8c511 + sha256: 7fad398c6730cb751de3495b8204a7cd133aeecdd684273bc3359f31e1c01eca category: main optional: false - name: boto3 - version: 1.33.5 + version: 1.33.6 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.5,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.5-pyhd8ed1ab_0.conda + botocore: ">=1.33.6,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.6-pyhd8ed1ab_0.conda hash: - md5: 7485d3ee00269cd33baa2ad64a0923ee - sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 + md5: fff8f43d8786f4e2a0ab4ed431f8c511 + sha256: 7fad398c6730cb751de3495b8204a7cd133aeecdd684273bc3359f31e1c01eca category: main optional: false - name: botocore - version: 1.33.5 + version: 1.33.6 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.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.6-pyhd8ed1ab_0.conda hash: - md5: 352c39ba5cd9ea01996358f0748e102e - sha256: 56566ea8f3a48c24190c1dcf50681c0a84b26821c335c21b5c3c5d238e4bdb14 + md5: e1c7565a0bfba34c3be07a3ad882356f + sha256: 06549a55df5711e0306395e8187f03c46f25337fb7e9ab6c014cf26a76ca9cef category: main optional: false - name: botocore - version: 1.33.5 + version: 1.33.6 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.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.6-pyhd8ed1ab_0.conda hash: - md5: 352c39ba5cd9ea01996358f0748e102e - sha256: 56566ea8f3a48c24190c1dcf50681c0a84b26821c335c21b5c3c5d238e4bdb14 + md5: e1c7565a0bfba34c3be07a3ad882356f + sha256: 06549a55df5711e0306395e8187f03c46f25337fb7e9ab6c014cf26a76ca9cef category: main optional: false - name: botocore - version: 1.33.5 + version: 1.33.6 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.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.6-pyhd8ed1ab_0.conda hash: - md5: 352c39ba5cd9ea01996358f0748e102e - sha256: 56566ea8f3a48c24190c1dcf50681c0a84b26821c335c21b5c3c5d238e4bdb14 + md5: e1c7565a0bfba34c3be07a3ad882356f + sha256: 06549a55df5711e0306395e8187f03c46f25337fb7e9ab6c014cf26a76ca9cef category: main optional: false - name: bottleneck @@ -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_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.10-pyhd8ed1ab_0.conda hash: - md5: 8c1a941fe77b920b1c7933a7a0c6bf2e - sha256: 0e947f376d6878bd8e505932277e84c373da492a38d2c4ef9d96fc25f5327845 + 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_1.conda + dagster: 1.5.10.* + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.10-pyhd8ed1ab_0.conda hash: - md5: 8c1a941fe77b920b1c7933a7a0c6bf2e - sha256: 0e947f376d6878bd8e505932277e84c373da492a38d2c4ef9d96fc25f5327845 + 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_1.conda + dagster: 1.5.10.* + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.10-pyhd8ed1ab_0.conda hash: - md5: 8c1a941fe77b920b1c7933a7a0c6bf2e - sha256: 0e947f376d6878bd8e505932277e84c373da492a38d2c4ef9d96fc25f5327845 + 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,16 +4086,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: dask-core - version: 2023.11.0 + version: 2023.12.0 manager: conda platform: linux-64 dependencies: @@ -4108,14 +4108,14 @@ package: python: ">=3.9" pyyaml: ">=5.3.1" toolz: ">=0.10.0" - url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.12.0-pyhd8ed1ab_0.conda hash: - md5: 3bf8f5c3fbab9e0cfffdf5914f021854 - sha256: f23b4e5d8f118d9d7916d8def04dab9a299d73879216da72dd7168c1c30ecb9e + md5: 95eae0785aed72998493140dc0115382 + sha256: e366163aa7325d14ca38ca72ca4672eeb4b7a7453573c47cfa90d0db60136b48 category: main optional: false - name: dask-core - version: 2023.11.0 + version: 2023.12.0 manager: conda platform: osx-64 dependencies: @@ -4128,14 +4128,14 @@ package: importlib_metadata: ">=4.13.0" fsspec: ">=2021.09.0" click: ">=8.1" - url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.12.0-pyhd8ed1ab_0.conda hash: - md5: 3bf8f5c3fbab9e0cfffdf5914f021854 - sha256: f23b4e5d8f118d9d7916d8def04dab9a299d73879216da72dd7168c1c30ecb9e + md5: 95eae0785aed72998493140dc0115382 + sha256: e366163aa7325d14ca38ca72ca4672eeb4b7a7453573c47cfa90d0db60136b48 category: main optional: false - name: dask-core - version: 2023.11.0 + version: 2023.12.0 manager: conda platform: osx-arm64 dependencies: @@ -4148,10 +4148,10 @@ package: importlib_metadata: ">=4.13.0" fsspec: ">=2021.09.0" click: ">=8.1" - url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.12.0-pyhd8ed1ab_0.conda hash: - md5: 3bf8f5c3fbab9e0cfffdf5914f021854 - sha256: f23b4e5d8f118d9d7916d8def04dab9a299d73879216da72dd7168c1c30ecb9e + md5: 95eae0785aed72998493140dc0115382 + sha256: e366163aa7325d14ca38ca72ca4672eeb4b7a7453573c47cfa90d0db60136b48 category: main optional: false - name: dataclasses @@ -8292,78 +8292,78 @@ package: category: main optional: false - name: importlib-metadata - version: 6.8.0 + version: 6.9.0 manager: conda platform: linux-64 dependencies: python: ">=3.8" zipp: ">=0.5" - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.8.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.9.0-pyha770c72_0.conda hash: - md5: 4e9f59a060c3be52bc4ddc46ee9b6946 - sha256: 2797ed927d65324309b6c630190d917b9f2111e0c217b721f80429aeb57f9fcf + md5: 9677d53e8eb8e3282e9d84c5d0c525d7 + sha256: e43e6c2b76b76219268444907ab0797604be225fa1f3bfef1c666ec005fab07b category: main optional: false - name: importlib-metadata - version: 6.8.0 + version: 6.9.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" zipp: ">=0.5" - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.8.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.9.0-pyha770c72_0.conda hash: - md5: 4e9f59a060c3be52bc4ddc46ee9b6946 - sha256: 2797ed927d65324309b6c630190d917b9f2111e0c217b721f80429aeb57f9fcf + md5: 9677d53e8eb8e3282e9d84c5d0c525d7 + sha256: e43e6c2b76b76219268444907ab0797604be225fa1f3bfef1c666ec005fab07b category: main optional: false - name: importlib-metadata - version: 6.8.0 + version: 6.9.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" zipp: ">=0.5" - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.8.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.9.0-pyha770c72_0.conda hash: - md5: 4e9f59a060c3be52bc4ddc46ee9b6946 - sha256: 2797ed927d65324309b6c630190d917b9f2111e0c217b721f80429aeb57f9fcf + md5: 9677d53e8eb8e3282e9d84c5d0c525d7 + sha256: e43e6c2b76b76219268444907ab0797604be225fa1f3bfef1c666ec005fab07b category: main optional: false - name: importlib_metadata - version: 6.8.0 + version: 6.9.0 manager: conda platform: linux-64 dependencies: - importlib-metadata: ">=6.8.0,<6.8.1.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.8.0-hd8ed1ab_0.conda + importlib-metadata: ">=6.9.0,<6.9.1.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.9.0-hd8ed1ab_0.conda hash: - md5: b279b07ce18058034e5b3606ba103a8b - sha256: b96e01dc42d547d6d9ceb1c5b52a5232cc04e40153534350f702c3e0418a6b3f + md5: a0c28e5b7f824a19bd8ee9255c9bd58c + sha256: 01633076b64cfd0a163f9665864449bce3fa0377f2b12a0bf0dacc5baaeec206 category: main optional: false - name: importlib_metadata - version: 6.8.0 + version: 6.9.0 manager: conda platform: osx-64 dependencies: - importlib-metadata: ">=6.8.0,<6.8.1.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.8.0-hd8ed1ab_0.conda + importlib-metadata: ">=6.9.0,<6.9.1.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.9.0-hd8ed1ab_0.conda hash: - md5: b279b07ce18058034e5b3606ba103a8b - sha256: b96e01dc42d547d6d9ceb1c5b52a5232cc04e40153534350f702c3e0418a6b3f + md5: a0c28e5b7f824a19bd8ee9255c9bd58c + sha256: 01633076b64cfd0a163f9665864449bce3fa0377f2b12a0bf0dacc5baaeec206 category: main optional: false - name: importlib_metadata - version: 6.8.0 + version: 6.9.0 manager: conda platform: osx-arm64 dependencies: - importlib-metadata: ">=6.8.0,<6.8.1.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.8.0-hd8ed1ab_0.conda + importlib-metadata: ">=6.9.0,<6.9.1.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.9.0-hd8ed1ab_0.conda hash: - md5: b279b07ce18058034e5b3606ba103a8b - sha256: b96e01dc42d547d6d9ceb1c5b52a5232cc04e40153534350f702c3e0418a6b3f + md5: a0c28e5b7f824a19bd8ee9255c9bd58c + sha256: 01633076b64cfd0a163f9665864449bce3fa0377f2b12a0bf0dacc5baaeec206 category: main optional: false - name: importlib_resources @@ -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 @@ -22876,7 +22876,7 @@ package: category: main optional: false - name: virtualenv - version: 20.24.7 + version: 20.25.0 manager: conda platform: linux-64 dependencies: @@ -22884,14 +22884,14 @@ package: filelock: <4,>=3.12.2 platformdirs: <5,>=3.9.1 python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.24.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.25.0-pyhd8ed1ab_0.conda hash: - md5: db990278c2c00b268eed778de44f6057 - sha256: ad661ae59c64bd73c25dfadb00c601659f4d9cafbf428e36a690075e52bac96a + md5: c119653cba436d8183c27bf6d190e587 + sha256: 50827c3721a9dbf973b568709d4381add2a6552fa562f26a385c5edc16a534af category: main optional: false - name: virtualenv - version: 20.24.7 + version: 20.25.0 manager: conda platform: osx-64 dependencies: @@ -22899,14 +22899,14 @@ package: distlib: <1,>=0.3.7 filelock: <4,>=3.12.2 platformdirs: <5,>=3.9.1 - url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.24.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.25.0-pyhd8ed1ab_0.conda hash: - md5: db990278c2c00b268eed778de44f6057 - sha256: ad661ae59c64bd73c25dfadb00c601659f4d9cafbf428e36a690075e52bac96a + md5: c119653cba436d8183c27bf6d190e587 + sha256: 50827c3721a9dbf973b568709d4381add2a6552fa562f26a385c5edc16a534af category: main optional: false - name: virtualenv - version: 20.24.7 + version: 20.25.0 manager: conda platform: osx-arm64 dependencies: @@ -22914,10 +22914,10 @@ package: distlib: <1,>=0.3.7 filelock: <4,>=3.12.2 platformdirs: <5,>=3.9.1 - url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.24.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.25.0-pyhd8ed1ab_0.conda hash: - md5: db990278c2c00b268eed778de44f6057 - sha256: ad661ae59c64bd73c25dfadb00c601659f4d9cafbf428e36a690075e52bac96a + md5: c119653cba436d8183c27bf6d190e587 + sha256: 50827c3721a9dbf973b568709d4381add2a6552fa562f26a385c5edc16a534af category: main optional: false - name: watchdog diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index c267405dde..d7ce284ad0 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -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 @@ -320,7 +320,7 @@ dependencies: - hdf5=1.14.2=nompi_hedada53_100 - html5lib=1.1=pyh9f0ad1d_0 - hypothesis=6.91.0=pyha770c72_0 - - importlib-metadata=6.8.0=pyha770c72_0 + - importlib-metadata=6.9.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 - janus=1.0.0=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.5=pyhd8ed1ab_0 + - botocore=1.33.6=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.5=py311hd51016d_0 @@ -394,7 +394,7 @@ dependencies: - graphql-relay=3.2.0=pyhd8ed1ab_0 - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - httpcore=1.0.2=pyhd8ed1ab_0 - - importlib_metadata=6.8.0=hd8ed1ab_0 + - importlib_metadata=6.9.0=hd8ed1ab_0 - jsonschema-specifications=2023.11.2=pyhd8ed1ab_0 - jupyter_core=5.5.0=py311h6eed73b_0 - jupyter_server_terminals=0.4.4=pyhd8ed1ab_1 @@ -421,21 +421,21 @@ 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.post1=py311h6eed73b_0 - - virtualenv=20.24.7=pyhd8ed1ab_0 + - virtualenv=20.25.0=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h5e0f0e4_0 - aiohttp=3.8.6=py311he705e18_1 - - alembic=1.12.1=pyhd8ed1ab_0 + - alembic=1.13.0=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 - cachecontrol=0.13.1=pyhd8ed1ab_0 - contourpy=1.2.0=py311h7bea37d_0 - - dask-core=2023.11.0=pyhd8ed1ab_0 + - dask-core=2023.12.0=pyhd8ed1ab_0 - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - folium=0.15.0=pyhd8ed1ab_0 @@ -471,9 +471,9 @@ dependencies: - typeguard=4.1.5=pyhd8ed1ab_1 - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0.post1=h6eed73b_0 - - boto3=1.33.5=pyhd8ed1ab_0 + - boto3=1.33.6=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 @@ -497,8 +497,8 @@ dependencies: - timezonefinder=6.2.0=py311he705e18_2 - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.9=pyhd8ed1ab_0 - - dagster-postgres=0.21.9=pyhd8ed1ab_1 + - 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 a670b3e378..4d739e71b8 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -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 @@ -320,7 +320,7 @@ dependencies: - hdf5=1.14.2=nompi_h3aba7b3_100 - html5lib=1.1=pyh9f0ad1d_0 - hypothesis=6.91.0=pyha770c72_0 - - importlib-metadata=6.8.0=pyha770c72_0 + - importlib-metadata=6.9.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 - janus=1.0.0=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.5=pyhd8ed1ab_0 + - botocore=1.33.6=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.5=py311h71175c2_0 @@ -394,7 +394,7 @@ dependencies: - graphql-relay=3.2.0=pyhd8ed1ab_0 - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - httpcore=1.0.2=pyhd8ed1ab_0 - - importlib_metadata=6.8.0=hd8ed1ab_0 + - importlib_metadata=6.9.0=hd8ed1ab_0 - jsonschema-specifications=2023.11.2=pyhd8ed1ab_0 - jupyter_core=5.5.0=py311h267d04e_0 - jupyter_server_terminals=0.4.4=pyhd8ed1ab_1 @@ -421,21 +421,21 @@ 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.post1=py311h267d04e_0 - - virtualenv=20.24.7=pyhd8ed1ab_0 + - virtualenv=20.25.0=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h94f323b_0 - aiohttp=3.8.6=py311h05b510d_1 - - alembic=1.12.1=pyhd8ed1ab_0 + - alembic=1.13.0=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 - cachecontrol=0.13.1=pyhd8ed1ab_0 - contourpy=1.2.0=py311hd03642b_0 - - dask-core=2023.11.0=pyhd8ed1ab_0 + - dask-core=2023.12.0=pyhd8ed1ab_0 - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - folium=0.15.0=pyhd8ed1ab_0 @@ -471,9 +471,9 @@ dependencies: - typeguard=4.1.5=pyhd8ed1ab_1 - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0.post1=ha1ab1f8_0 - - boto3=1.33.5=pyhd8ed1ab_0 + - boto3=1.33.6=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 @@ -497,8 +497,8 @@ dependencies: - timezonefinder=6.2.0=py311h05b510d_2 - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.9=pyhd8ed1ab_0 - - dagster-postgres=0.21.9=pyhd8ed1ab_1 + - 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 7dd3fdc4718847fea7a049811a3614c9991fe30a Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Fri, 1 Dec 2023 22:55:00 -0600 Subject: [PATCH 09/47] Remove reference to epacems_to_parquet from CEMS dataset docs --- docs/templates/epacems_child.rst.jinja | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/docs/templates/epacems_child.rst.jinja b/docs/templates/epacems_child.rst.jinja index a56c1e0e8c..6c16c425b1 100644 --- a/docs/templates/epacems_child.rst.jinja +++ b/docs/templates/epacems_child.rst.jinja @@ -66,15 +66,13 @@ encompassing a year of data. CEMS is enourmous ----------------- CEMS is by far the largest dataset in PUDL what with hourly records for -thousands of plants spanning decades. For this reason, we house CEMS data in `Apache -Parquet `__ files rather than the main PUDL database. -Still, running the ETL with all of the CEMS data can take a long time. Note that you can -:ref:`process CEMS Data seperately ` from the main ETL -script if you'd like. - -Check out the `EPA CEMS example notebook `__ -in our `pudl-examples repository `__ -on GitHub for pointers on how to access this dataset efficiently using :mod:`dask`. +thousands of plants spanning decades. For this reason, we distribute CEMS data using `Apache +Parquet `__ files rather than in the main PUDL database. + +Check out the `PUDL data access example notebook on Kaggle +`__ or in our +`pudl-examples repository `__ on +GitHub for pointers on how to access this dataset efficiently using :mod:`dask`. EPA units vs. EIA units ----------------------- From ec6071846860e5fbc6ec64772163687ad6892102 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Sat, 2 Dec 2023 09:56:42 -0600 Subject: [PATCH 10/47] Migrate pudl_check_fks to use click --- pyproject.toml | 8 +-- src/pudl/etl/check_foreign_keys.py | 81 ++++++++++++++---------------- 2 files changed, 40 insertions(+), 49 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e9370d4a9a..5bda778938 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -124,7 +124,7 @@ ferc_to_sqlite = "pudl.ferc_to_sqlite.cli:main" pudl_datastore = "pudl.workspace.datastore:main" pudl_etl = "pudl.etl.cli:pudl_etl" pudl_setup = "pudl.workspace.setup_cli:main" -pudl_check_fks = "pudl.etl.check_foreign_keys:main" +pudl_check_fks = "pudl.etl.check_foreign_keys:pudl_check_fks" # pudl_territories currently blows up memory usage to 100+ GB. # See https://github.com/catalyst-cooperative/pudl/issues/1174 # pudl_territories = "pudl.analysis.service_territory:main" @@ -271,11 +271,7 @@ log_format = "%(asctime)s [%(levelname)8s] %(name)s:%(lineno)s %(message)s" log_date_format = "%Y-%m-%d %H:%M:%S" log_cli = "true" log_cli_level = "DEBUG" -doctest_optionflags = [ - "NORMALIZE_WHITESPACE", - "IGNORE_EXCEPTION_DETAIL", - "ELLIPSIS", -] +doctest_optionflags = ["NORMALIZE_WHITESPACE", "IGNORE_EXCEPTION_DETAIL", "ELLIPSIS"] [tool.conda-lock] channels = ["conda-forge", "defaults"] diff --git a/src/pudl/etl/check_foreign_keys.py b/src/pudl/etl/check_foreign_keys.py index e28dcebe4c..4639fb5e61 100644 --- a/src/pudl/etl/check_foreign_keys.py +++ b/src/pudl/etl/check_foreign_keys.py @@ -1,18 +1,8 @@ -"""A command line interface (CLI) to check foreign key constraints in the PUDL database. - -Assets are executed once their upstream dependencies have been executed. However, this -order is non deterministic because they are executed in parallel. This means the order -that tables are loaded into ``pudl.sqlite`` will not satisfy foreign key constraints. - -Foreign key constraints on ``pudl.sqlite`` are disabled so dagster can load tables into -the database without a foreign key error being raised. However, foreign key constraints -can be evaluated after all of the data has been loaded into the database. To check the -constraints, run the ``pudl_check_fks`` cli command once the data has been loaded into -``pudl.sqlite``. -""" -import argparse +"""Check that foreign key constraints in the PUDL database are respected.""" +import pathlib import sys +import click from dagster import build_init_resource_context from dotenv import load_dotenv @@ -22,39 +12,43 @@ logger = pudl.logging_helpers.get_logger(__name__) -def parse_command_line(argv): - """Parse script command line arguments. See the -h option. - - Args: - argv (list): command line arguments including caller file name. - - Returns: - dict: A dictionary mapping command line arguments to their values. +@click.command( + context_settings={"help_option_names": ["-h", "--help"]}, +) +@click.option( + "--logfile", + help="If specified, write logs to this file.", + type=click.Path( + exists=False, + resolve_path=True, + path_type=pathlib.Path, + ), +) +@click.option( + "--loglevel", + default="INFO", + type=click.Choice( + ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], case_sensitive=False + ), +) +def pudl_check_fks(logfile: pathlib.Path, loglevel: str): + """Check that foreign key constraints in the PUDL database are respected. + + Dagster manages the dependencies between various assets in our ETL pipeline, + attempting to materialize tables only after their upstream dependencies have been + satisfied. However, this order is non deterministic because they are executed in + parallel, and doesn't necessarily correspond to the foreign-key constraints within + the database, so durint the ETL we disable foreign key constraints within + ``pudl.sqlite``. + + However, we still expect foreign key constraints to be satisfied once all of the + tables have been loaded, so we check that they are valid after the ETL has + completed. This script runs the same check. """ - parser = argparse.ArgumentParser(description=__doc__) - parser.add_argument( - "--logfile", - default=None, - help="If specified, write logs to this file.", - ) - parser.add_argument( - "--loglevel", - help="Set logging level (DEBUG, INFO, WARNING, ERROR, or CRITICAL).", - default="INFO", - ) - arguments = parser.parse_args(argv[1:]) - return arguments - - -def main(): - """Parse command line and check PUDL foreign key constraints.""" load_dotenv() - args = parse_command_line(sys.argv) # Display logged output from the PUDL package: - pudl.logging_helpers.configure_root_logger( - logfile=args.logfile, loglevel=args.loglevel - ) + pudl.logging_helpers.configure_root_logger(logfile=logfile, loglevel=loglevel) context = build_init_resource_context() io_manager = pudl_sqlite_io_manager(context) @@ -63,7 +57,8 @@ def main(): logger.info(f"Checking foreign key constraints in {database_path}") io_manager.check_foreign_keys() + return 0 if __name__ == "__main__": - sys.exit(main()) + sys.exit(pudl_check_fks()) From 0c52ab94cd763cc0e86008f2adf25c912605f165 Mon Sep 17 00:00:00 2001 From: zaneselvans Date: Sat, 2 Dec 2023 15:59:10 +0000 Subject: [PATCH 11/47] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 2 +- environments/conda-lock.yml | 16 ++++++++-------- environments/conda-osx-64.lock.yml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index 20a2308441..a213a9a25b 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -331,7 +331,7 @@ dependencies: - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311h459d7ec_0 - curl=8.4.0=hca28451_0 - - fonttools=4.45.1=py311h459d7ec_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 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 36ae4c22b6..ea401dd61c 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -5409,7 +5409,7 @@ package: category: main optional: false - name: fonttools - version: 4.45.1 + version: 4.46.0 manager: conda platform: linux-64 dependencies: @@ -5418,14 +5418,14 @@ package: munkres: "" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.45.1-py311h459d7ec_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.46.0-py311h459d7ec_0.conda hash: - md5: 5b24692ece82f89e5cb9a469d9619731 - sha256: 57d311f86568d46f33845ea8c7d1c9e449a1fa85e510baa17f09e2cae2283681 + md5: a14114f70e23f7fd5ab9941fec45b095 + sha256: a40f8415d9ceaf5f217034814b984d13017e4dab577085a83a2d0cc39b9d7239 category: main optional: false - name: fonttools - version: 4.45.1 + version: 4.46.0 manager: conda platform: osx-64 dependencies: @@ -5433,10 +5433,10 @@ package: munkres: "" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/fonttools-4.45.1-py311he705e18_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/fonttools-4.46.0-py311he705e18_0.conda hash: - md5: 2910a2886c556ce4085fd59d73ae96f2 - sha256: 5a60241d7585b33160c169ae59b9bd9445c89bfb4604b2d77e7a0db48c04ccc5 + md5: c68a6370b0db24b87be1a4cd7a511545 + sha256: 05c4b4fe22ce74bd5145dacf261cec44bbadac82d1e65a0b3a03d2675330f1bb category: main optional: false - name: fonttools diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index d7ce284ad0..a098816cfe 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -310,7 +310,7 @@ dependencies: - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311h2725bcf_0 - curl=8.4.0=h726d00d_0 - - fonttools=4.45.1=py311he705e18_0 + - fonttools=4.46.0=py311he705e18_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 - grpcio=1.59.2=py311hfd95bfa_0 From feedb61c78d9611af3c77262644e90c02b7cbca2 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Sat, 2 Dec 2023 13:39:03 -0600 Subject: [PATCH 12/47] Exclude nonexistent entity_types_eia table from docs build --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 6721aec6c8..6935f09761 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -137,7 +137,7 @@ def data_dictionary_metadata_to_rst(app): """Export data dictionary metadata to RST for inclusion in the documentation.""" # Create an RST Data Dictionary for the PUDL DB: print("Exporting PUDL DB data dictionary metadata to RST.") - skip_names = ["datasets", "accumulated_depreciation_ferc1"] + skip_names = ["datasets", "accumulated_depreciation_ferc1", "entity_types_eia"] names = [name for name in RESOURCE_METADATA if name not in skip_names] package = Package.from_resource_ids(resource_ids=tuple(sorted(names))) # Sort fields within each resource by name: From b00462ff04fe8570c1f8b06ab5565deb7f7d789b Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Sat, 2 Dec 2023 13:52:04 -0600 Subject: [PATCH 13/47] Migrate metadata_to_rst to use Click framework. --- pyproject.toml | 2 +- src/pudl/convert/metadata_to_rst.py | 124 ++++++++++++++++------------ 2 files changed, 72 insertions(+), 54 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5bda778938..1fef9954e7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -119,7 +119,7 @@ keywords = [ ] [project.scripts] -metadata_to_rst = "pudl.convert.metadata_to_rst:main" +metadata_to_rst = "pudl.convert.metadata_to_rst:metadata_to_rst" ferc_to_sqlite = "pudl.ferc_to_sqlite.cli:main" pudl_datastore = "pudl.workspace.datastore:main" pudl_etl = "pudl.etl.cli:pudl_etl" diff --git a/src/pudl/convert/metadata_to_rst.py b/src/pudl/convert/metadata_to_rst.py index 4e92453a09..372407330c 100644 --- a/src/pudl/convert/metadata_to_rst.py +++ b/src/pudl/convert/metadata_to_rst.py @@ -1,8 +1,9 @@ """Export PUDL table and field metadata to RST for use in documentation.""" -import argparse +import pathlib import sys -from pathlib import Path + +import click import pudl.logging_helpers from pudl.metadata.classes import Package @@ -11,64 +12,81 @@ logger = pudl.logging_helpers.get_logger(__name__) -def parse_command_line(argv): - """Parse command line arguments. See the -h option. - - Args: - argv (str): Command line arguments, including caller filename. +@click.command( + context_settings={"help_option_names": ["-h", "--help"]}, +) +@click.option( + "--skip", + "-s", + help=( + "Name of a table that should be skipped and excluded from RST output. " + "Use this option multiple times to skip multiple tables." + ), + type=str, + default=[], + multiple=True, +) +@click.option( + "--output", + "-o", + type=click.Path(), + default=None, + help="Path to which the RST output should be written. Defaults to STDOUT.", +) +@click.option( + "--docs-dir", + "-d", + type=click.Path( + exists=True, + dir_okay=True, + file_okay=False, + resolve_path=True, + path_type=pathlib.Path, + writable=True, + ), + default=pathlib.Path().cwd() / "docs", + help=( + "Path to the PUDL repository docs directory. " + "Must exist and be writable. Defaults to ./docs/" + ), +) +@click.option( + "--logfile", + help="If specified, write logs to this file.", + type=click.Path( + exists=False, + resolve_path=True, + path_type=pathlib.Path, + ), +) +@click.option( + "--loglevel", + default="INFO", + type=click.Choice( + ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], case_sensitive=False + ), +) +def metadata_to_rst( + skip: list[str], + output: pathlib.Path, + docs_dir: pathlib.Path, + logfile: pathlib.Path, + loglevel: str, +): + """Export PUDL table and field metadata to RST for use in documentation. - Returns: - dict: Dictionary of command line arguments and their parsed values. + metadata_to_rst -s bad_table1 -s bad_table2 -d ./pudl/docs -o ./datadict.rst """ - parser = argparse.ArgumentParser(description=__doc__) - parser.add_argument( - "--skip", - help="List of table names that should be skipped and excluded from RST output.", - nargs="*", - default=[], - ) - parser.add_argument( - "-o", - "--output", - help="Path to the file where the RST output should be written.", - default=False, - ) - parser.add_argument( - "--docs_dir", - help="Path to docs directory.", - type=lambda x: Path(x).resolve(), - default=Path().cwd() / "docs", - ) - parser.add_argument( - "--logfile", - default=None, - type=str, - help="If specified, write logs to this file.", - ) - parser.add_argument( - "--loglevel", - help="Set logging level (DEBUG, INFO, WARNING, ERROR, or CRITICAL).", - default="INFO", - ) - arguments = parser.parse_args(argv[1:]) - return arguments - - -def main(): - """Run conversion from json to rst.""" - args = parse_command_line(sys.argv) - pudl.logging_helpers.configure_root_logger( - logfile=args.logfile, loglevel=args.loglevel - ) + pudl.logging_helpers.configure_root_logger(logfile=logfile, loglevel=loglevel) - logger.info(f"Exporting PUDL metadata to: {args.output}") - resource_ids = [rid for rid in sorted(RESOURCE_METADATA) if rid not in args.skip] + logger.info(f"Exporting PUDL metadata to: {output}") + resource_ids = [rid for rid in sorted(RESOURCE_METADATA) if rid not in skip] package = Package.from_resource_ids(resource_ids=tuple(sorted(resource_ids))) # Sort fields within each resource by name: for resource in package.resources: resource.schema.fields = sorted(resource.schema.fields, key=lambda x: x.name) - package.to_rst(docs_dir=args.docs_dir, path=args.output) + package.to_rst(docs_dir=docs_dir, path=output) if __name__ == "__main__": - sys.exit(main()) + sys.exit(metadata_to_rst()) From f0d70227245b1b58023bcf34a180c8af549a8824 Mon Sep 17 00:00:00 2001 From: zaneselvans Date: Sat, 2 Dec 2023 19:54:42 +0000 Subject: [PATCH 14/47] Update conda-lock.yml and rendered conda environment files. --- environments/conda-lock.yml | 8 ++++---- environments/conda-osx-arm64.lock.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index ea401dd61c..72e05fd755 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -5440,7 +5440,7 @@ package: category: main optional: false - name: fonttools - version: 4.45.1 + version: 4.46.0 manager: conda platform: osx-arm64 dependencies: @@ -5448,10 +5448,10 @@ package: munkres: "" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/fonttools-4.45.1-py311h05b510d_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/fonttools-4.46.0-py311h05b510d_0.conda hash: - md5: 40c7471beb6af15161a202c0ddf04d82 - sha256: 7d8d2c8de468dc5a432e8d083f3b56eeec4380749bcfd09a44c81d42cacceece + md5: 1bac60f34700b22c8e8364f32b502211 + sha256: 300d8cc1cc987ab913e3b24c38f8eaf679acff0e885747a3f71471fd92db3e33 category: main optional: false - name: fqdn diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 4d739e71b8..fe3ea266d4 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -310,7 +310,7 @@ dependencies: - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311heffc1b2_0 - curl=8.4.0=h2d989ff_0 - - fonttools=4.45.1=py311h05b510d_0 + - fonttools=4.46.0=py311h05b510d_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 - grpcio=1.59.2=py311h79dd126_0 From 3d741d3a5f62e8921ea4670ad7dbcdbde0a0d61c Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Sat, 2 Dec 2023 20:37:38 -0600 Subject: [PATCH 15/47] Migrate pudl_datastore to use Click. --- pyproject.toml | 2 +- src/pudl/workspace/datastore.py | 291 ++++++++++++++++++-------------- 2 files changed, 169 insertions(+), 124 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1fef9954e7..70650a66bf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -121,7 +121,7 @@ keywords = [ [project.scripts] metadata_to_rst = "pudl.convert.metadata_to_rst:metadata_to_rst" ferc_to_sqlite = "pudl.ferc_to_sqlite.cli:main" -pudl_datastore = "pudl.workspace.datastore:main" +pudl_datastore = "pudl.workspace.datastore:pudl_datastore" pudl_etl = "pudl.etl.cli:pudl_etl" pudl_setup = "pudl.workspace.setup_cli:main" pudl_check_fks = "pudl.etl.check_foreign_keys:pudl_check_fks" diff --git a/src/pudl/workspace/datastore.py b/src/pudl/workspace/datastore.py index 1316070865..4a66093fdf 100644 --- a/src/pudl/workspace/datastore.py +++ b/src/pudl/workspace/datastore.py @@ -1,8 +1,8 @@ """Datastore manages file retrieval for PUDL datasets.""" -import argparse import hashlib import io import json +import pathlib import re import sys import zipfile @@ -12,6 +12,7 @@ from typing import Annotated, Any, Self from urllib.parse import ParseResult, urlparse +import click import datapackage import requests from google.auth.exceptions import DefaultCredentialsError @@ -412,114 +413,22 @@ def get_zipfile_file_names(self, zip_file: zipfile.ZipFile): return zipfile.ZipFile.namelist(zip_file) -class ParseKeyValues(argparse.Action): - """Transforms k1=v1,k2=v2,... - - into dict(k1=v1, k2=v2, ...). - """ - - def __call__(self, parser, namespace, values, option_string=None): - """Parses the argument value into dict.""" - d = getattr(namespace, self.dest, {}) - if isinstance(values, str): - values = [values] - for val in values: - for kv in val.split(","): - k, v = kv.split("=") - d[k] = v - setattr(namespace, self.dest, d) - - -def parse_command_line(): - """Collect the command line arguments.""" - known_datasets = "\n".join( - [f" - {x}" for x in ZenodoFetcher().get_known_datasets()] - ) - - dataset_msg = f""" -Available Datasets: -{known_datasets}""" - - parser = argparse.ArgumentParser( - description="Download and cache ETL source data from Zenodo.", - epilog=dataset_msg, - formatter_class=argparse.RawTextHelpFormatter, - ) - - parser.add_argument( - "--dataset", - help="Download the specified dataset only. See below for available options. " - "The default is to download all datasets, which may take hours depending on " - "network speed.", - ) - parser.add_argument( - "--validate", - help="Validate locally cached datapackages, but don't download anything.", - action="store_true", - default=False, - ) - parser.add_argument( - "--loglevel", - help="Set logging level (DEBUG, INFO, WARNING, ERROR, or CRITICAL).", - default="INFO", - ) - parser.add_argument( - "--logfile", - default=None, - type=str, - help="If specified, write logs to this file.", - ) - parser.add_argument( - "--quiet", - help="Do not send logging messages to stdout.", - action="store_true", - default=False, - ) - parser.add_argument( - "--gcs-cache-path", - type=str, - help="""Load datastore resources from Google Cloud Storage. Should be gs://bucket[/path_prefix]. -The main zenodo cache bucket is gs://zenodo-cache.catalyst.coop. -If specified without --bypass-local-cache, the local cache will be populated from the GCS cache. -If specified with --bypass-local-cache, the GCS cache will be populated by Zenodo.""", - ) - parser.add_argument( - "--bypass-local-cache", - action="store_true", - default=False, - help="""If enabled, the local file cache for datastore will not be used.""", - ) - parser.add_argument( - "--partition", - default={}, - action=ParseKeyValues, - metavar="KEY=VALUE,...", - help="Only retrieve resources matching these conditions.", - ) - parser.add_argument( - "--list-partitions", - action="store_true", - default=False, - help="List available partition keys and values for each dataset.", - ) - - return parser.parse_args() - - def print_partitions(dstore: Datastore, datasets: list[str]) -> None: """Prints known partition keys and its values for each of the datasets.""" for single_ds in datasets: - parts = dstore.get_datapackage_descriptor(single_ds).get_partitions() + partitions = dstore.get_datapackage_descriptor(single_ds).get_partitions() - print(f"\nPartitions for {single_ds} ({dstore.get_doi(single_ds)}):") - for pkey in sorted(parts): - print(f' {pkey}: {", ".join(str(x) for x in sorted(parts[pkey]))}') - if not parts: + print(f"\nPartitions for {single_ds} ({ZenodoFetcher().get_doi(single_ds)}):") + for partition_key in sorted(partitions): + print( + f' {partition_key}: {", ".join(str(x) for x in sorted(partitions[partition_key]))}' + ) + if not partitions: print(" -- no known partitions --") def validate_cache( - dstore: Datastore, datasets: list[str], args: argparse.Namespace + dstore: Datastore, datasets: list[str], partition: dict[str, str] ) -> None: """Validate elements in the datastore cache. @@ -530,7 +439,7 @@ def validate_cache( num_invalid = 0 descriptor = dstore.get_datapackage_descriptor(single_ds) for res, content in dstore.get_resources( - single_ds, cached_only=True, **args.partition + single_ds, cached_only=True, **partition ): try: num_total += 1 @@ -547,49 +456,185 @@ def validate_cache( def fetch_resources( - dstore: Datastore, datasets: list[str], args: argparse.Namespace + dstore: Datastore, + datasets: list[str], + partition: dict[str, int | str], + gcs_cache_path: str, + bypass_local_cache: bool, ) -> None: """Retrieve all matching resources and store them in the cache.""" for single_ds in datasets: for res, contents in dstore.get_resources( - single_ds, skip_optimally_cached=True, **args.partition + single_ds, skip_optimally_cached=True, **partition ): logger.info(f"Retrieved {res}.") # If the gcs_cache_path is specified and we don't want # to bypass the local cache, populate the local cache. - if args.gcs_cache_path and not args.bypass_local_cache: + if gcs_cache_path and not bypass_local_cache: dstore._cache.add(res, contents) -def main(): - """Cache datasets.""" - args = parse_command_line() +def _parse_key_values( + ctx: click.core.Context, + param: click.Option, + values: str, +) -> dict[str, str]: + """Parse key-value pairs into a Python dictionary. - pudl.logging_helpers.configure_root_logger( - logfile=args.logfile, loglevel=args.loglevel - ) + Transforms a command line argument of the form: k1=v1,k2=v2,k3=v3... + into: {k1:v1, k2:v2, k3:v3, ...} + """ + out_dict = {} + for val in values: + for key_value in val.split(","): + key, value = key_value.split("=") + out_dict[key] = value + return out_dict + + +@click.command( + context_settings={"help_option_names": ["-h", "--help"]}, +) +@click.option( + "--dataset", + "-d", + type=click.Choice(ZenodoFetcher().get_known_datasets()), + default=list(ZenodoFetcher().get_known_datasets()), + multiple=True, + help=( + "Specifies what dataset to work with. The default is to download all datasets. " + "Note that downloading all datasets may take hours depending on network speed. " + "This option may be applied multiple times to specify multiple datasets." + ), +) +@click.option( + "--validate", + is_flag=True, + default=False, + help="Validate the contents of locally cached data, but don't download anything.", +) +@click.option( + "--list-partitions", + help=( + "List the available partition keys and values for each dataset specified " + "using the --dataset argument, or all datasets if --dataset is not used." + ), + is_flag=True, + default=False, +) +@click.option( + "--partition", + "-p", + multiple=True, + help=( + "Only operate on dataset partitions matching these conditions. The argument " + "should have the form: key1=val1,key2=val2,... Conditions are combined with " + "a boolean AND, functionally meaning each key can only appear once. " + "If a key is repeated, only the last value is used. " + "So state=ca,year=2022 will retrieve all California data for 2022, and " + "state=ca,year=2021,year=2022 will also retrieve California data for 2022, " + "while state=ca by itself will retrieve all years of California data." + ), + callback=_parse_key_values, +) +@click.option( + "--bypass-local-cache", + is_flag=True, + default=False, + help=( + "If enabled, locally cached data will not be used. Instead, a new copy will be " + "downloaded from Zenodo or the GCS cache if specified." + ), +) +@click.option( + "--gcs-cache-path", + type=str, + help=( + "Load cached inputs from Google Cloud Storage if possible. This is usually " + "much faster and more reliable than downloading from Zenodo directly. The " + "path should be a URL of the form gs://bucket[/path_prefix]. Internally we use " + "gs://internal-zenodo-cache.catalyst.coop. A public cache is available at " + "gs://zenodo-cache.catalyst.coop but requires GCS authentication and a billing " + "project to pay data egress costs." + ), +) +@click.option( + "--logfile", + help="If specified, write logs to this file.", + type=click.Path( + exists=False, + resolve_path=True, + path_type=pathlib.Path, + ), +) +@click.option( + "--loglevel", + default="INFO", + type=click.Choice( + ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], case_sensitive=False + ), +) +def pudl_datastore( + dataset: list[str], + validate: bool, + list_partitions: bool, + partition: dict[str, int | str], + gcs_cache_path: str, + bypass_local_cache: bool, + logfile: pathlib.Path, + loglevel: str, +): + """Manage the raw data inputs to the PUDL data processing pipeline. + + Download all the raw FERC Form 2 data: + + pudl_datastore --dataset ferc2 + + Download the raw FERC Form 2 data only for 2021 + + pudl_datastore --dataset ferc2 --partition year=2021 + + Re-download the raw FERC Form 2 data for 2021 even if you already have it: + + pudl_datastore --dataset ferc2 --partition year=2021 --bypass-local-cache + + Validate all California EPA CEMS data in the local datastore: + + pudl_datastore --dataset epacems --validate --partition state=ca + + List the available partitions in the EIA-860 and EIA-923 datasets: + + pudl_datastore --dataset eia860 --dataset eia923 --list-partitions + """ + pudl.logging_helpers.configure_root_logger(logfile=logfile, loglevel=loglevel) cache_path = None - if not args.bypass_local_cache: + if not bypass_local_cache: cache_path = PudlPaths().input_dir dstore = Datastore( - gcs_cache_path=args.gcs_cache_path, + gcs_cache_path=gcs_cache_path, local_cache_path=cache_path, ) - datasets = [args.dataset] if args.dataset else dstore.get_known_datasets() - - if args.partition: - logger.info(f"Only retrieving resources for partition: {args.partition}") + if partition: + logger.info(f"Only considering resource partitions: {partition}") - if args.list_partitions: - print_partitions(dstore, datasets) - elif args.validate: - validate_cache(dstore, datasets, args) + if list_partitions: + print_partitions(dstore, dataset) + elif validate: + validate_cache(dstore, dataset, partition) else: - fetch_resources(dstore, datasets, args) + fetch_resources( + dstore=dstore, + datasets=dataset, + partition=partition, + gcs_cache_path=gcs_cache_path, + bypass_local_cache=bypass_local_cache, + ) + + return 0 if __name__ == "__main__": - sys.exit(main()) + sys.exit(pudl_datastore()) From 23c3625a137350add74cf61932757ba02d1d6924 Mon Sep 17 00:00:00 2001 From: zaneselvans Date: Sun, 3 Dec 2023 02:41:31 +0000 Subject: [PATCH 16/47] 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 a213a9a25b..74fd759452 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -404,7 +404,7 @@ dependencies: - botocore=1.33.6=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - - cryptography=41.0.5=py311h63ff55d_0 + - cryptography=41.0.7=py311hcb13ee4_1 - fqdn=1.5.1=pyhd8ed1ab_0 - geotiff=1.7.1=hf074850_14 - gitpython=3.1.40=pyhd8ed1ab_0 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 72e05fd755..d621c513d2 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -3658,7 +3658,7 @@ package: category: main optional: false - name: cryptography - version: 41.0.5 + version: 41.0.7 manager: conda platform: linux-64 dependencies: @@ -3667,14 +3667,14 @@ package: openssl: ">=3.1.4,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-41.0.5-py311h63ff55d_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-41.0.7-py311hcb13ee4_1.conda hash: - md5: 22584e5c97ed8f1a6b63a0ff43dba827 - sha256: 236ed2218fb857fecaa11fc7fee23574f683b3d03576f8f26f628b7fd2ced5fa + md5: ca6e04ac7262ecaec846e483d6fdc6c8 + sha256: 0959d015727ae5f55f385556a0a19b9f6036752ea05f78a99cb534803e325cab category: main optional: false - name: cryptography - version: 41.0.5 + version: 41.0.7 manager: conda platform: osx-64 dependencies: @@ -3682,14 +3682,14 @@ package: openssl: ">=3.1.4,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/cryptography-41.0.5-py311hd51016d_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/cryptography-41.0.7-py311h48c7838_1.conda hash: - md5: 99f1edef251a9fe4edf620b527ee70ea - sha256: 26ee22b99771f0d338eca6299cbe866f695c544d855d5eab82539497b0a24fc1 + md5: 65293feff96135571de02c047ecbd5a2 + sha256: f4c5e683386acf06cfa85805d264c9cd540361ec6e86740cb03312e560aa706a category: main optional: false - name: cryptography - version: 41.0.5 + version: 41.0.7 manager: conda platform: osx-arm64 dependencies: @@ -3697,10 +3697,10 @@ package: openssl: ">=3.1.4,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/cryptography-41.0.5-py311h71175c2_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/cryptography-41.0.7-py311h08c85a6_1.conda hash: - md5: adc55f424334b834098d50e57efe0789 - sha256: 00c9b389b51b6e951a1f639aa04dceca9e329e144275c79b4f6baacd3fb90345 + md5: 729546a91873db64ab8e675008845fb5 + sha256: 9d51ba743069d19aae08361a7b051ca1f281fb3b3ccb162e96c2503cf5a7d365 category: main optional: false - name: curl diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index a098816cfe..468480130e 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -384,7 +384,7 @@ dependencies: - botocore=1.33.6=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - - cryptography=41.0.5=py311hd51016d_0 + - cryptography=41.0.7=py311h48c7838_1 - fqdn=1.5.1=pyhd8ed1ab_0 - geotiff=1.7.1=h889ec99_14 - gitpython=3.1.40=pyhd8ed1ab_0 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index fe3ea266d4..a95aa5f3f8 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -384,7 +384,7 @@ dependencies: - botocore=1.33.6=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - - cryptography=41.0.5=py311h71175c2_0 + - cryptography=41.0.7=py311h08c85a6_1 - fqdn=1.5.1=pyhd8ed1ab_0 - geotiff=1.7.1=h71398c0_14 - gitpython=3.1.40=pyhd8ed1ab_0 From 87236afe3bf22a47199c0b785dee3260c39be7bd Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Sat, 2 Dec 2023 23:15:33 -0600 Subject: [PATCH 17/47] Unit test pudl_datastore script - Moved the console script tests from integration to unit tests since they don't depend on processing any data and run quickly. - Added a new test for pudl_datastore --list-partitions which surfaced a bug due to heterogenous types in the ferc2 partition values, which I worked around with a try-except. --- src/pudl/workspace/datastore.py | 10 +++++++--- .../console_scripts_test.py | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) rename test/{integration => unit}/console_scripts_test.py (52%) diff --git a/src/pudl/workspace/datastore.py b/src/pudl/workspace/datastore.py index 4a66093fdf..4a8437556a 100644 --- a/src/pudl/workspace/datastore.py +++ b/src/pudl/workspace/datastore.py @@ -420,9 +420,13 @@ def print_partitions(dstore: Datastore, datasets: list[str]) -> None: print(f"\nPartitions for {single_ds} ({ZenodoFetcher().get_doi(single_ds)}):") for partition_key in sorted(partitions): - print( - f' {partition_key}: {", ".join(str(x) for x in sorted(partitions[partition_key]))}' - ) + # try-except required because ferc2 has parts with heterogenous types that + # therefore can't be sorted: [1, 2, None] + try: + parts = sorted(partitions[partition_key]) + except TypeError: + parts = partitions[partition_key] + print(f' {partition_key}: {", ".join(str(x) for x in parts)}') if not partitions: print(" -- no known partitions --") diff --git a/test/integration/console_scripts_test.py b/test/unit/console_scripts_test.py similarity index 52% rename from test/integration/console_scripts_test.py rename to test/unit/console_scripts_test.py index 41eedf931d..0245af4685 100644 --- a/test/integration/console_scripts_test.py +++ b/test/unit/console_scripts_test.py @@ -18,3 +18,20 @@ def test_pudl_scripts(script_runner, script_name): """Run each console script in --help mode for testing.""" ret = script_runner.run([script_name, "--help"], print_result=False) assert ret.success + ret = script_runner.run([script_name, "-h"], print_result=False) + assert ret.success + + +@pytest.mark.parametrize( + "command", + [ + "pudl_datastore --dataset eia860 -d eia923 --list-partitions", + "pudl_datastore --list-partitions", + ], +) +@pytest.mark.script_launch_mode("inprocess") +def test_pudl_datastore_script(script_runner, command): + """CLI tests specific to the pudl_datastore script.""" + runner_args = command.split(" ") + ret = script_runner.run(runner_args, print_result=True) + assert ret.success From d01fdcd8589acf6f623ec644dcbf09dac948053c Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Sun, 3 Dec 2023 01:48:02 -0600 Subject: [PATCH 18/47] Remove pudl_setup script and all vestiges of legacy setup. --- devtools/data-release.sh | 74 ------------------ devtools/sqlite_to_duckdb.py | 1 + docker/Dockerfile | 2 - docker/gcp_pudl_etl.sh | 1 - docs/dev/annual_updates.rst | 6 +- docs/dev/dev_setup.rst | 104 +++++++------------------ docs/dev/run_the_etl.rst | 22 +++--- docs/release_notes.rst | 9 ++- pyproject.toml | 1 - src/pudl/analysis/state_demand.py | 1 - src/pudl/settings.py | 1 - src/pudl/workspace/__init__.py | 2 +- src/pudl/workspace/datastore.py | 1 - src/pudl/workspace/setup.py | 84 ++------------------- src/pudl/workspace/setup_cli.py | 121 ------------------------------ test/conftest.py | 2 - 16 files changed, 56 insertions(+), 376 deletions(-) delete mode 100755 devtools/data-release.sh mode change 100644 => 100755 devtools/sqlite_to_duckdb.py delete mode 100644 src/pudl/workspace/setup_cli.py diff --git a/devtools/data-release.sh b/devtools/data-release.sh deleted file mode 100755 index ac406af09b..0000000000 --- a/devtools/data-release.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh -# A script to compile a Dockerized data release based on PUDL nightly build outputs. - -# Positional arguments: - -# First command line argument is the PUDL nightly build tag / ref. This indicates what -# build outputs to use. E.g. "dev" or "v2022.11.30" -PUDL_REF=$1 - -# Docker tag to use in the archive, e.g. "latest" or "2022.11.30". Will be used to -# pull the docker image using catalystcoop/pudl-jupyter:$DOCKER_TAG -DOCKER_TAG=$2 - -# Path to a local directory where the archive will be assembled. Should be in a place -# with at least 20GB of disk space. -# E.g. "./pudl-v2022.11.30" -RELEASE_DIR=$3 - -# Construct the GCS URL: -GCS_ROOT="gs://pudl.catalyst.coop" -GCS_URL="$GCS_ROOT/$PUDL_REF" - -# Construct the Docker image name -DOCKER_REPO="catalystcoop" -DOCKER_NAME="pudl-jupyter" -DOCKER_IMAGE="$DOCKER_REPO/$DOCKER_NAME:$DOCKER_TAG" - -echo "Started:" `date` -# Start with a clean slate: -rm -rf $RELEASE_DIR -mkdir -p $RELEASE_DIR -# The release container / environment is based on the pudl-examples repo: -git clone --depth 1 git@github.com:catalyst-cooperative/pudl-examples.git $RELEASE_DIR -rm -rf $RELEASE_DIR/.git* -# These directories are where the data will go. They're integrated with the -# Docker container that's defined in the pudl-examples repo: -mkdir -p $RELEASE_DIR/pudl_data -mkdir -p $RELEASE_DIR/user_data - -# Make sure we have the specified version of the Docker container: -docker pull $DOCKER_IMAGE -# Freeze the version of the Docker container: -cat $RELEASE_DIR/docker-compose.yml | sed -e "s/$DOCKER_NAME:latest/$DOCKER_NAME:$DOCKER_TAG/" > $RELEASE_DIR/new-docker-compose.yml -mv $RELEASE_DIR/new-docker-compose.yml $RELEASE_DIR/docker-compose.yml -# Set up a skeleton PUDL environment in the release dir: -pudl_setup $RELEASE_DIR/pudl_data - -# These are probably outdated now... see if they fail. -rm -rf $RELEASE_DIR/pudl_data/environment.yml -rm -rf $RELEASE_DIR/pudl_data/notebook -rm -rf $RELEASE_DIR/pudl_data/settings - -# Copy over all of the pre-processed data -echo "Copying SQLite databases..." -mkdir -p $RELEASE_DIR/pudl_data/sqlite/ -gsutil -m cp "$GCS_URL/*.sqlite" "$GCS_URL/ferc*_xbrl_*.json" $RELEASE_DIR/pudl_data/sqlite/ - -echo "Copying Parquet datasets..." -mkdir -p $RELEASE_DIR/pudl_data/parquet/epacems -gsutil -m cp -r "$GCS_URL/hourly_emissions_epacems/*" $RELEASE_DIR/pudl_data/parquet/epacems - -# Save the Docker image as a tarball so it can be archived with the data: -echo "Saving Docker image: $DOCKER_IMAGE" -docker save $DOCKER_IMAGE -o $RELEASE_DIR/pudl-jupyter.tar - -# List the high-level contents of the archive so we can see what it contains: -echo "Archive contents:" -find $RELEASE_DIR -maxdepth 3 - -# Create the archive -echo "Creating the archive tarball..." -tar -czf $RELEASE_DIR.tgz $RELEASE_DIR - -echo "Finished:" `date` diff --git a/devtools/sqlite_to_duckdb.py b/devtools/sqlite_to_duckdb.py old mode 100644 new mode 100755 index da49084829..f01389d1a6 --- a/devtools/sqlite_to_duckdb.py +++ b/devtools/sqlite_to_duckdb.py @@ -1,3 +1,4 @@ +#! /usr/bin/env python """A naive script for converting SQLite to DuckDB.""" import logging from pathlib import Path diff --git a/docker/Dockerfile b/docker/Dockerfile index 9247f98c78..962a346875 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -49,8 +49,6 @@ ENV LD_LIBRARY_PATH=${CONDA_PREFIX}/lib # directory without copying it into the image. RUN --mount=type=bind,source=.git,target=${PUDL_REPO}/.git \ ${CONDA_RUN} pip install --no-cache-dir --no-deps --editable . && \ - # Run the PUDL setup script so we know where to read and write data - ${CONDA_RUN} pudl_setup # Install awscli2 diff --git a/docker/gcp_pudl_etl.sh b/docker/gcp_pudl_etl.sh index 84e46b4b24..feb6d98d71 100644 --- a/docker/gcp_pudl_etl.sh +++ b/docker/gcp_pudl_etl.sh @@ -22,7 +22,6 @@ function run_pudl_etl() { send_slack_msg ":large_yellow_circle: Deployment started for $ACTION_SHA-$GITHUB_REF :floppy_disk:" authenticate_gcp && \ alembic upgrade head && \ - pudl_setup && \ ferc_to_sqlite \ --loglevel DEBUG \ --gcs-cache-path gs://internal-zenodo-cache.catalyst.coop \ diff --git a/docs/dev/annual_updates.rst b/docs/dev/annual_updates.rst index bc076d4d7b..b7a8e1f6e4 100644 --- a/docs/dev/annual_updates.rst +++ b/docs/dev/annual_updates.rst @@ -45,11 +45,7 @@ fields such as ``source_format`` or ``path`` are still accurate. ``etl_fast.yml`` settings files stored under ``src/pudl/package_data/settings`` in the PUDL repo. -**1.5)** Update the settings files in your PUDL workspace to reflect the new -years by running ``pudl_setup {path to your pudl_work directory} -c``. Don't worry, it -won't remove any custom settings files you've added under a diffrent name. - -**1.6)** Use the ``pudl_datastore`` script (see :doc:`datastore`) to download the new +**1.5)** Use the ``pudl_datastore`` script (see :doc:`datastore`) to download the new raw data archives in bulk so that network hiccups don't cause issues during the ETL. 2. Map the Structure of the New Data diff --git a/docs/dev/dev_setup.rst b/docs/dev/dev_setup.rst index e94ad413da..de7ec65b6a 100644 --- a/docs/dev/dev_setup.rst +++ b/docs/dev/dev_setup.rst @@ -239,20 +239,13 @@ Creating a Workspace PUDL Workspace Setup ^^^^^^^^^^^^^^^^^^^^ -.. note:: - - If you used ``pudl_setup`` to set up your pudl workspace already, - skip ahead to :ref:`Legacy PUDL Setup`. If you haven't setup - a PUDL workspace before, read the remainder of this section. - -PUDL needs to know where to store its big piles of inputs and outputs. -The ``PUDL_OUTPUT`` and ``PUDL_INPUT`` environment variables let PUDL know where -all this stuff should go. We call this a "PUDL workspace". +PUDL needs to know where to store its big piles of inputs and outputs. The +``PUDL_OUTPUT`` and ``PUDL_INPUT`` environment variables let PUDL know where all this +stuff should go. We call this a "PUDL workspace". -First, create a directory to store local caches of raw PUDL data. You can put -this anywhere, but we put this in ``~/pudl_input`` in the documentation. -Then create an environment variable called ``PUDL_INPUT`` to store the path to -this new directory: +First, create a directory to store local caches of raw PUDL data. You can put this +anywhere, but we put this in ``~/pudl_input`` in the documentation. Then create an +environment variable called ``PUDL_INPUT`` to store the path to this new directory: .. code-block:: console @@ -260,8 +253,8 @@ this new directory: $ echo "export PUDL_INPUT=/absolute/path/to/pudl_input" >> ~/.bashrc # if you are using bash $ set -Ux PUDL_INPUT /absolute/path/to/pudl_input # if you are using fish shell -The directory stored in ``PUDL_INPUT`` contains versions of PUDL's -raw data archives on Zenodo for each datasource: +The directory stored in ``PUDL_INPUT`` contains versions of PUDL's raw data archives on +Zenodo for each datasource: .. code-block:: @@ -281,16 +274,15 @@ raw data archives on Zenodo for each datasource: .. warning:: - The data stored at the ``PUDL_INPUT`` directory can grow to be dozens - of gigabytes in size. This is because when the raw data are updated, - a new version of the archive is downloaded to the ``PUDL_INPUT`` - directory. To slim down the size you can always delete - out of date archives the code no longer depends on. + The data stored at the ``PUDL_INPUT`` directory can grow to be dozens of gigabytes + in size. This is because when the raw data are updated, a new version of the archive + is downloaded to the ``PUDL_INPUT`` directory. To slim down the size you can always + delete out of date archives the code no longer depends on. -Next, create a directory to store the outputs of the PUDL ETL. As above, you -can put this anywhere, but typically this is ``~/pudl_output``. Then, as -with ``PUDL_INPUT``, create an environment variable called ``PUDL_OUTPUT`` to -store the path to this new directory: +Next, create a directory to store the outputs of the PUDL ETL. As above, you can put +this anywhere, but typically this is ``~/pudl_output``. Then, as with ``PUDL_INPUT``, +create an environment variable called ``PUDL_OUTPUT`` to store the path to this new +directory: .. code-block:: console @@ -298,64 +290,20 @@ store the path to this new directory: $ echo "export PUDL_OUTPUT=/absolute/path/to/pudl_output" >> ~/.bashrc # bash $ set -Ux PUDL_OUTPUT /absolute/path/to/pudl_output # fish -The path stored in ``PUDL_OUTPUT`` contains all ETL outputs like -``pudl.sqlite`` and ``hourly_emissions_epacems.parquet``. - -**Make sure you create separate directories for these environment variables! -It is recommended you create these directories outside of the pudl repository -directory so the inputs and outputs are not tracked in git.** - -Also, activate profile changes above in the current session. - -.. code-block:: console - - $ export PUDL_OUTPUT=/absolute/path/to/pudl_output - $ export PUDL_INPUT=/absolute/path/to/pudl_input - -.. _Legacy PUDL Setup: - -PUDL Workspace Setup (legacy method) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -In previous versions of PUDL, the ``pudl_setup`` script created workspace directories. -PUDL is moving towards using the ``PUDL_OUTPUT`` and ``PUDL_INPUT`` environment -variables instead of the ``pudl_setup`` script because the environment variables are -easier to reference in the codebase. - -.. note:: - - If you set up your workspace using ``pudl_setup`` you don't need to change - anything about your setup. Just re-run ``pudl_setup`` and a new directory - called ``output/`` will be created in your . You will need to - point ``PUDL_OUTPUT`` at this new directory and ``PUDL_INPUT`` at the - ``data/`` directory in . +The path stored in ``PUDL_OUTPUT`` contains all ETL outputs like ``pudl.sqlite`` and +``hourly_emissions_epacems.parquet``. .. warning:: - In a future release the ``pudl_setup`` command will be removed. + Make sure you set these environment variables to point at separate directories! It + is also **strongly recommended** that you create these directories outside of the + pudl repository directory so the inputs and outputs are not tracked in git. -The ``pudl_setup`` script lets PUDL know where to store inputs and outputs. -The script will not create a new directory based on your arguemnts, so make -sure whatever directory path you pass as already exists. +Remember that you'll need to either source your shell profile after adding the new +environment variable definitions above, or export them at the command line for them to +be active in the current shell: .. code-block:: console - $ pudl_setup - - is the path to the directory where you want PUDL to do its -business -- this is where the datastore will be located and where any outputs -that are generated end up. The script will also put a configuration file called -``.pudl.yml`` in your home directory that records the location of this -workspace and uses it by default in the future. If you run ``pudl_setup`` with -no arguments, it assumes you want to use the current working directory. - -The workspace is laid out like this: - -==================== ========================================================== -**Directory / File** **Contents** --------------------- ---------------------------------------------------------- -``data/`` Raw data, automatically organized by source, year, etc. - This is the path ``PUDL_INPUT`` should point to. --------------------- ---------------------------------------------------------- -``output/`` The directory into which all the durable products of the - PUDL data processing pipeline will be written. -==================== ========================================================== + $ export PUDL_OUTPUT=/absolute/path/to/pudl_output + $ export PUDL_INPUT=/absolute/path/to/pudl_input diff --git a/docs/dev/run_the_etl.rst b/docs/dev/run_the_etl.rst index dd101d6385..19139f56a1 100644 --- a/docs/dev/run_the_etl.rst +++ b/docs/dev/run_the_etl.rst @@ -343,14 +343,14 @@ We also have targets set up in the ``Makefile`` for running these scripts: Settings Files -------------- -These CLI commands use YAML settings files in place of command line arguments. -This avoids undue complexity and preserves a record of how the script was run. -The YAML file dictates which years, or states get run through the the processing -pipeline. Two example files are deployed in the ``settings`` folder that is created when -you run ``pudl_setup``. (see: :ref:`install-workspace`). +These CLI commands use YAML settings files in place of command line arguments. This +avoids undue complexity and preserves a record of how the script was run. The YAML file +dictates which years or states get run through the the processing pipeline. There are +two standard settings files that we use to run the integration tests and the nightly +builds included in the repository: -- ``etl_fast.yml`` processes one year of data -- ``etl_full.yml`` processes all years of data +- ``src/pudl/package_data/settings/etl_fast.yml`` processes 1-2 years of data. +- ``src/pudl/package_data/settings/etl_full.yml`` processes all available data. .. warning:: @@ -372,8 +372,8 @@ needs. The layout of these files is depicted below: | └── years ├── ferc1_xbrl_to_sqlite_settings | └── years - ├── ferc2_xbrl_to_sqlite_settings - | └── years + └── ferc2_xbrl_to_sqlite_settings + └── years # PUDL ETL settings name : unique name identifying the etl outputs @@ -381,9 +381,9 @@ needs. The layout of these files is depicted below: description : a longer description of the etl outputs datasets: ├── dataset name - │  └── dataset etl parameter (e.g. years) : editable list of years + │ └── dataset etl parameter (e.g. years) : editable list of years └── dataset name - │  └── dataset etl parameter (e.g. years) : editable list of years + └── dataset etl parameter (e.g. years) : editable list of years Both scripts enable you to choose which **years** you want to include: diff --git a/docs/release_notes.rst b/docs/release_notes.rst index c4d7d5997d..d30aec2776 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -312,7 +312,14 @@ Deprecations :mod:`pudl.settings` no longer have table attributes because the ETL no longer supports loading specific tables via settings. Use dagster to select subsets of tables to process. -* The ``epacems_to_parquet`` script has been retired in favor of using the Dagster UI. +* The ``epacems_to_parquet`` and ``state_demand`` scripts have been retired in favor of + using the Dagster UI. See :issue:`3107` and :pr:`3086`. Visualizations of hourly + state-level electricity demand have been moved into our example notebooks which can + be found both `on Kaggle `__ + and `on GitHub `__ +* The ``pudl_setup`` script has been retired. All input/output locations are now set + using the ``$PUDL_INPUT`` and ``$PUDL_OUTPUT`` environment variables. See + :issue:`3107` and :pr:`3086`. Miscellaneous ^^^^^^^^^^^^^ diff --git a/pyproject.toml b/pyproject.toml index 70650a66bf..ac4f5a526e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -123,7 +123,6 @@ metadata_to_rst = "pudl.convert.metadata_to_rst:metadata_to_rst" ferc_to_sqlite = "pudl.ferc_to_sqlite.cli:main" pudl_datastore = "pudl.workspace.datastore:pudl_datastore" pudl_etl = "pudl.etl.cli:pudl_etl" -pudl_setup = "pudl.workspace.setup_cli:main" pudl_check_fks = "pudl.etl.check_foreign_keys:pudl_check_fks" # pudl_territories currently blows up memory usage to 100+ GB. # See https://github.com/catalyst-cooperative/pudl/issues/1174 diff --git a/src/pudl/analysis/state_demand.py b/src/pudl/analysis/state_demand.py index d946ad11d8..936ab0effd 100644 --- a/src/pudl/analysis/state_demand.py +++ b/src/pudl/analysis/state_demand.py @@ -28,7 +28,6 @@ import pudl.analysis.timeseries_cleaning import pudl.logging_helpers import pudl.output.pudltabl -import pudl.workspace.setup from pudl.metadata.dfs import POLITICAL_SUBDIVISIONS logger = pudl.logging_helpers.get_logger(__name__) diff --git a/src/pudl/settings.py b/src/pudl/settings.py index 82c399a6df..6c5205e03b 100644 --- a/src/pudl/settings.py +++ b/src/pudl/settings.py @@ -18,7 +18,6 @@ from pydantic_settings import BaseSettings import pudl -import pudl.workspace.setup from pudl.metadata.classes import DataSource from pudl.workspace.datastore import Datastore, ZenodoDoi diff --git a/src/pudl/workspace/__init__.py b/src/pudl/workspace/__init__.py index 778e7224bc..f709ba9a97 100644 --- a/src/pudl/workspace/__init__.py +++ b/src/pudl/workspace/__init__.py @@ -7,4 +7,4 @@ These tools are available both as a library module, and via a command line interface installed as an entrypoint script called ``pudl_datastore``. """ -from . import datastore, resource_cache, setup, setup_cli +from . import datastore, resource_cache, setup diff --git a/src/pudl/workspace/datastore.py b/src/pudl/workspace/datastore.py index 4a8437556a..809e490e7a 100644 --- a/src/pudl/workspace/datastore.py +++ b/src/pudl/workspace/datastore.py @@ -28,7 +28,6 @@ logger = pudl.logging_helpers.get_logger(__name__) -PUDL_YML = Path.home() / ".pudl.yml" ZenodoDoi = Annotated[ str, StringConstraints( diff --git a/src/pudl/workspace/setup.py b/src/pudl/workspace/setup.py index 4337eb69e0..d0ca40c14e 100644 --- a/src/pudl/workspace/setup.py +++ b/src/pudl/workspace/setup.py @@ -1,11 +1,9 @@ """Tools for setting up and managing PUDL workspaces.""" -import importlib.resources import os -import pathlib -import shutil from pathlib import Path +from typing import Self -from pydantic import DirectoryPath, NewPath +from pydantic import DirectoryPath, NewPath, model_validator from pydantic_settings import BaseSettings, SettingsConfigDict import pudl.logging_helpers @@ -26,6 +24,12 @@ class PudlPaths(BaseSettings): pudl_output: PotentialDirectoryPath model_config = SettingsConfigDict(env_file=".env", extra="ignore") + @model_validator(mode="after") + def create_directories(self: Self): + """Create PUDL input and output directories if they don't already exist.""" + self.input_dir.mkdir(parents=True, exist_ok=True) + self.output_dir.mkdir(parents=True, exist_ok=True) + @property def input_dir(self) -> Path: """Path to PUDL input directory.""" @@ -85,75 +89,3 @@ def set_path_overrides( os.environ["PUDL_INPUT"] = input_dir if output_dir: os.environ["PUDL_OUTPUT"] = output_dir - - -def init(clobber=False): - """Set up a new PUDL working environment based on the user settings. - - Args: - clobber (bool): if True, replace existing files. If False (the default) - do not replace existing files. - - Returns: - None - """ - # Create tmp directory - tmp_dir = PudlPaths().data_dir / "tmp" - tmp_dir.mkdir(parents=True, exist_ok=True) - - # These are files that may exist in the package_data directory, but that - # we do not want to deploy into a user workspace: - ignore_files = ["__init__.py", ".gitignore"] - - # TODO(janrous): perhaps we don't need to do this? - # Make a settings directory in the workspace, and deploy settings files: - settings_dir = PudlPaths().settings_dir - settings_dir.mkdir(parents=True, exist_ok=True) - settings_pkg = "pudl.package_data.settings" - deploy(settings_pkg, settings_dir, ignore_files, clobber=clobber) - - # Make output directory: - PudlPaths().output_dir.mkdir(parents=True, exist_ok=True) - # TODO(rousik): it might make sense to turn this into a method of - # PudlPaths object and to move this to settings.py from this module. - # Unclear whether deployment of settings files makes much sense. - - -def deploy( - pkg_path: str, - deploy_dir: pathlib.Path, - ignore_files: list[str], - clobber: bool = False, -) -> None: - """Deploy all files from a package_data directory into a workspace. - - Args: - pkg_path: Dotted module path to the subpackage inside of package_data containing - the resources to be deployed. - deploy_dir: Directory on the filesystem to which the files within pkg_path - should be deployed. - ignore_files: List of filenames (strings) that may be present in the pkg_path - subpackage, but that should be ignored. - clobber: if True, replace existing copies of the files that are being deployed - from pkg_path to deploy_dir. If False, do not replace existing files. - - Returns: - None - """ - files = [ - path - for path in importlib.resources.files(pkg_path).iterdir() - if path.is_file() and path.name not in ignore_files - ] - for file in files: - dest_file = pathlib.Path(deploy_dir, file) - if pathlib.Path.exists(dest_file): - if clobber: - logger.info(f"CLOBBERING existing file at {dest_file}.") - else: - logger.info(f"Skipping existing file at {dest_file}") - continue - - pkg_source = importlib.resources.files(pkg_path) / file - with importlib.resources.as_file(pkg_source) as f: - shutil.copy(f, dest_file) diff --git a/src/pudl/workspace/setup_cli.py b/src/pudl/workspace/setup_cli.py deleted file mode 100644 index 66001bde29..0000000000 --- a/src/pudl/workspace/setup_cli.py +++ /dev/null @@ -1,121 +0,0 @@ -"""Set up a well-organized PUDL data management workspace. - -This script creates a well-defined directory structure for use by the PUDL -package, and copies several example settings files and Jupyter notebooks into -it to get you started. If the command is run without any arguments, it will -create this workspace in your current directory. - -It's also possible to specify different input and output directories, which is -useful if you want to use a single PUDL data store (which may contain many GB -of data) to support several different workspaces. See the --pudl_in and ---pudl_out options. - -By default the script will not overwrite existing files. If you want it to -replace existing files use the --clobber option. - -The directory structure set up for PUDL looks like this: - -PUDL_DIR - └── settings - -PUDL_INPUT - ├── censusdp1tract - ├── eia860 - ├── eia860m - ├── eia861 - ├── eia923 - ... - ├── epacems - ├── ferc1 - ├── ferc714 - └── tmp - -PUDL_OUTPUT - ├── ferc1_dbf.sqlite - ├── ferc1_xbrl.sqlite - ... - ├── pudl.sqlite - └── hourly_emissions_cems.parquet - -Initially, the directories in the data store will be empty. The pudl_datastore or -pudl_etl commands will download data from public sources and organize it for -you there by source. -""" -import argparse -import pathlib -import sys - -import pudl -from pudl.workspace.setup import PudlPaths - -logger = pudl.logging_helpers.get_logger(__name__) - - -def initialize_parser(): - """Parse command line arguments for the pudl_setup script.""" - parser = argparse.ArgumentParser( - description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter - ) - parser.add_argument( - "--pudl_in", - "-i", - type=str, - dest="pudl_in", - help="""Directory where the PUDL input data should be located.""", - ) - parser.add_argument( - "--pudl_out", - "-o", - type=str, - dest="pudl_out", - help="""Directory where the PUDL outputs, notebooks, and example - settings files should be located.""", - ) - parser.add_argument( - "--clobber", - "-c", - action="store_true", - help="""Replace existing settings files, notebooks, etc. with fresh - copies of the examples distributed with the PUDL Python package. This - will also update your default PUDL workspace, if you have one.""", - default=False, - ) - parser.add_argument( - "--logfile", - default=None, - type=str, - help="If specified, write logs to this file.", - ) - parser.add_argument( - "--loglevel", - help="Set logging level (DEBUG, INFO, WARNING, ERROR, or CRITICAL).", - default="INFO", - ) - return parser - - -def main(): - """Set up a new default PUDL workspace.""" - # Display logged output from the PUDL package: - - parser = initialize_parser() - args = parser.parse_args(sys.argv[1:]) - pudl.logging_helpers.configure_root_logger( - logfile=args.logfile, loglevel=args.loglevel - ) - - if args.pudl_in: - pudl_in = pathlib.Path(args.pudl_in).expanduser().resolve() - if not pathlib.Path.is_dir(pudl_in): - raise FileNotFoundError(f"Directory not found: {pudl_in}") - PudlPaths.set_path_overrides(input_dir=pudl_in) - if args.pudl_out: - pudl_out = pathlib.Path(args.pudl_out).expanduser().resolve() - if not pathlib.Path.is_dir(pudl_out): - raise FileNotFoundError(f"Directory not found: {pudl_out}") - PudlPaths.set_path_overrides(output_dir=pudl_out) - pudl.workspace.setup.init(clobber=args.clobber) - - -if __name__ == "__main__": - sys.exit(main()) diff --git a/test/conftest.py b/test/conftest.py index 98a1cecf4c..d2a8acbf14 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -11,7 +11,6 @@ import sqlalchemy as sa from dagster import build_init_resource_context, materialize_to_memory -import pudl from pudl import resources from pudl.etl.cli import pudl_etl_job_factory from pudl.extract.ferc1 import raw_xbrl_metadata_json @@ -364,7 +363,6 @@ def configure_paths_for_tests(tmp_path_factory, request): output_dir=str(Path(out_tmp).resolve()), ) logger.info(f"Using temporary PUDL_OUTPUT: {out_tmp}") - pudl.workspace.setup.init() @pytest.fixture(scope="session") From 1fa9b379d40f12b52ad28f41588150090d39f759 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Sun, 3 Dec 2023 02:07:27 -0600 Subject: [PATCH 19/47] Fix cut-and-paste error in Dockerfile. --- docker/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 962a346875..26b291f4f2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -48,8 +48,7 @@ ENV LD_LIBRARY_PATH=${CONDA_PREFIX}/lib # We need information from .git to get version with setuptools_scm so we mount that # directory without copying it into the image. RUN --mount=type=bind,source=.git,target=${PUDL_REPO}/.git \ - ${CONDA_RUN} pip install --no-cache-dir --no-deps --editable . && \ - + ${CONDA_RUN} pip install --no-cache-dir --no-deps --editable . # Install awscli2 # Change back to root because the install script needs access to /usr/local/aws-cli From 2373182ed1d5f31e3174d361fa17b36cc085d023 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Sun, 3 Dec 2023 12:32:53 -0600 Subject: [PATCH 20/47] Clarify command for SSHing into a running GCS VM. --- docs/dev/nightly_data_builds.rst | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/dev/nightly_data_builds.rst b/docs/dev/nightly_data_builds.rst index 4ad3343e9d..4c3c85c155 100644 --- a/docs/dev/nightly_data_builds.rst +++ b/docs/dev/nightly_data_builds.rst @@ -70,9 +70,14 @@ Then you can go to the `Google Compute Engine `__ page and restart it. -Once that's started, you should be able to SSH to the VM via ``gcloud ssh -vm-name``. You may run into some permissions issues here, in which case you -probably need the ``Service Account User`` role on your gcloud user. +Once that's started, you should be able to SSH to the VM using a command like: + +.. code:: + + gcloud compute ssh pudl-deployment-tag --zone=us-west1-a + +You may run into some permissions issues here, in which case you probably need the +``Service Account User`` role on your gcloud user. Now you want to get some logs about what's failing. From a35788c3b46472e0efe3cb9a62301aa85176bf7b Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Sun, 3 Dec 2023 17:03:20 -0600 Subject: [PATCH 21/47] A nominally working service territory script --- pyproject.toml | 4 +- src/pudl/analysis/service_territory.py | 289 +++++++++++++++---------- 2 files changed, 178 insertions(+), 115 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index ac4f5a526e..df4987c337 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -124,9 +124,7 @@ ferc_to_sqlite = "pudl.ferc_to_sqlite.cli:main" pudl_datastore = "pudl.workspace.datastore:pudl_datastore" pudl_etl = "pudl.etl.cli:pudl_etl" pudl_check_fks = "pudl.etl.check_foreign_keys:pudl_check_fks" -# pudl_territories currently blows up memory usage to 100+ GB. -# See https://github.com/catalyst-cooperative/pudl/issues/1174 -# pudl_territories = "pudl.analysis.service_territory:main" +pudl_service_territories = "pudl.analysis.service_territory:pudl_service_territories" [project.urls] "Homepage" = "https://catalyst.coop/pudl/" diff --git a/src/pudl/analysis/service_territory.py b/src/pudl/analysis/service_territory.py index 322868ee29..884b7448fc 100644 --- a/src/pudl/analysis/service_territory.py +++ b/src/pudl/analysis/service_territory.py @@ -5,16 +5,17 @@ the historical spatial extent of utility and balancing area territories. Output the resulting geometries for use in other applications. """ -import argparse import math +import pathlib import sys from collections.abc import Iterable from typing import Literal +import click import geopandas as gpd import pandas as pd import sqlalchemy as sa -from dagster import AssetKey, AssetsDefinition, Field, asset +from dagster import AssetsDefinition, Field, asset from matplotlib import pyplot as plt import pudl @@ -255,22 +256,22 @@ def get_territory_geometries( ) -def _save_geoparquet(gdf, entity_type, dissolve, limit_by_state): - # For filenames based on input args: - dissolved = "" - if dissolve: - dissolved = "_dissolved" - else: - # States & counties only remain at this point if we didn't dissolve - for col in ("county_id_fips", "state_id_fips"): - # pandas.NA values are not compatible with Parquet Strings yet. - gdf[col] = gdf[col].fillna("") - limited = "" - if limit_by_state: - limited = "_limited" +def _save_geoparquet( + gdf: gpd.GeoDataFrame, + entity_type: Literal["util", "ba"], + dissolve: bool, + limit_by_state: bool, + output_dir: pathlib.Path, +) -> None: + # Construct output filenames based on input args: + entity = "balancing_authority" if entity_type == "ba" else "utility" + dissolved = "_dissolved" if dissolve else "" + limited = "_limited" if limit_by_state else "" + if output_dir is None: + output_dir = pathlib.Path.cwd() + filename = output_dir / f"{entity}_geometry{limited}{dissolved}.parquet" # Save the geometries to a GeoParquet file - fn = f"{entity_type}_geom{limited+dissolved}.pq" - gdf.to_parquet(fn, index=False) + gdf.to_parquet(filename, compression="snappy", index=False) def compile_geoms( @@ -282,6 +283,7 @@ def compile_geoms( census_counties: pd.DataFrame, entity_type: Literal["ba", "util"], save_format: Literal["geoparquet", "geodataframe", "dataframe"], + output_dir: pathlib.Path, dissolve: bool = False, limit_by_state: bool = True, ): @@ -325,17 +327,13 @@ def compile_geoms( dissolve=dissolve, ) if save_format == "geoparquet": - if dissolve: - # States & counties only remain at this point if we didn't dissolve - for col in ("county_id_fips", "state_id_fips"): - # pandas.NA values are not compatible with Parquet Strings yet. - geom[col] = geom[col].fillna("") - - _save_geoparquet( # To do: update to use new io manager. + # TODO[dagster]: update to use IO Manager. + _save_geoparquet( geom, entity_type=entity_type, dissolve=dissolve, limit_by_state=limit_by_state, + output_dir=output_dir, ) elif save_format == "dataframe": geom = pd.DataFrame(geom.drop(columns="geometry")) @@ -424,25 +422,25 @@ def dagster_compile_geoms( ################################################################################ # Functions for visualizing the service territory geometries ################################################################################ -def plot_historical_territory(gdf, id_col, id_val): +def plot_historical_territory( + gdf: gpd.GeoDataFrame, + id_col: str, + id_val: str | int, +) -> None: """Plot all the historical geometries defined for the specified entity. This is useful for exploring how a particular entity's service territory has evolved over time, or for identifying individual missing or inaccurate territories. Args: - gdf (geopandas.GeoDataFrame): A geodataframe containing geometries pertaining - electricity planning areas. Can be broken down by county FIPS code, or - have a single record containing a geometry for each combination of - report_date and the column being used to select planning areas (see - below). - id_col (str): The label of a column in gdf that identifies the planning area - to be visualized, like utility_id_eia, balancing_authority_id_eia, or - balancing_authority_code_eia. - id_val (str or int): The value identifying the - - Returns: - None + gdf: A geodataframe containing geometries pertaining electricity planning areas. + Can be broken down by county FIPS code, or have a single record containing a + geometry for each combination of report_date and the column being used to + select planning areas (see below). + id_col: The label of a column in gdf that identifies the planning area to be + visualized, like ``utility_id_eia``, ``balancing_authority_id_eia``, or + ``balancing_authority_code_eia``. + id_val: The ID of the entity whose territory should be plotted. """ if id_col not in gdf.columns: raise ValueError(f"The input id_col {id_col} doesn't exist in this GDF.") @@ -483,11 +481,11 @@ def plot_historical_territory(gdf, id_col, id_val): def plot_all_territories( - gdf, - report_date, - respondent_type=("balancing_authority", "utility"), - color="black", - alpha=0.25, + gdf: gpd.GeoDataFrame, + report_date: str, + respondent_type: str | Iterable[str] = ("balancing_authority", "utility"), + color: str = "black", + alpha: float = 0.25, ): """Plot all of the planning areas of a given type for a given report date. @@ -496,16 +494,15 @@ def plot_all_territories( entangled with the FERC 714 data. Args: - gdf (geopandas.GeoDataFrame): GeoDataFrame containing planning area - geometries, organized by respondent_id_ferc714 and report_date. - - report_date (datetime): A Datetime indicating what year's planning - areas should be displayed. - respondent_type (str or iterable): Type of respondent whose planning + gdf: GeoDataFrame containing planning area geometries, organized by + ``respondent_id_ferc714`` and ``report_date``. + report_date: A string representing a datetime that indicates what year's + planning areas should be displayed. + respondent_type: Type of respondent whose planning areas should be displayed. Either "utility" or "balancing_authority" or an iterable collection containing both. - color (str): Color to use for the planning areas. - alpha (float): Transparency to use for the planning areas. + color: Color to use for the planning areas. + alpha: Transparency to use for the planning areas. Returns: matplotlib.axes.Axes @@ -536,77 +533,145 @@ def plot_all_territories( ################################################################################ -# Functions that provide a CLI to the service territory module +# Provide a CLI for generating service territories ################################################################################ -def parse_command_line(argv): - """Parse script command line arguments. See the -h option. +@click.command( + context_settings={"help_option_names": ["-h", "--help"]}, +) +@click.option( + "--entity-type", + type=click.Choice(["util", "ba"]), + default="util", + show_default=True, + help=( + "What type of entity's service territories should be generated: Utility " + "(util) or Balancing Authority (ba)?" + ), +) +@click.option( + "--limit-by-state/--no-limit-by-state", + default=False, + help=( + "Limit service territories to including only counties located in states where " + "the utility or balancing authority also reported electricity sales in EIA-861 " + "in the year that the geometry pertains to. In theory a utility could serve a " + "county, but not sell any electricity there, but that seems like an unusual " + "situation." + ), + show_default=True, +) +@click.option( + "--dissolve/--no-dissolve", + default=True, + help=( + "Dissolve county level geometries to the utility or balancing authority " + "boundaries. The dissolve operation may take several minutes and is quite " + "memory intensive, but results in significantly smaller files, in which each " + "record contains the whole geometry of a utility or balancing authority. The " + "un-dissolved geometries use many records to describe each service territory, " + "with each record containing the geometry of a single constituent county." + ), + show_default=True, +) +@click.option( + "--output-dir", + "-o", + type=click.Path( + exists=True, + writable=True, + dir_okay=True, + file_okay=False, + resolve_path=True, + path_type=pathlib.Path, + ), + default=pathlib.Path.cwd(), + show_default=True, + help=( + "Path to the directory where the service territory geometries should be saved. " + "Defaults to the current working directory. Filenames are constructed based on " + "the other flags provided." + ), +) +@click.option( + "--logfile", + help="If specified, write logs to this file.", + type=click.Path( + exists=False, + resolve_path=True, + path_type=pathlib.Path, + ), +) +@click.option( + "--loglevel", + default="INFO", + type=click.Choice( + ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"], case_sensitive=False + ), + show_default=True, +) +def pudl_service_territories( + entity_type: Literal["util", "ba"], + dissolve: bool, + output_dir: pathlib.Path, + limit_by_state: bool, + logfile: pathlib.Path, + loglevel: str, +): + """Compile historical utility and balancing area service territory geometries. - Args: - argv (list): command line arguments including caller file name. + This script produces GeoParquet files describing the historical service territories + of utilities and balancing authorities based on data reported in the EIA Form 861 + and county geometries from the US Census DP1 geodatabase. - Returns: - dict: A dictionary mapping command line arguments to their values. - """ - parser = argparse.ArgumentParser(description=__doc__) - parser.add_argument( - "-d", - "--dissolve", - dest="dissolve", - action="store_true", - default=False, - help="Dissolve county level geometries to utility or balancing authorities", - ) - parser.add_argument( - "--logfile", - default=None, - type=str, - help="If specified, write logs to this file.", - ) - parser.add_argument( - "--loglevel", - help="Set logging level (DEBUG, INFO, WARNING, ERROR, or CRITICAL).", - default="INFO", - ) - return parser.parse_args(argv[1:]) + See: https://geoparquet.org/ for more on the GeoParquet file format. + Usage examples: -def main(): - """Compile historical utility and balancing area territories.""" + pudl_service_territories --entity-type ba --dissolve --limit-by-state + pudl_service_territories --entity-type util + """ # Display logged output from the PUDL package: + pudl.logging_helpers.configure_root_logger(logfile=logfile, loglevel=loglevel) - args = parse_command_line(sys.argv) - pudl.logging_helpers.configure_root_logger( - logfile=args.logfile, loglevel=args.loglevel + pudl_engine = sa.create_engine(PudlPaths().pudl_db) + # Load the required US Census DP1 county geometry data: + dp1_engine = PudlPaths().sqlite_db_uri("censusdp1tract") + sql = """ +SELECT + geoid10, + namelsad10, + dp0010001, + shape AS geometry +FROM + county_2010census_dp1; +""" + county_gdf = gpd.read_postgis( + sql, + con=dp1_engine, + geom_col="geometry", + crs="EPSG:4326", ) - pudl_engine = sa.create_engine(PudlPaths().pudl_db) - # Load the US Census DP1 county data: - county_gdf = pudl.etl.defs.load_asset_value(AssetKey("county_censusdp1")) - - kwargs_dicts = [ - {"entity_type": "util", "limit_by_state": False}, - {"entity_type": "util", "limit_by_state": True}, - {"entity_type": "ba", "limit_by_state": True}, - {"entity_type": "ba", "limit_by_state": False}, - ] - - for kwargs in kwargs_dicts: - _ = compile_geoms( - balancing_authority_eia861=pd.read_sql( - "balancing_authority_eia861", pudl_engine - ), - balancing_authority_assn_eia861=pd.read_sql( - "balancing_authority_assn_eia861", pudl_engine - ), - denorm_utilities_eia=pd.read_sql(AssetKey("denorm_utilities_eia")), - service_territory_eia861=pd.read_sql(AssetKey("service_territory_eia861")), - utility_assn_eia861=pd.read_sql("utility_assn_eia861", pudl_engine), - census_counties=county_gdf, - dissolve=args.dissolve, - save_format="geoparquet", - **kwargs, - ) + _ = compile_geoms( + balancing_authority_eia861=pd.read_sql( + "balancing_authority_eia861", + pudl_engine, + ), + balancing_authority_assn_eia861=pd.read_sql( + "balancing_authority_assn_eia861", + pudl_engine, + ), + denorm_utilities_eia=pd.read_sql("denorm_utilities_eia", pudl_engine), + service_territory_eia861=pd.read_sql("service_territory_eia861", pudl_engine), + utility_assn_eia861=pd.read_sql("utility_assn_eia861", pudl_engine), + census_counties=county_gdf, + dissolve=dissolve, + save_format="geoparquet", + output_dir=output_dir, + entity_type=entity_type, + limit_by_state=limit_by_state, + ) if __name__ == "__main__": - sys.exit(main()) + sys.exit(pudl_service_territories()) From e60620df3771013467a2678e6ca6c2df2b4d3617 Mon Sep 17 00:00:00 2001 From: zaneselvans Date: Sun, 3 Dec 2023 23:05:52 +0000 Subject: [PATCH 22/47] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 24 +- environments/conda-lock.yml | 336 +++++++++++++------------- environments/conda-osx-64.lock.yml | 22 +- environments/conda-osx-arm64.lock.yml | 22 +- 4 files changed, 202 insertions(+), 202 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index 74fd759452..d89cedbf3a 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -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 @@ -178,7 +178,7 @@ dependencies: - fontconfig=2.14.2=h14ed4e7_0 - freexl=2.0.0=h743c826_0 - frozenlist=1.4.0=py311h459d7ec_1 - - fsspec=2023.10.0=pyhca7485f_0 + - fsspec=2023.12.0=pyhca7485f_0 - gdk-pixbuf=2.42.10=h829c605_4 - google-cloud-sdk=455.0.0=py311h38be061_0 - greenlet=3.0.1=py311hb755f60_0 @@ -204,7 +204,7 @@ dependencies: - libblas=3.9.0=20_linux64_openblas - libcurl=8.4.0=hca28451_0 - libgrpc=1.59.2=hd6c4280_0 - - libpq=16.1=hfc447b1_0 + - libpq=16.1=hfc447b1_2 - libwebp=1.3.2=h658648e_1 - llvmlite=0.41.1=py311ha6695c7_0 - locket=1.0.0=pyhd8ed1ab_0 @@ -296,7 +296,7 @@ dependencies: - wcwidth=0.2.12=pyhd8ed1ab_0 - webcolors=1.13=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_2 - - websocket-client=1.6.4=pyhd8ed1ab_0 + - websocket-client=1.7.0=pyhd8ed1ab_0 - websockets=10.4=py311hd4cff14_1 - wheel=0.42.0=pyhd8ed1ab_0 - widgetsnbextension=4.0.9=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 @@ -340,7 +340,7 @@ dependencies: - hdf5=1.14.2=nompi_h4f84152_100 - html5lib=1.1=pyh9f0ad1d_0 - hypothesis=6.91.0=pyha770c72_0 - - importlib-metadata=6.9.0=pyha770c72_0 + - importlib-metadata=7.0.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 - janus=1.0.0=pyhd8ed1ab_0 @@ -367,7 +367,7 @@ dependencies: - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - platformdirs=4.0.0=pyhd8ed1ab_0 - - postgresql=16.1=h8972f4a_0 + - postgresql=16.1=h8972f4a_2 - proj=9.3.0=h1d62c97_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h46cbc50_0 @@ -415,7 +415,7 @@ dependencies: - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - harfbuzz=8.3.0=h3d44ed6_0 - httpcore=1.0.2=pyhd8ed1ab_0 - - importlib_metadata=6.9.0=hd8ed1ab_0 + - importlib_metadata=7.0.0=hd8ed1ab_0 - jsonschema-specifications=2023.11.2=pyhd8ed1ab_0 - jupyter_core=5.5.0=py311h38be061_0 - jupyter_server_terminals=0.4.4=pyhd8ed1ab_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.7=pyhd8ed1ab_1 - pybtex=0.24.0=pyhd8ed1ab_2 @@ -469,7 +469,7 @@ 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 @@ -497,7 +497,7 @@ dependencies: - 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.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 @@ -547,7 +547,7 @@ dependencies: - 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 + - gcsfs=2023.12.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 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index d621c513d2..150b720ab6 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -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 @@ -5735,39 +5735,39 @@ package: category: main optional: false - name: fsspec - version: 2023.10.0 + version: 2023.12.0 manager: conda platform: linux-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.10.0-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.0-pyhca7485f_0.conda hash: - md5: 5b86cf1ceaaa9be2ec4627377e538db1 - sha256: 1bbdfadb93cc768252fd207dca406cde928f9a81ff985ea1760b6539c55923e6 + md5: 036539452871d3b0906ff194ad808c9b + sha256: 72c84d372aa5d60eb31c53c108bacefb0c6fb854047441b543738e144f1fae65 category: main optional: false - name: fsspec - version: 2023.10.0 + version: 2023.12.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.10.0-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.0-pyhca7485f_0.conda hash: - md5: 5b86cf1ceaaa9be2ec4627377e538db1 - sha256: 1bbdfadb93cc768252fd207dca406cde928f9a81ff985ea1760b6539c55923e6 + md5: 036539452871d3b0906ff194ad808c9b + sha256: 72c84d372aa5d60eb31c53c108bacefb0c6fb854047441b543738e144f1fae65 category: main optional: false - name: fsspec - version: 2023.10.0 + version: 2023.12.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.10.0-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.0-pyhca7485f_0.conda hash: - md5: 5b86cf1ceaaa9be2ec4627377e538db1 - sha256: 1bbdfadb93cc768252fd207dca406cde928f9a81ff985ea1760b6539c55923e6 + md5: 036539452871d3b0906ff194ad808c9b + sha256: 72c84d372aa5d60eb31c53c108bacefb0c6fb854047441b543738e144f1fae65 category: main optional: false - name: furo @@ -5819,26 +5819,26 @@ package: category: main optional: false - name: gcsfs - version: 2023.10.0 + version: 2023.12.0 manager: conda platform: linux-64 dependencies: aiohttp: "" decorator: ">4.1.2" - fsspec: 2023.10.0 + fsspec: 2023.12.0 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.10.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.12.0-pyhd8ed1ab_0.conda hash: - md5: 500521931bdcc0f6d19c1c2e2ab4a5d9 - sha256: dd7559c5297359e475a125742e9cb30938579e93a17ce7537af64a04c98407a5 + md5: ad178e852250983982f3e2247635029d + sha256: 39dfbcb02360069206835f395cc0f169ead32005ff0c941a73526cdcfc18cd4b category: main optional: false - name: gcsfs - version: 2023.10.0 + version: 2023.12.0 manager: conda platform: osx-64 dependencies: @@ -5849,15 +5849,15 @@ package: google-auth: ">=1.2" decorator: ">4.1.2" google-cloud-storage: ">1.40" - fsspec: 2023.10.0 - url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.10.0-pyhd8ed1ab_0.conda + fsspec: 2023.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.12.0-pyhd8ed1ab_0.conda hash: - md5: 500521931bdcc0f6d19c1c2e2ab4a5d9 - sha256: dd7559c5297359e475a125742e9cb30938579e93a17ce7537af64a04c98407a5 + md5: ad178e852250983982f3e2247635029d + sha256: 39dfbcb02360069206835f395cc0f169ead32005ff0c941a73526cdcfc18cd4b category: main optional: false - name: gcsfs - version: 2023.10.0 + version: 2023.12.0 manager: conda platform: osx-arm64 dependencies: @@ -5868,71 +5868,71 @@ package: google-auth: ">=1.2" decorator: ">4.1.2" google-cloud-storage: ">1.40" - fsspec: 2023.10.0 - url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.10.0-pyhd8ed1ab_0.conda + fsspec: 2023.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.12.0-pyhd8ed1ab_0.conda hash: - md5: 500521931bdcc0f6d19c1c2e2ab4a5d9 - sha256: dd7559c5297359e475a125742e9cb30938579e93a17ce7537af64a04c98407a5 + md5: ad178e852250983982f3e2247635029d + sha256: 39dfbcb02360069206835f395cc0f169ead32005ff0c941a73526cdcfc18cd4b 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.3.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.3.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_0.conda hash: - md5: 1cb3c8b063c0aca152dd7d7045e8ec2e - sha256: b9428ade4519d84f5ef68174f403cac65ee8d44ba10992809ea54ac56508457b + md5: e071942c705866ed7dfe588fa66957c2 + sha256: 9983d2c28a4235212d5069361496544e5509a4649ff84070cec76153b9124441 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.3.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_0.conda hash: - md5: b266b8795152cc1dfc9296ac95cb60ad - sha256: f8d113f50e12756c4b6640a8f70b2bccc54cc2e1a29b11f5e3cb3e4671d259be + md5: e1108e28e7ce2370228657ea159056a4 + sha256: 2a08f6671b971ef34dce66f97561b875d8b6ccc8ca9eb8fcfa93fb68057f8e08 category: main optional: false - name: gdk-pixbuf @@ -8292,78 +8292,78 @@ package: category: main optional: false - name: importlib-metadata - version: 6.9.0 + version: 7.0.0 manager: conda platform: linux-64 dependencies: python: ">=3.8" zipp: ">=0.5" - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.9.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-7.0.0-pyha770c72_0.conda hash: - md5: 9677d53e8eb8e3282e9d84c5d0c525d7 - sha256: e43e6c2b76b76219268444907ab0797604be225fa1f3bfef1c666ec005fab07b + md5: a941237cd06538837b25cd245fcd25d8 + sha256: 9731e82a00d36b182dc515e31723e711ac82890bb1ca86c6a17a4b471135564f category: main optional: false - name: importlib-metadata - version: 6.9.0 + version: 7.0.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" zipp: ">=0.5" - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.9.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-7.0.0-pyha770c72_0.conda hash: - md5: 9677d53e8eb8e3282e9d84c5d0c525d7 - sha256: e43e6c2b76b76219268444907ab0797604be225fa1f3bfef1c666ec005fab07b + md5: a941237cd06538837b25cd245fcd25d8 + sha256: 9731e82a00d36b182dc515e31723e711ac82890bb1ca86c6a17a4b471135564f category: main optional: false - name: importlib-metadata - version: 6.9.0 + version: 7.0.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" zipp: ">=0.5" - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.9.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-7.0.0-pyha770c72_0.conda hash: - md5: 9677d53e8eb8e3282e9d84c5d0c525d7 - sha256: e43e6c2b76b76219268444907ab0797604be225fa1f3bfef1c666ec005fab07b + md5: a941237cd06538837b25cd245fcd25d8 + sha256: 9731e82a00d36b182dc515e31723e711ac82890bb1ca86c6a17a4b471135564f category: main optional: false - name: importlib_metadata - version: 6.9.0 + version: 7.0.0 manager: conda platform: linux-64 dependencies: - importlib-metadata: ">=6.9.0,<6.9.1.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.9.0-hd8ed1ab_0.conda + importlib-metadata: ">=7.0.0,<7.0.1.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-7.0.0-hd8ed1ab_0.conda hash: - md5: a0c28e5b7f824a19bd8ee9255c9bd58c - sha256: 01633076b64cfd0a163f9665864449bce3fa0377f2b12a0bf0dacc5baaeec206 + md5: 12aff14f84c337be5e5636bf612f4140 + sha256: b9e8ed41df6c55222e3777f422e77a22a6a19ff779b2e65aa8dfdea792c1f7de category: main optional: false - name: importlib_metadata - version: 6.9.0 + version: 7.0.0 manager: conda platform: osx-64 dependencies: - importlib-metadata: ">=6.9.0,<6.9.1.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.9.0-hd8ed1ab_0.conda + importlib-metadata: ">=7.0.0,<7.0.1.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-7.0.0-hd8ed1ab_0.conda hash: - md5: a0c28e5b7f824a19bd8ee9255c9bd58c - sha256: 01633076b64cfd0a163f9665864449bce3fa0377f2b12a0bf0dacc5baaeec206 + md5: 12aff14f84c337be5e5636bf612f4140 + sha256: b9e8ed41df6c55222e3777f422e77a22a6a19ff779b2e65aa8dfdea792c1f7de category: main optional: false - name: importlib_metadata - version: 6.9.0 + version: 7.0.0 manager: conda platform: osx-arm64 dependencies: - importlib-metadata: ">=6.9.0,<6.9.1.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.9.0-hd8ed1ab_0.conda + importlib-metadata: ">=7.0.0,<7.0.1.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-7.0.0-hd8ed1ab_0.conda hash: - md5: a0c28e5b7f824a19bd8ee9255c9bd58c - sha256: 01633076b64cfd0a163f9665864449bce3fa0377f2b12a0bf0dacc5baaeec206 + md5: 12aff14f84c337be5e5636bf612f4140 + sha256: b9e8ed41df6c55222e3777f422e77a22a6a19ff779b2e65aa8dfdea792c1f7de category: main optional: false - name: importlib_resources @@ -11502,13 +11502,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" @@ -11531,7 +11531,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" @@ -11540,29 +11540,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" @@ -11585,14 +11585,14 @@ 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" postgresql: "" @@ -11601,20 +11601,20 @@ package: 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-h5c58ba9_0.conda hash: - md5: 01e293a419480a02fc7775f6c6afa530 - sha256: fc602de0bb3d5b7c0493b25b1e4345018fd68f26c672c8abff621c492f67abf4 + md5: e0cce3c57c64d4476f6a3c41272a8759 + sha256: 8b33a0f7d4f037ba704f374ab260f3b25b0b632541999ee3878436699c88a617 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" @@ -11637,14 +11637,14 @@ 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" postgresql: "" @@ -11653,10 +11653,10 @@ package: 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-hcefe9de_0.conda hash: - md5: c7efc96733da609c84411293fa3a8457 - sha256: 34d8f93a03a58396074dbbcc832a0c84bb6192d9e0ddf70992c4fa40349366c5 + md5: 409e7e509cefc1f68f8254d8445db6c3 + sha256: c893c008bff1632695efeb4f9a711f44a9739b5a5cc2bfade0ec63b95faa8183 category: main optional: false - name: libgfortran @@ -12435,11 +12435,11 @@ package: 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-hfc447b1_2.conda hash: - md5: 2b7f1893cf40b4ccdc0230bcd94d5ed9 - sha256: 8c92a8cce329a83cc9e94b19d18200c661957c00cfb464f26237d24730864585 + md5: 3cfa1ceef6936e656677ba59480106ce + sha256: 6ce23d046522c39cda5c25e47d303b39f8b31a2aac2c59ea3e41710a072ff0bf category: main optional: false - name: libpq @@ -12449,11 +12449,11 @@ package: 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-h6dd4ff7_2.conda hash: - md5: 39de94ff4ccc306f3d24ef7aef13c689 - sha256: 1a51c9b3451eebf04ac1f7a7a58fec07c2e44d2298514a30f62b5b432a653c07 + md5: 7aa484702ee6f49c7a728b578a544b27 + sha256: 13011b0b9b31771197155d3547dcdf2c5f8f8a91f86f2b4d45fbf8a4d6f53d0a category: main optional: false - name: libpq @@ -12463,11 +12463,11 @@ package: 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-hd435d45_2.conda hash: - md5: 883bbf64780c91608f1a7df9203b79a5 - sha256: 1b5c86d5f247b3e154ae373dcebea6979368c4a0ee722d39ec33ee2fc8528c04 + md5: b4d4402f19365ed54ad529e09bfa7cdb + sha256: 50e96d4014b59ef337a74322be4394e27e6be65c3c5356b98ee0be1f6f4086a1 category: main optional: false - name: libprotobuf @@ -15313,40 +15313,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 @@ -16412,7 +16412,7 @@ package: category: main optional: false - name: poppler - version: 23.11.0 + version: 23.12.0 manager: conda platform: linux-64 dependencies: @@ -16423,7 +16423,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" @@ -16431,13 +16431,13 @@ 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 @@ -16541,17 +16541,17 @@ 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_2.conda hash: - md5: 1e9ab0760262044fa00814088667e451 - sha256: 74dfb5793a00a0a9e85296ce0944d8af0f71758574b7c8f9e7d5590250441e24 + md5: a175fe7a349a7e4cda81f4d7ae2bc2b2 + sha256: b2c258a78effab00f8db53e5dd04a43baf309c9a3c164c0d6f52de836b3baea5 category: main optional: false - name: postgresql @@ -16561,17 +16561,17 @@ 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_2.conda hash: - md5: b7322d27093606b939fb92fa33b92beb - sha256: 612393024639882d7515429e639c85fa3b712d114c5a6b3a4b3891b061e1bc89 + md5: ad5e3602657162ddcab580d052df0bd4 + sha256: 47282bff8ca6c64f72276401e8bcfff625cadcdcbfd3804bb08d9dcbe7485907 category: main optional: false - name: postgresql @@ -16581,17 +16581,17 @@ 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_2.conda hash: - md5: 37398d1ad2fbeaa7733711b845da863e - sha256: 441f5ad3fac42e7daf9c246ad0dc0962c7f0b4c9ac1044038d3a053d339320bf + md5: a2562d92a27e19371e2655fe48e6952f + sha256: a896c5ab8930a4d9f980471b64d6eb254a22c46565ebb777d99e235c8c0fb7f9 category: main optional: false - name: pre-commit @@ -23114,39 +23114,39 @@ package: category: main optional: false - name: websocket-client - version: 1.6.4 + version: 1.7.0 manager: conda platform: linux-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.6.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.7.0-pyhd8ed1ab_0.conda hash: - md5: bdb77b28cf16deac0eef431a068320e8 - sha256: df45b89862edcd7cd5180ec7b8c0c0ca9fb4d3f7d49ddafccdc76afcf50d8da6 + md5: 50ad31e07d706aae88b14a4ac9c73f23 + sha256: d9b537d5b7c5aa7a02a4ce4c6b755e458bd8083b67752a73c92d113ccec6c10f category: main optional: false - name: websocket-client - version: 1.6.4 + version: 1.7.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.6.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.7.0-pyhd8ed1ab_0.conda hash: - md5: bdb77b28cf16deac0eef431a068320e8 - sha256: df45b89862edcd7cd5180ec7b8c0c0ca9fb4d3f7d49ddafccdc76afcf50d8da6 + md5: 50ad31e07d706aae88b14a4ac9c73f23 + sha256: d9b537d5b7c5aa7a02a4ce4c6b755e458bd8083b67752a73c92d113ccec6c10f category: main optional: false - name: websocket-client - version: 1.6.4 + version: 1.7.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.6.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.7.0-pyhd8ed1ab_0.conda hash: - md5: bdb77b28cf16deac0eef431a068320e8 - sha256: df45b89862edcd7cd5180ec7b8c0c0ca9fb4d3f7d49ddafccdc76afcf50d8da6 + md5: 50ad31e07d706aae88b14a4ac9c73f23 + sha256: d9b537d5b7c5aa7a02a4ce4c6b755e458bd8083b67752a73c92d113ccec6c10f category: main optional: false - name: websockets diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index 468480130e..a4e05edb4c 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -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 @@ -167,7 +167,7 @@ dependencies: - executing=2.0.1=pyhd8ed1ab_0 - filelock=3.13.1=pyhd8ed1ab_0 - frozenlist=1.4.0=py311h2725bcf_1 - - fsspec=2023.10.0=pyhca7485f_0 + - fsspec=2023.12.0=pyhca7485f_0 - google-cloud-sdk=455.0.0=py311h6eed73b_0 - greenlet=3.0.1=py311hd39e593_0 - hpack=4.0.0=pyh9f0ad1d_0 @@ -190,7 +190,7 @@ dependencies: - libcurl=8.4.0=h726d00d_0 - libgd=2.3.3=h0dceb68_9 - libgrpc=1.59.2=ha7f534c_0 - - libpq=16.1=h6dd4ff7_0 + - libpq=16.1=h6dd4ff7_2 - llvmlite=0.41.1=py311hb5c2e0a_0 - locket=1.0.0=pyhd8ed1ab_0 - lxml=4.9.3=py311h19a211c_1 @@ -279,7 +279,7 @@ dependencies: - wcwidth=0.2.12=pyhd8ed1ab_0 - webcolors=1.13=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_2 - - websocket-client=1.6.4=pyhd8ed1ab_0 + - websocket-client=1.7.0=pyhd8ed1ab_0 - websockets=10.4=py311h5547dcb_1 - wheel=0.42.0=pyhd8ed1ab_0 - widgetsnbextension=4.0.9=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 @@ -320,7 +320,7 @@ dependencies: - hdf5=1.14.2=nompi_hedada53_100 - html5lib=1.1=pyh9f0ad1d_0 - hypothesis=6.91.0=pyha770c72_0 - - importlib-metadata=6.9.0=pyha770c72_0 + - importlib-metadata=7.0.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 - janus=1.0.0=pyhd8ed1ab_0 @@ -346,7 +346,7 @@ dependencies: - pip=23.3.1=pyhd8ed1ab_0 - platformdirs=4.0.0=pyhd8ed1ab_0 - poppler=23.11.0=hdd5a5e8_0 - - postgresql=16.1=h413614c_0 + - postgresql=16.1=h413614c_2 - proj=9.3.0=h23b96cc_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h021eaf5_0 @@ -394,7 +394,7 @@ dependencies: - graphql-relay=3.2.0=pyhd8ed1ab_0 - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - httpcore=1.0.2=pyhd8ed1ab_0 - - importlib_metadata=6.9.0=hd8ed1ab_0 + - importlib_metadata=7.0.0=hd8ed1ab_0 - jsonschema-specifications=2023.11.2=pyhd8ed1ab_0 - jupyter_core=5.5.0=py311h6eed73b_0 - jupyter_server_terminals=0.4.4=pyhd8ed1ab_1 @@ -451,7 +451,7 @@ 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=h5c58ba9_0 - librsvg=2.56.3=hec3db73_0 - numba=0.58.1=py311h32f2313_0 - numexpr=2.8.7=py311h1eadf79_4 @@ -478,7 +478,7 @@ dependencies: - 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_0 - geopandas-base=0.14.1=pyha770c72_0 - google-auth=2.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 @@ -526,7 +526,7 @@ dependencies: - 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 + - gcsfs=2023.12.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 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index a95aa5f3f8..e53b6ddff7 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -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 @@ -167,7 +167,7 @@ dependencies: - executing=2.0.1=pyhd8ed1ab_0 - filelock=3.13.1=pyhd8ed1ab_0 - frozenlist=1.4.0=py311heffc1b2_1 - - fsspec=2023.10.0=pyhca7485f_0 + - fsspec=2023.12.0=pyhca7485f_0 - google-cloud-sdk=455.0.0=py311h267d04e_0 - greenlet=3.0.1=py311hbaf5611_0 - hpack=4.0.0=pyh9f0ad1d_0 @@ -190,7 +190,7 @@ dependencies: - libcurl=8.4.0=h2d989ff_0 - libgd=2.3.3=hfdf3952_9 - libgrpc=1.59.2=hbcf6334_0 - - libpq=16.1=hd435d45_0 + - libpq=16.1=hd435d45_2 - llvmlite=0.41.1=py311hf5d242d_0 - locket=1.0.0=pyhd8ed1ab_0 - lxml=4.9.3=py311hbafe683_1 @@ -279,7 +279,7 @@ dependencies: - wcwidth=0.2.12=pyhd8ed1ab_0 - webcolors=1.13=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_2 - - websocket-client=1.6.4=pyhd8ed1ab_0 + - websocket-client=1.7.0=pyhd8ed1ab_0 - websockets=10.4=py311he2be06e_1 - wheel=0.42.0=pyhd8ed1ab_0 - widgetsnbextension=4.0.9=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 @@ -320,7 +320,7 @@ dependencies: - hdf5=1.14.2=nompi_h3aba7b3_100 - html5lib=1.1=pyh9f0ad1d_0 - hypothesis=6.91.0=pyha770c72_0 - - importlib-metadata=6.9.0=pyha770c72_0 + - importlib-metadata=7.0.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 - janus=1.0.0=pyhd8ed1ab_0 @@ -346,7 +346,7 @@ dependencies: - pip=23.3.1=pyhd8ed1ab_0 - platformdirs=4.0.0=pyhd8ed1ab_0 - poppler=23.11.0=hcdd998b_0 - - postgresql=16.1=hc6ab77f_0 + - postgresql=16.1=hc6ab77f_2 - proj=9.3.0=h52fb9d0_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h4d1eceb_0 @@ -394,7 +394,7 @@ dependencies: - graphql-relay=3.2.0=pyhd8ed1ab_0 - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - httpcore=1.0.2=pyhd8ed1ab_0 - - importlib_metadata=6.9.0=hd8ed1ab_0 + - importlib_metadata=7.0.0=hd8ed1ab_0 - jsonschema-specifications=2023.11.2=pyhd8ed1ab_0 - jupyter_core=5.5.0=py311h267d04e_0 - jupyter_server_terminals=0.4.4=pyhd8ed1ab_1 @@ -451,7 +451,7 @@ 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=hcefe9de_0 - librsvg=2.56.3=h0db3404_0 - numba=0.58.1=py311h9ec4793_0 - numexpr=2.8.7=py311h6e08293_4 @@ -478,7 +478,7 @@ dependencies: - 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_0 - geopandas-base=0.14.1=pyha770c72_0 - google-auth=2.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 @@ -526,7 +526,7 @@ dependencies: - 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 + - gcsfs=2023.12.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 From 54658caeb71e3600017db41e87aef8d2c30c6dba Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Sun, 3 Dec 2023 22:00:09 -0600 Subject: [PATCH 23/47] Add an integration test for the pudl_service_territory script. --- Makefile | 2 +- src/pudl/analysis/service_territory.py | 9 +++--- test/integration/console_scripts_test.py | 39 ++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 test/integration/console_scripts_test.py diff --git a/Makefile b/Makefile index 5c26dfae6b..306cc4b97b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ covargs := --append --source=src/pudl gcs_cache_path := --gcs-cache-path=gs://zenodo-cache.catalyst.coop pytest_covargs := --cov-append --cov=src/pudl --cov-report=xml -coverage_report := coverage report --sort=cover +coverage_report := coverage report --omit src/pudl/validate.py --sort=miss pytest_args := --durations 20 ${pytest_covargs} ${gcs_cache_path} etl_fast_yml := src/pudl/package_data/settings/etl_fast.yml etl_full_yml := src/pudl/package_data/settings/etl_full.yml diff --git a/src/pudl/analysis/service_territory.py b/src/pudl/analysis/service_territory.py index 884b7448fc..6aea387eb9 100644 --- a/src/pudl/analysis/service_territory.py +++ b/src/pudl/analysis/service_territory.py @@ -283,7 +283,7 @@ def compile_geoms( census_counties: pd.DataFrame, entity_type: Literal["ba", "util"], save_format: Literal["geoparquet", "geodataframe", "dataframe"], - output_dir: pathlib.Path, + output_dir: pathlib.Path | None = None, dissolve: bool = False, limit_by_state: bool = True, ): @@ -295,11 +295,10 @@ def compile_geoms( balancing authority, with geometries available at the county level. """ logger.info( - "Compiling %s geometries with dissolve=%s and limit_by_state=%s.", - entity_type, - dissolve, - limit_by_state, + f"Compiling {entity_type} geometries with {dissolve=} and {limit_by_state=}." ) + if save_format == "geoparquet" and output_dir is None: + raise ValueError("No output_dir provided while writing geoparquet.") utilids_all_eia = utility_ids_all_eia( denorm_utilities_eia, service_territory_eia861 diff --git a/test/integration/console_scripts_test.py b/test/integration/console_scripts_test.py new file mode 100644 index 0000000000..4229abfc84 --- /dev/null +++ b/test/integration/console_scripts_test.py @@ -0,0 +1,39 @@ +"""Test the PUDL console scripts from within PyTest.""" +import pytest +import sqlalchemy as sa + +from pudl.workspace.setup import PudlPaths + + +@pytest.mark.parametrize( + "command", + [ + "pudl_datastore -d ferc60 --gcs-cache-path gs://internal-zenodo-cache.catalyst.coop --partition year=2006", + "pudl_datastore --dataset ferc60 --bypass-local-cache --partition year=2006", + "pudl_datastore -d ferc60 --validate --partition year=2006", + "pudl_datastore -d ferc1 --validate --partition year=2021", + "pudl_datastore -d ferc2 --validate --partition year=2020", + "pudl_datastore -d ferc6 --validate --partition year=2021", + "pudl_datastore -d ferc60 --validate --partition year=2020", + "pudl_datastore -d ferc714 --validate --partition year=2021", + ], +) +@pytest.mark.script_launch_mode("inprocess") +def test_pudl_datastore(script_runner, command: str): + """CLI tests specific to the pudl_datastore script.""" + runner_args = command.split(" ") + ret = script_runner.run(runner_args, print_result=True) + assert ret.success + + +@pytest.mark.script_launch_mode("inprocess") +def test_pudl_service_territories(script_runner, pudl_engine: sa.Engine): + """CLI tests specific to the pudl_service_territories script. + + Depends on the ``pudl_engine`` fixture to ensure that the censusdp1tract.sqlite + database has been generated, since that data is required for the script to run. + """ + command = f"pudl_service_territories --entity-type ba --no-dissolve --limit-by-state -o {PudlPaths().output_dir}" + runner_args = command.split(" ") + ret = script_runner.run(runner_args, print_result=True) + assert ret.success From 78cc0496a6ea7fa8d8f65f6c1d5002029078f45c Mon Sep 17 00:00:00 2001 From: zaneselvans Date: Mon, 4 Dec 2023 04:03:21 +0000 Subject: [PATCH 24/47] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 2 +- environments/conda-lock.yml | 76 +++++++++++++-------------- environments/conda-osx-64.lock.yml | 8 +-- environments/conda-osx-arm64.lock.yml | 8 +-- 4 files changed, 47 insertions(+), 47 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index d89cedbf3a..0269513e0f 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -200,7 +200,7 @@ dependencies: - jsonpointer=2.4=py311h38be061_3 - jupyterlab_widgets=3.0.9=pyhd8ed1ab_0 - kiwisolver=1.4.5=py311h9547e67_1 - - lcms2=2.15=hb7c19ff_3 + - lcms2=2.16=hb7c19ff_0 - libblas=3.9.0=20_linux64_openblas - libcurl=8.4.0=hca28451_0 - libgrpc=1.59.2=hd6c4280_0 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 150b720ab6..11e514c4b7 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -5909,10 +5909,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_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/gdal-3.8.1-py311h5646c56_1.conda hash: - md5: e071942c705866ed7dfe588fa66957c2 - sha256: 9983d2c28a4235212d5069361496544e5509a4649ff84070cec76153b9124441 + md5: 040c7cfdae3033444b9f193f9ac7dda2 + sha256: dc12757089d571dc33a5be6428bb50374fcfe2839230d8bc2b6aecf019545e64 category: main optional: false - name: gdal @@ -5929,10 +5929,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_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/gdal-3.8.1-py311h32a4f3d_1.conda hash: - md5: e1108e28e7ce2370228657ea159056a4 - sha256: 2a08f6671b971ef34dce66f97561b875d8b6ccc8ca9eb8fcfa93fb68057f8e08 + md5: 22050ed6dfba916d82f470c4e5c820e9 + sha256: f6f8555e164a37371dc729b9aa0773e60716218ed706cd621b3f5cbfbe2ea51e category: main optional: false - name: gdk-pixbuf @@ -10273,43 +10273,43 @@ package: category: main optional: false - name: lcms2 - version: "2.15" + version: "2.16" manager: conda platform: linux-64 dependencies: libgcc-ng: ">=12" libjpeg-turbo: ">=3.0.0,<4.0a0" libtiff: ">=4.6.0,<4.7.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.15-hb7c19ff_3.conda + url: https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.16-hb7c19ff_0.conda hash: - md5: e96637dd92c5f340215c753a5c9a22d7 - sha256: cc0b2ddab52b20698b26fe8622ebe37e0d462d8691a1f324e7b00f7d904765e3 + md5: 51bb7010fc86f70eee639b4bb7a894f5 + sha256: 5c878d104b461b7ef922abe6320711c0d01772f4cd55de18b674f88547870041 category: main optional: false - name: lcms2 - version: "2.15" + version: "2.16" manager: conda platform: osx-64 dependencies: libjpeg-turbo: ">=3.0.0,<4.0a0" libtiff: ">=4.6.0,<4.7.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/lcms2-2.15-hd6ba6f3_3.conda + url: https://conda.anaconda.org/conda-forge/osx-64/lcms2-2.16-ha2f27b4_0.conda hash: - md5: 8059507d52f477fbd4b81841e085e25b - sha256: b2234f24e3b0030762430ec3414410119d1129804a95ef65af50ad36cabd9bd5 + md5: 1442db8f03517834843666c422238c9b + sha256: 222ebc0a55544b9922f61e75015d02861e65b48f12113af41d48ba0814e14e4e category: main optional: false - name: lcms2 - version: "2.15" + version: "2.16" manager: conda platform: osx-arm64 dependencies: libjpeg-turbo: ">=3.0.0,<4.0a0" libtiff: ">=4.6.0,<4.7.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/lcms2-2.15-hf2736f0_3.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/lcms2-2.16-ha0e7c42_0.conda hash: - md5: bbaac531169fed3e09ae31aff80aa069 - sha256: 3d07ba04602617c3084b302c8a6fa30b2e4b20511180f45992b289c312298018 + md5: 66f6c134e76fe13cce8a9ea5814b5dd5 + sha256: 151e0c84feb7e0747fabcc85006b8973b22f5abbc3af76a9add0b0ef0320ebe4 category: main optional: false - name: ld_impl_linux-64 @@ -11594,17 +11594,17 @@ package: openjpeg: ">=2.5.0,<3.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.1-h5c58ba9_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/libgdal-3.8.1-hb7f764b_1.conda hash: - md5: e0cce3c57c64d4476f6a3c41272a8759 - sha256: 8b33a0f7d4f037ba704f374ab260f3b25b0b632541999ee3878436699c88a617 + md5: eee8b19233a243e229af4399af2c4a10 + sha256: efe25d85efe856c1db71e2a40ce9736e07cf5c06e53285248866a62a43363a0d category: main optional: false - name: libgdal @@ -11646,17 +11646,17 @@ package: openjpeg: ">=2.5.0,<3.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.1-hcefe9de_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/libgdal-3.8.1-hac00559_1.conda hash: - md5: 409e7e509cefc1f68f8254d8445db6c3 - sha256: c893c008bff1632695efeb4f9a711f44a9739b5a5cc2bfade0ec63b95faa8183 + md5: a65e999f85ab35663d7e9753ca7eaa13 + sha256: 636ff5b1f95edc083dc7b3ba9f35a87fe18695349b1bd57ae72c54d00ef5034e category: main optional: false - name: libgfortran @@ -16441,7 +16441,7 @@ package: category: main optional: false - name: poppler - version: 23.11.0 + version: 23.12.0 manager: conda platform: osx-64 dependencies: @@ -16454,24 +16454,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: @@ -16484,20 +16484,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 diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index a4e05edb4c..c3ecec7701 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -114,7 +114,7 @@ dependencies: - gdk-pixbuf=2.42.10=hbb5a27d_4 - gts=0.7.6=h53e17e3_4 - krb5=1.21.2=hb884880_0 - - lcms2=2.15=hd6ba6f3_3 + - lcms2=2.16=ha2f27b4_0 - libopenblas=0.3.25=openmp_hfef2a42_0 - libthrift=0.19.0=h064b379_1 - libwebp=1.3.2=h44782d1_1 @@ -345,7 +345,7 @@ dependencies: - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - platformdirs=4.0.0=pyhd8ed1ab_0 - - poppler=23.11.0=hdd5a5e8_0 + - poppler=23.12.0=hdd5a5e8_0 - postgresql=16.1=h413614c_2 - proj=9.3.0=h23b96cc_2 - prompt-toolkit=3.0.41=pyha770c72_0 @@ -451,7 +451,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=h5c58ba9_0 + - libgdal=3.8.1=hb7f764b_1 - librsvg=2.56.3=hec3db73_0 - numba=0.58.1=py311h32f2313_0 - numexpr=2.8.7=py311h1eadf79_4 @@ -478,7 +478,7 @@ dependencies: - 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_0 + - gdal=3.8.1=py311h5646c56_1 - geopandas-base=0.14.1=pyha770c72_0 - google-auth=2.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index e53b6ddff7..43e725995f 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -114,7 +114,7 @@ dependencies: - gdk-pixbuf=2.42.10=h15fa40c_4 - gts=0.7.6=he42f4ea_4 - krb5=1.21.2=h92f50d5_0 - - lcms2=2.15=hf2736f0_3 + - lcms2=2.16=ha0e7c42_0 - libopenblas=0.3.25=openmp_h6c19121_0 - libthrift=0.19.0=h026a170_1 - libwebp=1.3.2=hf30222e_1 @@ -345,7 +345,7 @@ dependencies: - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - platformdirs=4.0.0=pyhd8ed1ab_0 - - poppler=23.11.0=hcdd998b_0 + - poppler=23.12.0=hcdd998b_0 - postgresql=16.1=hc6ab77f_2 - proj=9.3.0=h52fb9d0_2 - prompt-toolkit=3.0.41=pyha770c72_0 @@ -451,7 +451,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=hcefe9de_0 + - libgdal=3.8.1=hac00559_1 - librsvg=2.56.3=h0db3404_0 - numba=0.58.1=py311h9ec4793_0 - numexpr=2.8.7=py311h6e08293_4 @@ -478,7 +478,7 @@ dependencies: - 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_0 + - gdal=3.8.1=py311h32a4f3d_1 - geopandas-base=0.14.1=pyha770c72_0 - google-auth=2.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 From 91b88f642dec71304fe94fa6b4b75fecbc0f6fa4 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Mon, 4 Dec 2023 01:12:15 -0600 Subject: [PATCH 25/47] Condense and document _save_geoparquet() --- src/pudl/analysis/service_territory.py | 31 +++++++++++++++++++++----- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/src/pudl/analysis/service_territory.py b/src/pudl/analysis/service_territory.py index 6aea387eb9..e025f88ff7 100644 --- a/src/pudl/analysis/service_territory.py +++ b/src/pudl/analysis/service_territory.py @@ -261,17 +261,36 @@ def _save_geoparquet( entity_type: Literal["util", "ba"], dissolve: bool, limit_by_state: bool, - output_dir: pathlib.Path, + output_dir: pathlib.Path | None = None, ) -> None: - # Construct output filenames based on input args: - entity = "balancing_authority" if entity_type == "ba" else "utility" + """Save utility or balancing authority service territory geometries to GeoParquet. + + In order to prevent the geometry data from exceeding the 2GB maximum size of an + Arrow object, we need to keep the row groups small. Sort the dataframe by the + primary key columns to minimize the number of values in any row group. Output + filename is constructed based on input arguments. + + Args: + gdf: GeoDataframe containing utility or balancing authority geometries. + entity_type: short string indicating whether we're outputting utility or + balancing authority geometries. + dissolve: Wether the individual county geometries making up the service + territories have been merged together. Used to construct filename. + limit_by_state: Whether service territories have been limited to include only + counties in states where the utilities reported sales. Used to construct + filename. + output_dir: Path to the directory where the GeoParquet file will be written. + + """ + entity_name = "balancing_authority" if entity_type == "ba" else "utility" dissolved = "_dissolved" if dissolve else "" limited = "_limited" if limit_by_state else "" if output_dir is None: output_dir = pathlib.Path.cwd() - filename = output_dir / f"{entity}_geometry{limited}{dissolved}.parquet" - # Save the geometries to a GeoParquet file - gdf.to_parquet(filename, compression="snappy", index=False) + file_path = output_dir / f"{entity_name}_geometry{limited}{dissolved}.parquet" + gdf.sort_values(["report_date", f"{entity_name}_id_eia"]).to_parquet( + file_path, row_group_size=512, compression="snappy", index=False + ) def compile_geoms( From 9e1b6f0bdcbeee8d28a8a766ef35eb4966187ba2 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Mon, 4 Dec 2023 02:41:37 -0600 Subject: [PATCH 26/47] Adjust coverage settings; move config to pyproject.toml --- .codecov.yml | 5 ++++- .coveragerc | 22 ---------------------- Makefile | 5 ++--- pyproject.toml | 31 +++++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 26 deletions(-) delete mode 100644 .coveragerc diff --git a/.codecov.yml b/.codecov.yml index 36ee70c9fd..9c178ea976 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -1,9 +1,12 @@ --- coverage: range: 70..100 - round: down + round: nearest precision: 1 +ignore: + - "src/pudl/validate.py" + codecov: token: 23a7ee04-6ac5-4d1b-9d36-86b0c50d40c5 require_ci_to_pass: true diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index 6bf97eb778..0000000000 --- a/.coveragerc +++ /dev/null @@ -1,22 +0,0 @@ -[run] -omit = - *__main__.py - *__init__.py - *_test.py - -[report] -precision = 2 -exclude_lines = - # Have to re-enable the standard pragma - pragma: no cover - - # Don't complain if tests don't hit defensive assertion code: - raise AssertionError - raise NotImplementedError - - # Don't complain if non-runnable code isn't run: - if 0: - if __name__ == .__main__.: - - # Stuff that's not expected to run normally... - logger.debug diff --git a/Makefile b/Makefile index 306cc4b97b..088421378a 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ covargs := --append --source=src/pudl gcs_cache_path := --gcs-cache-path=gs://zenodo-cache.catalyst.coop pytest_covargs := --cov-append --cov=src/pudl --cov-report=xml -coverage_report := coverage report --omit src/pudl/validate.py --sort=miss pytest_args := --durations 20 ${pytest_covargs} ${gcs_cache_path} etl_fast_yml := src/pudl/package_data/settings/etl_fast.yml etl_full_yml := src/pudl/package_data/settings/etl_full.yml @@ -130,7 +129,7 @@ coverage-erase: .PHONY: pytest-coverage pytest-coverage: coverage-erase docs-build pytest-ci - ${coverage_report} + coverage report .PHONY: pytest-ci pytest-ci: pytest-unit pytest-integration @@ -154,7 +153,7 @@ nuke: coverage-erase docs-build pytest-unit ferc pudl pudl_check_fks pytest ${pytest_args} -n auto --live-dbs --etl-settings ${etl_full_yml} test/integration pytest ${pytest_args} -n auto --live-dbs test/validate - ${coverage_report} + coverage report # Check that designated Jupyter notebooks can be run against the current DB .PHONY: pytest-jupyter diff --git a/pyproject.toml b/pyproject.toml index df4987c337..d725154e52 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -291,3 +291,34 @@ prettier = ">=3.0" python = ">=3.11,<3.12" sqlite = ">=3.43" curl = ">=8.4.0" + +[tool.coverage.run] +source = [ + "docs/conf.py", + "src/pudl/", + "test/integration/", + "test/unit/", +] +omit = [ + # Never hit by integration tests: + "src/pudl/validate.py", +] + +[tool.coverage.report] +precision = 1 +sort = "miss" +exclude_lines = [ + # Have to re-enable the standard pragma + "pragma: no cover", + + # Don't complain if tests don't hit defensive assertion code: + "raise AssertionError", + "raise NotImplementedError", + + # Don't complain if non-runnable code isn't run: + "if 0:", + "if __name__ == .__main__.:", + + # Stuff that's not expected to run normally... + "logger.debug", +] From 4e8e409069a07aef4f46e2fa72c92d08b37d20f8 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Mon, 4 Dec 2023 03:40:11 -0600 Subject: [PATCH 27/47] Skip empty files; move coverage source config to pyproject.toml --- Makefile | 4 ++-- pyproject.toml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 088421378a..9c9bb1095a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ -covargs := --append --source=src/pudl +covargs := --append gcs_cache_path := --gcs-cache-path=gs://zenodo-cache.catalyst.coop -pytest_covargs := --cov-append --cov=src/pudl --cov-report=xml +pytest_covargs := --cov-append --cov-report=xml pytest_args := --durations 20 ${pytest_covargs} ${gcs_cache_path} etl_fast_yml := src/pudl/package_data/settings/etl_fast.yml etl_full_yml := src/pudl/package_data/settings/etl_full.yml diff --git a/pyproject.toml b/pyproject.toml index d725154e52..584ffad350 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -307,6 +307,7 @@ omit = [ [tool.coverage.report] precision = 1 sort = "miss" +skip_empty = true exclude_lines = [ # Have to re-enable the standard pragma "pragma: no cover", From 819d26b43a1b7857b9d1ae209ba30e772c7ee8eb Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Mon, 4 Dec 2023 03:56:02 -0600 Subject: [PATCH 28/47] Add conftest.py to test coverage; update release notes. --- docs/release_notes.rst | 4 ++++ pyproject.toml | 1 + 2 files changed, 5 insertions(+) diff --git a/docs/release_notes.rst b/docs/release_notes.rst index d30aec2776..8f2918532d 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -274,6 +274,10 @@ Analysis :ref:`compiled_geometry_utility_eia861`), and the estimated total hourly electricity demand for each US state in :ref:`predicted_state_hourly_demand`. See :issue:`1973` and :pr:`2550`. +* The :func:`pudl.analysis.service_territory.pudl_service_territories` script has been + fixed, and can be used to generate `GeoParquet `__ + outputs describing historical utility and balancing authority service territories. See + :issue:`1174` and :pr:`3086`. Deprecations ^^^^^^^^^^^^ diff --git a/pyproject.toml b/pyproject.toml index 584ffad350..200df74764 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -296,6 +296,7 @@ curl = ">=8.4.0" source = [ "docs/conf.py", "src/pudl/", + "test/conftest.py", "test/integration/", "test/unit/", ] From 2df40686c62d26c8a3337a735c467244c21f822e Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Mon, 4 Dec 2023 06:27:07 -0600 Subject: [PATCH 29/47] Consolidate coverage args from Makefile into pyproject.toml --- Makefile | 13 ++++++------- pyproject.toml | 4 +--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 9c9bb1095a..c2643e833b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ -covargs := --append gcs_cache_path := --gcs-cache-path=gs://zenodo-cache.catalyst.coop -pytest_covargs := --cov-append --cov-report=xml -pytest_args := --durations 20 ${pytest_covargs} ${gcs_cache_path} +covargs := --append +pytest_args := --durations 20 ${gcs_cache_path} etl_fast_yml := src/pudl/package_data/settings/etl_fast.yml etl_full_yml := src/pudl/package_data/settings/etl_full.yml @@ -80,7 +79,7 @@ docs-clean: .PHONY: docs-build docs-build: docs-clean doc8 docs/ README.rst - coverage run ${covargs} -- ${CONDA_PREFIX}/bin/sphinx-build -W -b html docs docs/_build/html + coverage run --append --source=src/pudl -- ${CONDA_PREFIX}/bin/sphinx-build -W -b html docs docs/_build/html coverage xml ######################################################################################## @@ -127,13 +126,13 @@ pytest-integration: coverage-erase: coverage erase +.PHONY: pytest-ci +pytest-ci: pytest-unit pytest-integration + .PHONY: pytest-coverage pytest-coverage: coverage-erase docs-build pytest-ci coverage report -.PHONY: pytest-ci -pytest-ci: pytest-unit pytest-integration - .PHONY: pytest-integration-full pytest-integration-full: pytest ${pytest_args} -n auto --live-dbs --etl-settings ${etl_full_yml} test/integration diff --git a/pyproject.toml b/pyproject.toml index 200df74764..35bea81f42 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -263,7 +263,7 @@ filterwarnings = [ "once:The behavior of DataFrame concatenation with empty or all-NA entries is deprecated.:FutureWarning", ] -addopts = "--verbose --pdbcls=IPython.terminal.debugger:TerminalPdb" +addopts = "--verbose --pdbcls=IPython.terminal.debugger:TerminalPdb --cov-append --cov-config=pyproject.toml --cov-report=xml --cov=src/pudl --cov=test/integration --cov=test/unit" log_format = "%(asctime)s [%(levelname)8s] %(name)s:%(lineno)s %(message)s" log_date_format = "%Y-%m-%d %H:%M:%S" log_cli = "true" @@ -294,9 +294,7 @@ curl = ">=8.4.0" [tool.coverage.run] source = [ - "docs/conf.py", "src/pudl/", - "test/conftest.py", "test/integration/", "test/unit/", ] From 42b213d9f315012e477b076ca8c2cbedc2d83e2b Mon Sep 17 00:00:00 2001 From: zaneselvans Date: Mon, 4 Dec 2023 12:29:52 +0000 Subject: [PATCH 30/47] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 2 +- environments/conda-lock.yml | 31 +++++++++++++++------------ environments/conda-osx-64.lock.yml | 2 +- environments/conda-osx-arm64.lock.yml | 2 +- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index 0269513e0f..a441d33500 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -458,7 +458,7 @@ dependencies: - dask-core=2023.12.0=pyhd8ed1ab_0 - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - - folium=0.15.0=pyhd8ed1ab_0 + - folium=0.15.1=pyhd8ed1ab_0 - google-resumable-media=2.6.0=pyhd8ed1ab_0 - graphene=3.3=pyhd8ed1ab_0 - grpcio-status=1.59.2=pyhd8ed1ab_0 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 11e514c4b7..8b98cbffce 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -4528,8 +4528,8 @@ package: dependencies: sniffio: "" python: ">=3.8.0,<4.0.0" - cryptography: ">=2.6,<42.0" httpcore: ">=0.17.3" + cryptography: ">=2.6,<42.0" idna: ">=2.1,<4.0" url: https://conda.anaconda.org/conda-forge/noarch/dnspython-2.4.2-pyhd8ed1ab_1.conda hash: @@ -4544,8 +4544,8 @@ package: dependencies: sniffio: "" python: ">=3.8.0,<4.0.0" - cryptography: ">=2.6,<42.0" httpcore: ">=0.17.3" + cryptography: ">=2.6,<42.0" idna: ">=2.1,<4.0" url: https://conda.anaconda.org/conda-forge/noarch/dnspython-2.4.2-pyhd8ed1ab_1.conda hash: @@ -5104,7 +5104,7 @@ package: category: main optional: false - name: folium - version: 0.15.0 + version: 0.15.1 manager: conda platform: linux-64 dependencies: @@ -5113,42 +5113,45 @@ package: numpy: "" python: ">=3.7" requests: "" - url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.0-pyhd8ed1ab_0.conda + xyzservices: "" + url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.1-pyhd8ed1ab_0.conda hash: - md5: 25f5dbce4f946240dea7d2ee79d34254 - sha256: afe869f136fca1dbda8be0c342392fda99d951c4c4612f134a70efbf5449ef30 + md5: 4fdfc338f6fb875b1078a7e20dbc99e2 + sha256: c0730ddfaf35e39ac92b7fd07315843e7948b2ce3361d164ec1b722dd0440c2b category: main optional: false - name: folium - version: 0.15.0 + version: 0.15.1 manager: conda platform: osx-64 dependencies: numpy: "" requests: "" + xyzservices: "" python: ">=3.7" jinja2: ">=2.9" branca: ">=0.7.0" - url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.1-pyhd8ed1ab_0.conda hash: - md5: 25f5dbce4f946240dea7d2ee79d34254 - sha256: afe869f136fca1dbda8be0c342392fda99d951c4c4612f134a70efbf5449ef30 + md5: 4fdfc338f6fb875b1078a7e20dbc99e2 + sha256: c0730ddfaf35e39ac92b7fd07315843e7948b2ce3361d164ec1b722dd0440c2b category: main optional: false - name: folium - version: 0.15.0 + version: 0.15.1 manager: conda platform: osx-arm64 dependencies: numpy: "" requests: "" + xyzservices: "" python: ">=3.7" jinja2: ">=2.9" branca: ">=0.7.0" - url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.1-pyhd8ed1ab_0.conda hash: - md5: 25f5dbce4f946240dea7d2ee79d34254 - sha256: afe869f136fca1dbda8be0c342392fda99d951c4c4612f134a70efbf5449ef30 + md5: 4fdfc338f6fb875b1078a7e20dbc99e2 + sha256: c0730ddfaf35e39ac92b7fd07315843e7948b2ce3361d164ec1b722dd0440c2b category: main optional: false - name: font-ttf-dejavu-sans-mono diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index c3ecec7701..a144375d54 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -438,7 +438,7 @@ dependencies: - dask-core=2023.12.0=pyhd8ed1ab_0 - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - - folium=0.15.0=pyhd8ed1ab_0 + - folium=0.15.1=pyhd8ed1ab_0 - google-resumable-media=2.6.0=pyhd8ed1ab_0 - graphene=3.3=pyhd8ed1ab_0 - grpcio-status=1.59.2=pyhd8ed1ab_0 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 43e725995f..f03aac75a8 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -438,7 +438,7 @@ dependencies: - dask-core=2023.12.0=pyhd8ed1ab_0 - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - - folium=0.15.0=pyhd8ed1ab_0 + - folium=0.15.1=pyhd8ed1ab_0 - google-resumable-media=2.6.0=pyhd8ed1ab_0 - graphene=3.3=pyhd8ed1ab_0 - grpcio-status=1.59.2=pyhd8ed1ab_0 From c01c2397a129657988238b5c52c09dccff117821 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Mon, 4 Dec 2023 07:24:43 -0600 Subject: [PATCH 31/47] Move some console script tests from unit to integration. --- test/integration/console_scripts_test.py | 19 +++++++++++-------- test/unit/console_scripts_test.py | 15 --------------- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/test/integration/console_scripts_test.py b/test/integration/console_scripts_test.py index 4229abfc84..2d69e4f36d 100644 --- a/test/integration/console_scripts_test.py +++ b/test/integration/console_scripts_test.py @@ -8,14 +8,14 @@ @pytest.mark.parametrize( "command", [ - "pudl_datastore -d ferc60 --gcs-cache-path gs://internal-zenodo-cache.catalyst.coop --partition year=2006", - "pudl_datastore --dataset ferc60 --bypass-local-cache --partition year=2006", - "pudl_datastore -d ferc60 --validate --partition year=2006", - "pudl_datastore -d ferc1 --validate --partition year=2021", - "pudl_datastore -d ferc2 --validate --partition year=2020", - "pudl_datastore -d ferc6 --validate --partition year=2021", + # Force the download of one small partition from Zenodo + "pudl_datastore --dataset ferc60 --bypass-local-cache --partition year=2020", + # Force the download of one small partition from GCS + "pudl_datastore -d ferc60 --bypass-local-cache --gcs-cache-path gs://internal-zenodo-cache.catalyst.coop --partition year=2020", + # Exercise the datastore validation code "pudl_datastore -d ferc60 --validate --partition year=2020", - "pudl_datastore -d ferc714 --validate --partition year=2021", + # Ensure that all data source partitions are legible + "pudl_datastore --list-partitions --gcs-cache-path gs://internal-zenodo-cache.catalyst.coop", ], ) @pytest.mark.script_launch_mode("inprocess") @@ -33,7 +33,10 @@ def test_pudl_service_territories(script_runner, pudl_engine: sa.Engine): Depends on the ``pudl_engine`` fixture to ensure that the censusdp1tract.sqlite database has been generated, since that data is required for the script to run. """ - command = f"pudl_service_territories --entity-type ba --no-dissolve --limit-by-state -o {PudlPaths().output_dir}" + command = f"pudl_service_territories --entity-type ba --no-dissolve -o {PudlPaths().output_dir}" runner_args = command.split(" ") ret = script_runner.run(runner_args, print_result=True) assert ret.success + out_path = PudlPaths().output_dir / "balancing_authority_geometry.parquet" + assert out_path.exists() + assert out_path.is_file() diff --git a/test/unit/console_scripts_test.py b/test/unit/console_scripts_test.py index 0245af4685..d28a9874df 100644 --- a/test/unit/console_scripts_test.py +++ b/test/unit/console_scripts_test.py @@ -20,18 +20,3 @@ def test_pudl_scripts(script_runner, script_name): assert ret.success ret = script_runner.run([script_name, "-h"], print_result=False) assert ret.success - - -@pytest.mark.parametrize( - "command", - [ - "pudl_datastore --dataset eia860 -d eia923 --list-partitions", - "pudl_datastore --list-partitions", - ], -) -@pytest.mark.script_launch_mode("inprocess") -def test_pudl_datastore_script(script_runner, command): - """CLI tests specific to the pudl_datastore script.""" - runner_args = command.split(" ") - ret = script_runner.run(runner_args, print_result=True) - assert ret.success From d58b753976372e8b015e2f68587c8cb91bb85ac7 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Mon, 4 Dec 2023 09:05:34 -0600 Subject: [PATCH 32/47] Remove unused docs/Makefile; Simplify covargs in main Makefile. --- Makefile | 12 +++--------- docs/Makefile | 20 -------------------- 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 docs/Makefile diff --git a/Makefile b/Makefile index c2643e833b..9b952b956b 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ docs-clean: .PHONY: docs-build docs-build: docs-clean doc8 docs/ README.rst - coverage run --append --source=src/pudl -- ${CONDA_PREFIX}/bin/sphinx-build -W -b html docs docs/_build/html + coverage run ${covargs} -- ${CONDA_PREFIX}/bin/sphinx-build -W -b html docs docs/_build/html coverage xml ######################################################################################## @@ -94,10 +94,7 @@ ferc: rm -f ${PUDL_OUTPUT}/ferc*.sqlite rm -f ${PUDL_OUTPUT}/ferc*_xbrl_datapackage.json rm -f ${PUDL_OUTPUT}/ferc*_xbrl_taxonomy_metadata.json - coverage run ${covargs} -- \ - src/pudl/ferc_to_sqlite/cli.py \ - ${gcs_cache_path} \ - ${etl_full_yml} + coverage run ${covargs} -- src/pudl/ferc_to_sqlite/cli.py ${gcs_cache_path} ${etl_full_yml} # Remove the existing PUDL DB if it exists. # Create a new empty DB using alembic. @@ -106,10 +103,7 @@ ferc: pudl: rm -f ${PUDL_OUTPUT}/pudl.sqlite alembic upgrade head - coverage run ${covargs} -- \ - src/pudl/etl/cli.py \ - ${gcs_cache_path} \ - ${etl_full_yml} + coverage run ${covargs} -- src/pudl/etl/cli.py ${gcs_cache_path} ${etl_full_yml} ######################################################################################## # Targets that are coordinated by pytest -- mostly they're actual tests. diff --git a/docs/Makefile b/docs/Makefile deleted file mode 100644 index d4bb2cbb9e..0000000000 --- a/docs/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# Minimal makefile for Sphinx documentation -# - -# You can set these variables from the command line, and also -# from the environment for the first two. -SPHINXOPTS ?= -SPHINXBUILD ?= sphinx-build -SOURCEDIR = . -BUILDDIR = _build - -# Put it first so that "make" without argument is like "make help". -help: - @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) - -.PHONY: help Makefile - -# Catch-all target: route all unknown targets to Sphinx using the new -# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). -%: Makefile - @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) From a64e478c40b66cc5c6582da104bd6351cd5cc695 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Mon, 4 Dec 2023 10:48:53 -0600 Subject: [PATCH 33/47] Skip pudl_service_territories test to see if it's causing CI failure --- test/integration/console_scripts_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/console_scripts_test.py b/test/integration/console_scripts_test.py index 2d69e4f36d..fad965f394 100644 --- a/test/integration/console_scripts_test.py +++ b/test/integration/console_scripts_test.py @@ -26,6 +26,7 @@ def test_pudl_datastore(script_runner, command: str): assert ret.success +@pytest.mark.skip("Check if this exceeds memory or disk of the GitHub runner.") @pytest.mark.script_launch_mode("inprocess") def test_pudl_service_territories(script_runner, pudl_engine: sa.Engine): """CLI tests specific to the pudl_service_territories script. From 59d4d970f73df18ae7c1297170198776219f7dbf Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Mon, 4 Dec 2023 14:22:26 -0600 Subject: [PATCH 34/47] Use public Zenodo cache, add single-year service territory option. --- pyproject.toml | 11 +++++---- src/pudl/analysis/service_territory.py | 31 +++++++++++++++++++++++- test/integration/console_scripts_test.py | 24 ++++++++++-------- 3 files changed, 50 insertions(+), 16 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 35bea81f42..187f474555 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -263,6 +263,10 @@ filterwarnings = [ "once:The behavior of DataFrame concatenation with empty or all-NA entries is deprecated.:FutureWarning", ] +# Oddly, despite the use of --cov-config=pyproject.toml here, pytest does not seem to +# pick up the source directories specified in the [tool.coverage.run] section below. +# (though it *does* pick up the omit parameters!). This means we need to specify the +# source directories we want to collect coverage twice, and keep the two in sync. addopts = "--verbose --pdbcls=IPython.terminal.debugger:TerminalPdb --cov-append --cov-config=pyproject.toml --cov-report=xml --cov=src/pudl --cov=test/integration --cov=test/unit" log_format = "%(asctime)s [%(levelname)8s] %(name)s:%(lineno)s %(message)s" log_date_format = "%Y-%m-%d %H:%M:%S" @@ -293,11 +297,8 @@ sqlite = ">=3.43" curl = ">=8.4.0" [tool.coverage.run] -source = [ - "src/pudl/", - "test/integration/", - "test/unit/", -] +# See note above on need to specify separate sources for pytest-coverage and coverage. +source = ["src/pudl/", "test/integration/", "test/unit/"] omit = [ # Never hit by integration tests: "src/pudl/validate.py", diff --git a/src/pudl/analysis/service_territory.py b/src/pudl/analysis/service_territory.py index e025f88ff7..6e5c50f3a1 100644 --- a/src/pudl/analysis/service_territory.py +++ b/src/pudl/analysis/service_territory.py @@ -305,6 +305,7 @@ def compile_geoms( output_dir: pathlib.Path | None = None, dissolve: bool = False, limit_by_state: bool = True, + years: list[int] = [], ): """Compile all available utility or balancing authority geometries. @@ -314,11 +315,23 @@ def compile_geoms( balancing authority, with geometries available at the county level. """ logger.info( - f"Compiling {entity_type} geometries with {dissolve=} and {limit_by_state=}." + f"Compiling {entity_type} geometries with {dissolve=}, {limit_by_state=}, " + f"and {years=}." ) if save_format == "geoparquet" and output_dir is None: raise ValueError("No output_dir provided while writing geoparquet.") + if years: + + def _limit_years(df: pd.DataFrame) -> pd.DataFrame: + return df[df.report_date.dt.year.isin(years)] + + balancing_authority_eia861 = _limit_years(balancing_authority_eia861) + balancing_authority_assn_eia861 = _limit_years(balancing_authority_assn_eia861) + denorm_utilities_eia = _limit_years(denorm_utilities_eia) + service_territory_eia861 = _limit_years(service_territory_eia861) + utility_assn_eia861 = _limit_years(utility_assn_eia861) + utilids_all_eia = utility_ids_all_eia( denorm_utilities_eia, service_territory_eia861 ) @@ -578,6 +591,20 @@ def plot_all_territories( ), show_default=True, ) +@click.option( + "--year", + "-y", + "years", + type=click.IntRange(min=2001), + default=[], + multiple=True, + help=( + "Limit service territories generated to those from the given year. This can " + "dramatically reduce the memory and CPU intensity of the geospatial " + "operations. Especially useful for testing. Option can be used multiple times " + "toselect multiple years." + ), +) @click.option( "--dissolve/--no-dissolve", default=True, @@ -632,6 +659,7 @@ def pudl_service_territories( dissolve: bool, output_dir: pathlib.Path, limit_by_state: bool, + years: list[int], logfile: pathlib.Path, loglevel: str, ): @@ -688,6 +716,7 @@ def pudl_service_territories( output_dir=output_dir, entity_type=entity_type, limit_by_state=limit_by_state, + years=years, ) diff --git a/test/integration/console_scripts_test.py b/test/integration/console_scripts_test.py index fad965f394..5683b375fe 100644 --- a/test/integration/console_scripts_test.py +++ b/test/integration/console_scripts_test.py @@ -1,9 +1,9 @@ """Test the PUDL console scripts from within PyTest.""" +from pathlib import Path + import pytest import sqlalchemy as sa -from pudl.workspace.setup import PudlPaths - @pytest.mark.parametrize( "command", @@ -11,11 +11,11 @@ # Force the download of one small partition from Zenodo "pudl_datastore --dataset ferc60 --bypass-local-cache --partition year=2020", # Force the download of one small partition from GCS - "pudl_datastore -d ferc60 --bypass-local-cache --gcs-cache-path gs://internal-zenodo-cache.catalyst.coop --partition year=2020", + "pudl_datastore -d ferc60 --bypass-local-cache --gcs-cache-path gs://zenodo-cache.catalyst.coop --partition year=2020", # Exercise the datastore validation code "pudl_datastore -d ferc60 --validate --partition year=2020", # Ensure that all data source partitions are legible - "pudl_datastore --list-partitions --gcs-cache-path gs://internal-zenodo-cache.catalyst.coop", + "pudl_datastore --list-partitions --gcs-cache-path gs://zenodo-cache.catalyst.coop", ], ) @pytest.mark.script_launch_mode("inprocess") @@ -26,18 +26,22 @@ def test_pudl_datastore(script_runner, command: str): assert ret.success -@pytest.mark.skip("Check if this exceeds memory or disk of the GitHub runner.") +# @pytest.mark.skip("Test exceeds memory or disk limits of GitHub runner.") @pytest.mark.script_launch_mode("inprocess") -def test_pudl_service_territories(script_runner, pudl_engine: sa.Engine): +def test_pudl_service_territories( + script_runner, tmp_path: Path, pudl_engine: sa.Engine +): """CLI tests specific to the pudl_service_territories script. Depends on the ``pudl_engine`` fixture to ensure that the censusdp1tract.sqlite database has been generated, since that data is required for the script to run. """ - command = f"pudl_service_territories --entity-type ba --no-dissolve -o {PudlPaths().output_dir}" - runner_args = command.split(" ") - ret = script_runner.run(runner_args, print_result=True) + out_path = tmp_path / "balancing_authority_geometry.parquet" + assert not out_path.exists() + command = ( + f"pudl_service_territories --entity-type ba -y 2022 --no-dissolve -o {tmp_path}" + ) + ret = script_runner.run(command.split(" "), print_result=True) assert ret.success - out_path = PudlPaths().output_dir / "balancing_authority_geometry.parquet" assert out_path.exists() assert out_path.is_file() From 61cf811c429477e257cb354aa3305297fdf27458 Mon Sep 17 00:00:00 2001 From: zaneselvans Date: Mon, 4 Dec 2023 20:25:07 +0000 Subject: [PATCH 35/47] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 18 +-- environments/conda-lock.yml | 207 +++++++++++++------------- environments/conda-osx-64.lock.yml | 18 +-- environments/conda-osx-arm64.lock.yml | 18 +-- 4 files changed, 129 insertions(+), 132 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index a441d33500..b7aa194d5b 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -232,6 +232,7 @@ dependencies: - pickleshare=0.7.5=py_1003 - pkginfo=1.9.6=pyhd8ed1ab_0 - 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 - prometheus_client=0.19.0=pyhd8ed1ab_0 @@ -349,6 +350,7 @@ dependencies: - jinja2=3.1.2=pyhd8ed1ab_1 - joblib=1.3.2=pyhd8ed1ab_0 - jsonlines=4.0.0=pyhd8ed1ab_0 + - jupyter_core=5.5.0=py311h38be061_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - libcblas=3.9.0=20_linux64_openblas @@ -366,7 +368,6 @@ dependencies: - pillow=10.1.0=py311ha6c5da5_0 - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - - platformdirs=4.0.0=pyhd8ed1ab_0 - postgresql=16.1=h8972f4a_2 - proj=9.3.0=h1d62c97_2 - prompt-toolkit=3.0.41=pyha770c72_0 @@ -391,6 +392,7 @@ dependencies: - typing_inspect=0.9.0=pyhd8ed1ab_0 - universal_pathlib=0.1.4=pyhd8ed1ab_0 - urllib3=1.26.18=pyhd8ed1ab_0 + - virtualenv=20.25.0=pyhd8ed1ab_0 - watchdog=3.0.0=py311h38be061_1 - xerces-c=3.2.4=hac6953d_3 - yarl=1.9.3=py311h459d7ec_0 @@ -417,7 +419,6 @@ dependencies: - httpcore=1.0.2=pyhd8ed1ab_0 - importlib_metadata=7.0.0=hd8ed1ab_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 - libnetcdf=4.9.2=nompi_h80fb2b6_112 @@ -445,11 +446,10 @@ dependencies: - tiledb=2.16.3=h8c794c1_3 - ukkonen=1.0.1=py311h9547e67_4 - uvicorn=0.24.0.post1=py311h38be061_0 - - virtualenv=20.25.0=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h46250e7_0 - aiohttp=3.8.6=py311h459d7ec_1 - alembic=1.13.0=pyhd8ed1ab_0 - - arelle-release=2.17.7=pyhd8ed1ab_0 + - arelle-release=2.18.0=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - aws-crt-cpp=0.24.7=h97e63c7_6 - bottleneck=1.3.7=py311h1f0f07a_1 @@ -465,7 +465,7 @@ dependencies: - h3-py=3.7.6=py311hb755f60_1 - httpx=0.25.2=pyhd8ed1ab_0 - identify=2.5.32=pyhd8ed1ab_0 - - ipython=8.18.1=pyh31011fe_1 + - ipython=8.18.1=pyh31011fe_2 - isoduration=20.11.0=pyhd8ed1ab_0 - jsonschema=4.20.0=pyhd8ed1ab_0 - jupyter_client=8.6.0=pyhd8ed1ab_0 @@ -538,21 +538,21 @@ dependencies: - libarrow-flight=14.0.1=h120cb0d_3_cpu - libarrow-gandiva=14.0.1=hacb8726_3_cpu - libparquet=14.0.1=h352af49_3_cpu - - nbconvert-core=7.11.0=pyhd8ed1ab_0 + - nbconvert-core=7.12.0=pyhd8ed1ab_0 - 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 - - jupyter_server=2.11.1=pyhd8ed1ab_0 + - jupyter_server=2.11.2=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 + - nbconvert-pandoc=7.12.0=pyhd8ed1ab_0 - gcsfs=2023.12.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 - - nbconvert=7.11.0=pyhd8ed1ab_0 + - nbconvert=7.12.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - jupyterlab=4.0.9=pyhd8ed1ab_0 - pyarrow=14.0.1=py311h39c9aba_3_cpu diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 8b98cbffce..a2ff56733e 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.7 + version: 2.18.0 manager: conda platform: linux-64 dependencies: @@ -549,50 +549,50 @@ package: python: ">=3.8" python-dateutil: 2.* regex: "" - url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.17.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.18.0-pyhd8ed1ab_0.conda hash: - md5: b42bbf2e318b6bbbd9de2d81ecf8ed50 - sha256: 3094446e601ad9160677c2bb5b75b9946c81b679bebf42bf52c126e71d76fb43 + md5: cf492dd79a1d1d1ef2af299da2a604ca + sha256: f3fa253f2a26faa56348acc2a76eaf55778f871b995af429c9636d9159a4b483 category: main optional: false - name: arelle-release - version: 2.17.7 + version: 2.18.0 manager: conda platform: osx-64 dependencies: certifi: "" regex: "" python: ">=3.8" - numpy: 1.* python-dateutil: 2.* + numpy: 1.* isodate: 0.* lxml: 4.* openpyxl: 3.* pyparsing: 3.* - url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.17.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.18.0-pyhd8ed1ab_0.conda hash: - md5: b42bbf2e318b6bbbd9de2d81ecf8ed50 - sha256: 3094446e601ad9160677c2bb5b75b9946c81b679bebf42bf52c126e71d76fb43 + md5: cf492dd79a1d1d1ef2af299da2a604ca + sha256: f3fa253f2a26faa56348acc2a76eaf55778f871b995af429c9636d9159a4b483 category: main optional: false - name: arelle-release - version: 2.17.7 + version: 2.18.0 manager: conda platform: osx-arm64 dependencies: certifi: "" regex: "" python: ">=3.8" - numpy: 1.* python-dateutil: 2.* + numpy: 1.* isodate: 0.* lxml: 4.* openpyxl: 3.* pyparsing: 3.* - url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.17.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.18.0-pyhd8ed1ab_0.conda hash: - md5: b42bbf2e318b6bbbd9de2d81ecf8ed50 - sha256: 3094446e601ad9160677c2bb5b75b9946c81b679bebf42bf52c126e71d76fb43 + md5: cf492dd79a1d1d1ef2af299da2a604ca + sha256: f3fa253f2a26faa56348acc2a76eaf55778f871b995af429c9636d9159a4b483 category: main optional: false - name: argon2-cffi @@ -8533,16 +8533,16 @@ package: matplotlib-inline: "" pexpect: ">4.3" pickleshare: "" - prompt-toolkit: ">=3.0.30,<3.1.0,!=3.0.37" + prompt-toolkit: ">=3.0.41,<3.1.0" pygments: ">=2.4.0" python: ">=3.9" stack_data: "" traitlets: ">=5" typing_extensions: "" - url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_2.conda hash: - md5: ac2f9c2e10c2e90e8d135cef51f9753a - sha256: 67490e640faa372d663a5c5cd2d61f417cce22a019a4de82a9e5ddb1cf2ee181 + md5: 5e23d20fc6e33061c063220146579990 + sha256: c956b70ed41b7f61a780a7e584f03f68e7e5073c8c138960bfbc5e705d9124b1 category: main optional: false - name: ipython @@ -8562,11 +8562,11 @@ package: 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.1-pyh31011fe_1.conda + prompt-toolkit: ">=3.0.41,<3.1.0" + url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_2.conda hash: - md5: ac2f9c2e10c2e90e8d135cef51f9753a - sha256: 67490e640faa372d663a5c5cd2d61f417cce22a019a4de82a9e5ddb1cf2ee181 + md5: 5e23d20fc6e33061c063220146579990 + sha256: c956b70ed41b7f61a780a7e584f03f68e7e5073c8c138960bfbc5e705d9124b1 category: main optional: false - name: ipython @@ -8586,11 +8586,11 @@ package: 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.1-pyh31011fe_1.conda + prompt-toolkit: ">=3.0.41,<3.1.0" + url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_2.conda hash: - md5: ac2f9c2e10c2e90e8d135cef51f9753a - sha256: 67490e640faa372d663a5c5cd2d61f417cce22a019a4de82a9e5ddb1cf2ee181 + md5: 5e23d20fc6e33061c063220146579990 + sha256: c956b70ed41b7f61a780a7e584f03f68e7e5073c8c138960bfbc5e705d9124b1 category: main optional: false - name: ipywidgets @@ -9376,8 +9376,8 @@ package: dependencies: ipywidgets: "" notebook: "" - ipykernel: "" nbconvert: "" + ipykernel: "" qtconsole-base: "" jupyter_console: "" python: ">=3.6" @@ -9394,8 +9394,8 @@ package: dependencies: ipywidgets: "" notebook: "" - ipykernel: "" nbconvert: "" + ipykernel: "" qtconsole-base: "" jupyter_console: "" python: ">=3.6" @@ -9709,7 +9709,7 @@ package: category: main optional: false - name: jupyter_server - version: 2.11.1 + version: 2.11.2 manager: conda platform: linux-64 dependencies: @@ -9732,14 +9732,14 @@ package: tornado: ">=6.2.0" traitlets: ">=5.6.0" websocket-client: "" - url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.11.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.11.2-pyhd8ed1ab_0.conda hash: - md5: 0699b715659c026f7f81c27d0e744205 - sha256: 605825c0e2d5af7935b37319b9a46ff39e081e7a0f4dc973f0dd583f41c69ce5 + md5: c831341804aecf5abcdbb348be301f92 + sha256: 9e56c09fa7f4b95aab30b51008416d041c53cfd94ef3a4abc339d1eabb015df2 category: main optional: false - name: jupyter_server - version: 2.11.1 + version: 2.11.2 manager: conda platform: osx-64 dependencies: @@ -9762,14 +9762,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.11.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.11.2-pyhd8ed1ab_0.conda hash: - md5: 0699b715659c026f7f81c27d0e744205 - sha256: 605825c0e2d5af7935b37319b9a46ff39e081e7a0f4dc973f0dd583f41c69ce5 + md5: c831341804aecf5abcdbb348be301f92 + sha256: 9e56c09fa7f4b95aab30b51008416d041c53cfd94ef3a4abc339d1eabb015df2 category: main optional: false - name: jupyter_server - version: 2.11.1 + version: 2.11.2 manager: conda platform: osx-arm64 dependencies: @@ -9792,10 +9792,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.11.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.11.2-pyhd8ed1ab_0.conda hash: - md5: 0699b715659c026f7f81c27d0e744205 - sha256: 605825c0e2d5af7935b37319b9a46ff39e081e7a0f4dc973f0dd583f41c69ce5 + md5: c831341804aecf5abcdbb348be301f92 + sha256: 9e56c09fa7f4b95aab30b51008416d041c53cfd94ef3a4abc339d1eabb015df2 category: main optional: false - name: jupyter_server_terminals @@ -9874,8 +9874,8 @@ package: ipykernel: "" jupyter_core: "" python: ">=3.8" - jinja2: ">=3.0.3" tornado: ">=6.2.0" + jinja2: ">=3.0.3" importlib_metadata: ">=4.8.3" jupyter_server: ">=2.4.0,<3" importlib_resources: ">=1.4" @@ -9900,8 +9900,8 @@ package: ipykernel: "" jupyter_core: "" python: ">=3.8" - jinja2: ">=3.0.3" tornado: ">=6.2.0" + jinja2: ">=3.0.3" importlib_metadata: ">=4.8.3" jupyter_server: ">=2.4.0,<3" importlib_resources: ">=1.4" @@ -14420,49 +14420,49 @@ package: category: main optional: false - name: nbconvert - version: 7.11.0 + version: 7.12.0 manager: conda platform: linux-64 dependencies: - nbconvert-core: 7.11.0 - nbconvert-pandoc: 7.11.0 + nbconvert-core: 7.12.0 + nbconvert-pandoc: 7.12.0 python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.12.0-pyhd8ed1ab_0.conda hash: - md5: e492b36cbea1c83d1663fa73a8abff9b - sha256: 6af7048b30c0ce6746297548df981037802f713853a1e856aedd2f8164946d39 + md5: 364e28ab12477494e72839aaa588073d + sha256: 0137330ab16bddf1fcaf60c0501c6145705b775fd547823708ed84364c934b76 category: main optional: false - name: nbconvert - version: 7.11.0 + version: 7.12.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" - nbconvert-core: 7.11.0 - nbconvert-pandoc: 7.11.0 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.11.0-pyhd8ed1ab_0.conda + nbconvert-core: 7.12.0 + nbconvert-pandoc: 7.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.12.0-pyhd8ed1ab_0.conda hash: - md5: e492b36cbea1c83d1663fa73a8abff9b - sha256: 6af7048b30c0ce6746297548df981037802f713853a1e856aedd2f8164946d39 + md5: 364e28ab12477494e72839aaa588073d + sha256: 0137330ab16bddf1fcaf60c0501c6145705b775fd547823708ed84364c934b76 category: main optional: false - name: nbconvert - version: 7.11.0 + version: 7.12.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - nbconvert-core: 7.11.0 - nbconvert-pandoc: 7.11.0 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.11.0-pyhd8ed1ab_0.conda + nbconvert-core: 7.12.0 + nbconvert-pandoc: 7.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.12.0-pyhd8ed1ab_0.conda hash: - md5: e492b36cbea1c83d1663fa73a8abff9b - sha256: 6af7048b30c0ce6746297548df981037802f713853a1e856aedd2f8164946d39 + md5: 364e28ab12477494e72839aaa588073d + sha256: 0137330ab16bddf1fcaf60c0501c6145705b775fd547823708ed84364c934b76 category: main optional: false - name: nbconvert-core - version: 7.11.0 + version: 7.12.0 manager: conda platform: linux-64 dependencies: @@ -14483,14 +14483,14 @@ package: python: ">=3.8" tinycss2: "" traitlets: ">=5.0" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.12.0-pyhd8ed1ab_0.conda hash: - md5: d59e0cb1ca993f8f910cfdf393232acf - sha256: 81732e083c4c85a52248e20ff0e40a14b0b49db9cc7ce414e8aa7d6f8980dad0 + md5: 4d67c68fd0d130091ada039bc2d81b33 + sha256: 04c3ac88701d98d58139569e4899c3254bf99908179a898cc3dcadd8c0ef44b4 category: main optional: false - name: nbconvert-core - version: 7.11.0 + version: 7.12.0 manager: conda platform: osx-64 dependencies: @@ -14511,14 +14511,14 @@ package: pygments: ">=2.4.1" nbclient: ">=0.5.0" mistune: ">=2.0.3,<4" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.12.0-pyhd8ed1ab_0.conda hash: - md5: d59e0cb1ca993f8f910cfdf393232acf - sha256: 81732e083c4c85a52248e20ff0e40a14b0b49db9cc7ce414e8aa7d6f8980dad0 + md5: 4d67c68fd0d130091ada039bc2d81b33 + sha256: 04c3ac88701d98d58139569e4899c3254bf99908179a898cc3dcadd8c0ef44b4 category: main optional: false - name: nbconvert-core - version: 7.11.0 + version: 7.12.0 manager: conda platform: osx-arm64 dependencies: @@ -14539,52 +14539,52 @@ package: pygments: ">=2.4.1" nbclient: ">=0.5.0" mistune: ">=2.0.3,<4" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.12.0-pyhd8ed1ab_0.conda hash: - md5: d59e0cb1ca993f8f910cfdf393232acf - sha256: 81732e083c4c85a52248e20ff0e40a14b0b49db9cc7ce414e8aa7d6f8980dad0 + md5: 4d67c68fd0d130091ada039bc2d81b33 + sha256: 04c3ac88701d98d58139569e4899c3254bf99908179a898cc3dcadd8c0ef44b4 category: main optional: false - name: nbconvert-pandoc - version: 7.11.0 + version: 7.12.0 manager: conda platform: linux-64 dependencies: - nbconvert-core: 7.11.0 + nbconvert-core: 7.12.0 pandoc: "" python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.12.0-pyhd8ed1ab_0.conda hash: - md5: 51bd005efab7e5c5c2af2570327bd213 - sha256: 377d3c3f973b6885406ff6606d24c5e1fbd0d0fdc64c0dc17162f6daf35e08cf + md5: 460d7cac50322a39b61a833885a6a8d5 + sha256: ebf25caef387ec79f8d8f6771240d451ffaebcc2cdd127c0b152c6697d661d10 category: main optional: false - name: nbconvert-pandoc - version: 7.11.0 + version: 7.12.0 manager: conda platform: osx-64 dependencies: pandoc: "" python: ">=3.8" - nbconvert-core: 7.11.0 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.11.0-pyhd8ed1ab_0.conda + nbconvert-core: 7.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.12.0-pyhd8ed1ab_0.conda hash: - md5: 51bd005efab7e5c5c2af2570327bd213 - sha256: 377d3c3f973b6885406ff6606d24c5e1fbd0d0fdc64c0dc17162f6daf35e08cf + md5: 460d7cac50322a39b61a833885a6a8d5 + sha256: ebf25caef387ec79f8d8f6771240d451ffaebcc2cdd127c0b152c6697d661d10 category: main optional: false - name: nbconvert-pandoc - version: 7.11.0 + version: 7.12.0 manager: conda platform: osx-arm64 dependencies: pandoc: "" python: ">=3.8" - nbconvert-core: 7.11.0 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.11.0-pyhd8ed1ab_0.conda + nbconvert-core: 7.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.12.0-pyhd8ed1ab_0.conda hash: - md5: 51bd005efab7e5c5c2af2570327bd213 - sha256: 377d3c3f973b6885406ff6606d24c5e1fbd0d0fdc64c0dc17162f6daf35e08cf + md5: 460d7cac50322a39b61a833885a6a8d5 + sha256: ebf25caef387ec79f8d8f6771240d451ffaebcc2cdd127c0b152c6697d661d10 category: main optional: false - name: nbformat @@ -16340,42 +16340,39 @@ package: category: main optional: false - name: platformdirs - version: 4.0.0 + version: 4.1.0 manager: conda platform: linux-64 dependencies: - python: ">=3.7" - typing_extensions: ">=4.7.1" - url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.0.0-pyhd8ed1ab_0.conda + python: ">=3.8" + url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.1.0-pyhd8ed1ab_0.conda hash: - md5: 6bb4ee32cd435deaeac72776c001e7ac - sha256: 67381d3f7cadca7df7699238e0dcce680ad20d7fd28804bab48611fecb084937 + md5: 45a5065664da0d1dfa8f8cd2eaf05ab9 + sha256: 9e4ff17ce802159ed31344eb913eaa877688226765b77947b102b42255a53853 category: main optional: false - name: platformdirs - version: 4.0.0 + version: 4.1.0 manager: conda platform: osx-64 dependencies: - python: ">=3.7" - typing_extensions: ">=4.7.1" - url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.0.0-pyhd8ed1ab_0.conda + python: ">=3.8" + url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.1.0-pyhd8ed1ab_0.conda hash: - md5: 6bb4ee32cd435deaeac72776c001e7ac - sha256: 67381d3f7cadca7df7699238e0dcce680ad20d7fd28804bab48611fecb084937 + md5: 45a5065664da0d1dfa8f8cd2eaf05ab9 + sha256: 9e4ff17ce802159ed31344eb913eaa877688226765b77947b102b42255a53853 category: main optional: false - name: platformdirs - version: 4.0.0 + version: 4.1.0 manager: conda platform: osx-arm64 dependencies: - python: ">=3.7" - typing_extensions: ">=4.7.1" - url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.0.0-pyhd8ed1ab_0.conda + python: ">=3.8" + url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.1.0-pyhd8ed1ab_0.conda hash: - md5: 6bb4ee32cd435deaeac72776c001e7ac - sha256: 67381d3f7cadca7df7699238e0dcce680ad20d7fd28804bab48611fecb084937 + md5: 45a5065664da0d1dfa8f8cd2eaf05ab9 + sha256: 9e4ff17ce802159ed31344eb913eaa877688226765b77947b102b42255a53853 category: main optional: false - name: pluggy diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index a144375d54..50cfc5d72d 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -217,6 +217,7 @@ dependencies: - pillow=10.1.0=py311hea5c87a_0 - pkginfo=1.9.6=pyhd8ed1ab_0 - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_1 + - platformdirs=4.1.0=pyhd8ed1ab_0 - pluggy=1.3.0=pyhd8ed1ab_0 - prometheus_client=0.19.0=pyhd8ed1ab_0 - psutil=5.9.5=py311h2725bcf_1 @@ -329,6 +330,7 @@ dependencies: - jinja2=3.1.2=pyhd8ed1ab_1 - joblib=1.3.2=pyhd8ed1ab_0 - jsonlines=4.0.0=pyhd8ed1ab_0 + - jupyter_core=5.5.0=py311h6eed73b_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - libcblas=3.9.0=20_osx64_openblas @@ -344,7 +346,6 @@ dependencies: - pexpect=4.8.0=pyh1a96a4e_2 - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - - platformdirs=4.0.0=pyhd8ed1ab_0 - poppler=23.12.0=hdd5a5e8_0 - postgresql=16.1=h413614c_2 - proj=9.3.0=h23b96cc_2 @@ -371,6 +372,7 @@ dependencies: - typing_inspect=0.9.0=pyhd8ed1ab_0 - universal_pathlib=0.1.4=pyhd8ed1ab_0 - urllib3=1.26.18=pyhd8ed1ab_0 + - virtualenv=20.25.0=pyhd8ed1ab_0 - watchdog=3.0.0=py311h5ef12f2_1 - xerces-c=3.2.4=h6314983_3 - yarl=1.9.3=py311he705e18_0 @@ -396,7 +398,6 @@ dependencies: - httpcore=1.0.2=pyhd8ed1ab_0 - importlib_metadata=7.0.0=hd8ed1ab_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 - libnetcdf=4.9.2=nompi_h6a32802_112 @@ -425,11 +426,10 @@ dependencies: - tiledb=2.16.3=hd3a41d5_3 - ukkonen=1.0.1=py311h5fe6e05_4 - uvicorn=0.24.0.post1=py311h6eed73b_0 - - virtualenv=20.25.0=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h5e0f0e4_0 - aiohttp=3.8.6=py311he705e18_1 - alembic=1.13.0=pyhd8ed1ab_0 - - arelle-release=2.17.7=pyhd8ed1ab_0 + - arelle-release=2.18.0=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - aws-sdk-cpp=1.11.182=h28d282b_7 - bottleneck=1.3.7=py311h4a70a88_1 @@ -446,7 +446,7 @@ dependencies: - h3-py=3.7.6=py311hdf8f085_1 - httpx=0.25.2=pyhd8ed1ab_0 - identify=2.5.32=pyhd8ed1ab_0 - - ipython=8.18.1=pyh31011fe_1 + - ipython=8.18.1=pyh31011fe_2 - isoduration=20.11.0=pyhd8ed1ab_0 - jsonschema=4.20.0=pyhd8ed1ab_0 - jupyter_client=8.6.0=pyhd8ed1ab_0 @@ -519,18 +519,18 @@ dependencies: - google-cloud-core=2.3.3=pyhd8ed1ab_0 - libarrow-dataset=14.0.1=hc222712_3_cpu - libarrow-flight-sql=14.0.1=h2cc6c1c_3_cpu - - nbconvert-core=7.11.0=pyhd8ed1ab_0 + - 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 - - jupyter_server=2.11.1=pyhd8ed1ab_0 + - jupyter_server=2.11.2=pyhd8ed1ab_0 - libarrow-substrait=14.0.1=h2cc6c1c_3_cpu - - nbconvert-pandoc=7.11.0=pyhd8ed1ab_0 + - nbconvert-pandoc=7.12.0=pyhd8ed1ab_0 - gcsfs=2023.12.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 + - nbconvert=7.12.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - pyarrow=14.0.1=py311h98a0319_3_cpu - jupyterlab=4.0.9=pyhd8ed1ab_0 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index f03aac75a8..c253a2ca9c 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -217,6 +217,7 @@ dependencies: - pillow=10.1.0=py311hb9c5795_0 - pkginfo=1.9.6=pyhd8ed1ab_0 - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_1 + - platformdirs=4.1.0=pyhd8ed1ab_0 - pluggy=1.3.0=pyhd8ed1ab_0 - prometheus_client=0.19.0=pyhd8ed1ab_0 - psutil=5.9.5=py311heffc1b2_1 @@ -329,6 +330,7 @@ dependencies: - jinja2=3.1.2=pyhd8ed1ab_1 - joblib=1.3.2=pyhd8ed1ab_0 - jsonlines=4.0.0=pyhd8ed1ab_0 + - jupyter_core=5.5.0=py311h267d04e_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - libcblas=3.9.0=20_osxarm64_openblas @@ -344,7 +346,6 @@ dependencies: - pexpect=4.8.0=pyh1a96a4e_2 - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - - platformdirs=4.0.0=pyhd8ed1ab_0 - poppler=23.12.0=hcdd998b_0 - postgresql=16.1=hc6ab77f_2 - proj=9.3.0=h52fb9d0_2 @@ -371,6 +372,7 @@ dependencies: - typing_inspect=0.9.0=pyhd8ed1ab_0 - universal_pathlib=0.1.4=pyhd8ed1ab_0 - urllib3=1.26.18=pyhd8ed1ab_0 + - virtualenv=20.25.0=pyhd8ed1ab_0 - watchdog=3.0.0=py311heffc1b2_1 - xerces-c=3.2.4=hd886eac_3 - yarl=1.9.3=py311h05b510d_0 @@ -396,7 +398,6 @@ dependencies: - httpcore=1.0.2=pyhd8ed1ab_0 - importlib_metadata=7.0.0=hd8ed1ab_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 - libnetcdf=4.9.2=nompi_hb2fb864_112 @@ -425,11 +426,10 @@ dependencies: - tiledb=2.16.3=he15c4da_3 - ukkonen=1.0.1=py311he4fd1f5_4 - uvicorn=0.24.0.post1=py311h267d04e_0 - - virtualenv=20.25.0=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h94f323b_0 - aiohttp=3.8.6=py311h05b510d_1 - alembic=1.13.0=pyhd8ed1ab_0 - - arelle-release=2.17.7=pyhd8ed1ab_0 + - arelle-release=2.18.0=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - aws-sdk-cpp=1.11.182=h31542fa_7 - bottleneck=1.3.7=py311hb49d859_1 @@ -446,7 +446,7 @@ dependencies: - h3-py=3.7.6=py311ha891d26_1 - httpx=0.25.2=pyhd8ed1ab_0 - identify=2.5.32=pyhd8ed1ab_0 - - ipython=8.18.1=pyh31011fe_1 + - ipython=8.18.1=pyh31011fe_2 - isoduration=20.11.0=pyhd8ed1ab_0 - jsonschema=4.20.0=pyhd8ed1ab_0 - jupyter_client=8.6.0=pyhd8ed1ab_0 @@ -519,18 +519,18 @@ dependencies: - google-cloud-core=2.3.3=pyhd8ed1ab_0 - libarrow-dataset=14.0.1=had9dd58_3_cpu - libarrow-flight-sql=14.0.1=h660fe36_3_cpu - - nbconvert-core=7.11.0=pyhd8ed1ab_0 + - 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 - - jupyter_server=2.11.1=pyhd8ed1ab_0 + - jupyter_server=2.11.2=pyhd8ed1ab_0 - libarrow-substrait=14.0.1=h594d712_3_cpu - - nbconvert-pandoc=7.11.0=pyhd8ed1ab_0 + - nbconvert-pandoc=7.12.0=pyhd8ed1ab_0 - gcsfs=2023.12.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 + - nbconvert=7.12.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - pyarrow=14.0.1=py311h637fcfe_3_cpu - jupyterlab=4.0.9=pyhd8ed1ab_0 From 4b7e668f7ec4de2f0571aafe761ab52671202685 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Mon, 4 Dec 2023 14:38:37 -0600 Subject: [PATCH 36/47] Test both dissolve/no-dissolve, ba/util service territories --- test/integration/console_scripts_test.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/test/integration/console_scripts_test.py b/test/integration/console_scripts_test.py index 5683b375fe..ff207ddf48 100644 --- a/test/integration/console_scripts_test.py +++ b/test/integration/console_scripts_test.py @@ -26,21 +26,31 @@ def test_pudl_datastore(script_runner, command: str): assert ret.success -# @pytest.mark.skip("Test exceeds memory or disk limits of GitHub runner.") +@pytest.mark.parametrize( + "command,filename", + [ + ( + "pudl_service_territories --entity-type ba -y 2022 --no-dissolve -o ", + "balancing_authority_geometry.parquet", + ), + ( + "pudl_service_territories --entity-type util -y 2022 --dissolve -o ", + "utility_geometry_dissolved.parquet", + ), + ], +) @pytest.mark.script_launch_mode("inprocess") def test_pudl_service_territories( - script_runner, tmp_path: Path, pudl_engine: sa.Engine + script_runner, command: str, tmp_path: Path, filename: str, pudl_engine: sa.Engine ): """CLI tests specific to the pudl_service_territories script. Depends on the ``pudl_engine`` fixture to ensure that the censusdp1tract.sqlite database has been generated, since that data is required for the script to run. """ - out_path = tmp_path / "balancing_authority_geometry.parquet" + out_path = tmp_path / filename assert not out_path.exists() - command = ( - f"pudl_service_territories --entity-type ba -y 2022 --no-dissolve -o {tmp_path}" - ) + command += str(tmp_path) ret = script_runner.run(command.split(" "), print_result=True) assert ret.success assert out_path.exists() From 58bb0880b1ef6de8d3e1341b8c3f481e5a44d9f9 Mon Sep 17 00:00:00 2001 From: bendnorman Date: Mon, 4 Dec 2023 11:44:13 -0900 Subject: [PATCH 37/47] Fix small syntax error in gcp_pudl_etl.sh --- docker/gcp_pudl_etl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/gcp_pudl_etl.sh b/docker/gcp_pudl_etl.sh index 8364a47a5a..0544a1b53a 100644 --- a/docker/gcp_pudl_etl.sh +++ b/docker/gcp_pudl_etl.sh @@ -44,7 +44,7 @@ function run_pudl_etl() { -n auto \ --gcs-cache-path gs://internal-zenodo-cache.catalyst.coop \ --etl-settings $PUDL_SETTINGS_YML \ - --live-dbs test/validate + --live-dbs test/validate \ && touch ${PUDL_OUTPUT}/success } From 34c6b8c3ec647c39819dee216b23840d41f4b2c5 Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Mon, 4 Dec 2023 14:54:18 -0600 Subject: [PATCH 38/47] Test 2 years and --limit-by-state --- test/integration/console_scripts_test.py | 50 ++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/test/integration/console_scripts_test.py b/test/integration/console_scripts_test.py index ff207ddf48..a21007eb34 100644 --- a/test/integration/console_scripts_test.py +++ b/test/integration/console_scripts_test.py @@ -1,6 +1,7 @@ """Test the PUDL console scripts from within PyTest.""" from pathlib import Path +import geopandas as gpd import pytest import sqlalchemy as sa @@ -27,21 +28,61 @@ def test_pudl_datastore(script_runner, command: str): @pytest.mark.parametrize( - "command,filename", + "command,filename,expected_cols", [ ( - "pudl_service_territories --entity-type ba -y 2022 --no-dissolve -o ", + "pudl_service_territories --entity-type ba -y 2022 --limit-by-state --no-dissolve -o ", + "balancing_authority_geometry_limited.parquet", + { + "area_km2", + "balancing_authority_id_eia", + "county", + "county_id_fips", + "county_name_census", + "geometry", + "population", + "report_date", + "state", + "state_id_fips", + }, + ), + ( + "pudl_service_territories --entity-type ba -y 2021 -y 2022 --no-dissolve -o ", "balancing_authority_geometry.parquet", + { + "area_km2", + "balancing_authority_id_eia", + "county", + "county_id_fips", + "county_name_census", + "geometry", + "population", + "report_date", + "state", + "state_id_fips", + }, ), ( "pudl_service_territories --entity-type util -y 2022 --dissolve -o ", "utility_geometry_dissolved.parquet", + { + "area_km2", + "geometry", + "population", + "report_date", + "utility_id_eia", + }, ), ], ) @pytest.mark.script_launch_mode("inprocess") def test_pudl_service_territories( - script_runner, command: str, tmp_path: Path, filename: str, pudl_engine: sa.Engine + script_runner, + command: str, + tmp_path: Path, + filename: str, + expected_cols: set[str], + pudl_engine: sa.Engine, ): """CLI tests specific to the pudl_service_territories script. @@ -55,3 +96,6 @@ def test_pudl_service_territories( assert ret.success assert out_path.exists() assert out_path.is_file() + gdf = gpd.read_parquet(out_path) + assert set(gdf.columns) == expected_cols + assert not gdf.empty From ff6bd72989700fb8c34205eca8e8a86d3bd1d3c5 Mon Sep 17 00:00:00 2001 From: bendnorman Date: Mon, 4 Dec 2023 16:01:49 -0900 Subject: [PATCH 39/47] Checkout env files from 7cc80dab59437b0dda3dbac3bed28be5f4e33858 --- environments/conda-linux-64.lock.yml | 54 +- environments/conda-lock.yml | 767 +++++++++++++------------- environments/conda-osx-64.lock.yml | 54 +- environments/conda-osx-arm64.lock.yml | 54 +- 4 files changed, 463 insertions(+), 466 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index b45e606241..3d6da6f452 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -62,7 +62,7 @@ dependencies: - lzo=2.10=h516909a_1000 - ncurses=6.4=h59595ed_2 - nspr=4.35=h27087fc_0 - - openssl=3.2.0=hd590300_1 + - openssl=3.1.4=hd590300_0 - pixman=0.42.2=h59595ed_0 - pthread-stubs=0.4=h36c2ea0_1001 - rdma-core=49.0=hd3aeb46_1 @@ -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.9=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - dbus=1.13.6=h5008d03_3 - debugpy=1.8.0=py311hb755f60_1 @@ -178,7 +178,7 @@ dependencies: - fontconfig=2.14.2=h14ed4e7_0 - freexl=2.0.0=h743c826_0 - frozenlist=1.4.0=py311h459d7ec_1 - - fsspec=2023.12.0=pyhca7485f_0 + - fsspec=2023.10.0=pyhca7485f_0 - gdk-pixbuf=2.42.10=h829c605_4 - google-cloud-sdk=455.0.0=py311h38be061_0 - greenlet=3.0.1=py311hb755f60_0 @@ -200,11 +200,11 @@ dependencies: - jsonpointer=2.4=py311h38be061_3 - jupyterlab_widgets=3.0.9=pyhd8ed1ab_0 - kiwisolver=1.4.5=py311h9547e67_1 - - lcms2=2.16=hb7c19ff_0 + - lcms2=2.15=hb7c19ff_3 - libblas=3.9.0=20_linux64_openblas - libcurl=8.4.0=hca28451_0 - libgrpc=1.59.2=hd6c4280_0 - - libpq=16.1=hfc447b1_2 + - libpq=16.1=hfc447b1_0 - libwebp=1.3.2=h658648e_1 - llvmlite=0.41.1=py311ha6695c7_0 - locket=1.0.0=pyhd8ed1ab_0 @@ -296,7 +296,7 @@ dependencies: - wcwidth=0.2.12=pyhd8ed1ab_0 - webcolors=1.13=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_2 - - websocket-client=1.7.0=pyhd8ed1ab_0 + - websocket-client=1.6.4=pyhd8ed1ab_0 - websockets=10.4=py311hd4cff14_1 - wheel=0.42.0=pyhd8ed1ab_0 - widgetsnbextension=4.0.9=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.1=hbdc6101_0 + - cfitsio=4.3.0=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 @@ -331,7 +331,7 @@ dependencies: - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311h459d7ec_0 - curl=8.4.0=hca28451_0 - - fonttools=4.46.0=py311h459d7ec_0 + - fonttools=4.45.1=py311h459d7ec_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 - grpcio=1.59.2=py311ha6695c7_0 @@ -340,7 +340,7 @@ dependencies: - hdf5=1.14.2=nompi_h4f84152_100 - html5lib=1.1=pyh9f0ad1d_0 - hypothesis=6.91.0=pyha770c72_0 - - importlib-metadata=7.0.0=pyha770c72_0 + - importlib-metadata=6.8.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 - janus=1.0.0=pyhd8ed1ab_0 @@ -367,7 +367,7 @@ dependencies: - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - platformdirs=4.0.0=pyhd8ed1ab_0 - - postgresql=16.1=h8972f4a_2 + - postgresql=16.1=h8972f4a_0 - proj=9.3.0=h1d62c97_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h46cbc50_0 @@ -401,10 +401,10 @@ 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.6=pyhd8ed1ab_0 + - botocore=1.33.5=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - - cryptography=41.0.7=py311hcb13ee4_1 + - cryptography=41.0.5=py311h63ff55d_0 - fqdn=1.5.1=pyhd8ed1ab_0 - geotiff=1.7.1=hf074850_14 - gitpython=3.1.40=pyhd8ed1ab_0 @@ -415,7 +415,7 @@ dependencies: - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - harfbuzz=8.3.0=h3d44ed6_0 - httpcore=1.0.2=pyhd8ed1ab_0 - - importlib_metadata=7.0.0=hd8ed1ab_0 + - importlib_metadata=6.8.0=hd8ed1ab_0 - jsonschema-specifications=2023.11.2=pyhd8ed1ab_0 - jupyter_core=5.5.0=py311h38be061_0 - jupyter_server_terminals=0.4.4=pyhd8ed1ab_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.12.0=h590f24d_0 + - poppler=23.11.0=h590f24d_0 - prompt_toolkit=3.0.41=hd8ed1ab_0 - psycopg2-binary=2.9.7=pyhd8ed1ab_1 - pybtex=0.24.0=pyhd8ed1ab_2 @@ -441,24 +441,24 @@ dependencies: - rich=13.7.0=pyhd8ed1ab_0 - sqlalchemy=2.0.23=py311h459d7ec_0 - stack_data=0.6.2=pyhd8ed1ab_0 - - starlette=0.33.0=pyhd8ed1ab_0 + - starlette=0.32.0.post1=pyhd8ed1ab_0 - tiledb=2.16.3=h8c794c1_3 - ukkonen=1.0.1=py311h9547e67_4 - uvicorn=0.24.0.post1=py311h38be061_0 - - virtualenv=20.25.0=pyhd8ed1ab_0 + - virtualenv=20.24.7=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h46250e7_0 - aiohttp=3.8.6=py311h459d7ec_1 - - alembic=1.13.0=pyhd8ed1ab_0 + - alembic=1.12.1=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 - cachecontrol=0.13.1=pyhd8ed1ab_0 - contourpy=1.2.0=py311h9547e67_0 - - dask-core=2023.12.0=pyhd8ed1ab_0 + - dask-core=2023.11.0=pyhd8ed1ab_0 - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - - folium=0.15.1=pyhd8ed1ab_0 + - folium=0.15.0=pyhd8ed1ab_0 - google-resumable-media=2.6.0=pyhd8ed1ab_0 - graphene=3.3=pyhd8ed1ab_0 - grpcio-status=1.59.2=pyhd8ed1ab_0 @@ -469,7 +469,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.0=he7dcfe9_6 - numba=0.58.1=py311h96b013e_0 - numexpr=2.8.7=py311h039bad6_104 - oauthlib=3.2.2=pyhd8ed1ab_0 @@ -490,14 +490,14 @@ 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.6=pyhd8ed1ab_0 + - boto3=1.33.5=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - - dagster=1.5.10=pyhd8ed1ab_0 + - dagster=1.5.9=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.0=py311h815a124_6 - geopandas-base=0.14.1=pyha770c72_0 - google-auth=2.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 @@ -517,8 +517,8 @@ dependencies: - timezonefinder=6.2.0=py311h459d7ec_2 - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.10=pyhd8ed1ab_0 - - dagster-postgres=0.21.10=pyhd8ed1ab_0 + - dagster-graphql=1.5.9=pyhd8ed1ab_0 + - dagster-postgres=0.21.9=pyhd8ed1ab_1 - 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.10=pyhd8ed1ab_0 + - dagster-webserver=1.5.9=pyhd8ed1ab_0 - geopandas=0.14.1=pyhd8ed1ab_0 - google-cloud-core=2.3.3=pyhd8ed1ab_0 - libarrow-acero=14.0.1=h59595ed_3_cpu @@ -547,7 +547,7 @@ dependencies: - 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.12.0=pyhd8ed1ab_0 + - gcsfs=2023.10.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 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index f3a4470731..148e867498 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -266,7 +266,7 @@ package: category: main optional: false - name: alembic - version: 1.13.0 + version: 1.12.1 manager: conda platform: linux-64 dependencies: @@ -276,14 +276,14 @@ package: python: ">=3.7" sqlalchemy: ">=1.3.0" typing-extensions: ">=4" - url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.13.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.12.1-pyhd8ed1ab_0.conda hash: - md5: 7f0372c1cfa41891787ddf267334c0c7 - sha256: d6dd010632bc5272fe7e51646651c5fb9ae9b7663113b94aa585d6bcb43834b0 + md5: 15de9992b4096a2a6656ca202fde6e4c + sha256: 24019b1af4777e32843b230dd7a9bf7082943eb21bba03379ceed0bda50facf9 category: main optional: false - name: alembic - version: 1.13.0 + version: 1.12.1 manager: conda platform: osx-64 dependencies: @@ -293,14 +293,14 @@ package: python: ">=3.7" sqlalchemy: ">=1.3.0" typing-extensions: ">=4" - url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.13.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.12.1-pyhd8ed1ab_0.conda hash: - md5: 7f0372c1cfa41891787ddf267334c0c7 - sha256: d6dd010632bc5272fe7e51646651c5fb9ae9b7663113b94aa585d6bcb43834b0 + md5: 15de9992b4096a2a6656ca202fde6e4c + sha256: 24019b1af4777e32843b230dd7a9bf7082943eb21bba03379ceed0bda50facf9 category: main optional: false - name: alembic - version: 1.13.0 + version: 1.12.1 manager: conda platform: osx-arm64 dependencies: @@ -310,10 +310,10 @@ package: python: ">=3.7" sqlalchemy: ">=1.3.0" typing-extensions: ">=4" - url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.13.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.12.1-pyhd8ed1ab_0.conda hash: - md5: 7f0372c1cfa41891787ddf267334c0c7 - sha256: d6dd010632bc5272fe7e51646651c5fb9ae9b7663113b94aa585d6bcb43834b0 + md5: 15de9992b4096a2a6656ca202fde6e4c + sha256: 24019b1af4777e32843b230dd7a9bf7082943eb21bba03379ceed0bda50facf9 category: main optional: false - name: aniso8601 @@ -1914,52 +1914,52 @@ package: category: main optional: false - name: boto3 - version: 1.33.6 + version: 1.33.5 manager: conda platform: linux-64 dependencies: - botocore: ">=1.33.6,<1.34.0" + botocore: ">=1.33.5,<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.6-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.5-pyhd8ed1ab_0.conda hash: - md5: fff8f43d8786f4e2a0ab4ed431f8c511 - sha256: 7fad398c6730cb751de3495b8204a7cd133aeecdd684273bc3359f31e1c01eca + md5: 7485d3ee00269cd33baa2ad64a0923ee + sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 category: main optional: false - name: boto3 - version: 1.33.6 + version: 1.33.5 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.6,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.6-pyhd8ed1ab_0.conda + botocore: ">=1.33.5,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.5-pyhd8ed1ab_0.conda hash: - md5: fff8f43d8786f4e2a0ab4ed431f8c511 - sha256: 7fad398c6730cb751de3495b8204a7cd133aeecdd684273bc3359f31e1c01eca + md5: 7485d3ee00269cd33baa2ad64a0923ee + sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 category: main optional: false - name: boto3 - version: 1.33.6 + version: 1.33.5 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.6,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.6-pyhd8ed1ab_0.conda + botocore: ">=1.33.5,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.5-pyhd8ed1ab_0.conda hash: - md5: fff8f43d8786f4e2a0ab4ed431f8c511 - sha256: 7fad398c6730cb751de3495b8204a7cd133aeecdd684273bc3359f31e1c01eca + md5: 7485d3ee00269cd33baa2ad64a0923ee + sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 category: main optional: false - name: botocore - version: 1.33.6 + 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.6-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.5-pyhd8ed1ab_0.conda hash: - md5: e1c7565a0bfba34c3be07a3ad882356f - sha256: 06549a55df5711e0306395e8187f03c46f25337fb7e9ab6c014cf26a76ca9cef + md5: 352c39ba5cd9ea01996358f0748e102e + sha256: 56566ea8f3a48c24190c1dcf50681c0a84b26821c335c21b5c3c5d238e4bdb14 category: main optional: false - name: botocore - version: 1.33.6 + 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.6-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.5-pyhd8ed1ab_0.conda hash: - md5: e1c7565a0bfba34c3be07a3ad882356f - sha256: 06549a55df5711e0306395e8187f03c46f25337fb7e9ab6c014cf26a76ca9cef + md5: 352c39ba5cd9ea01996358f0748e102e + sha256: 56566ea8f3a48c24190c1dcf50681c0a84b26821c335c21b5c3c5d238e4bdb14 category: main optional: false - name: botocore - version: 1.33.6 + 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.6-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.5-pyhd8ed1ab_0.conda hash: - md5: e1c7565a0bfba34c3be07a3ad882356f - sha256: 06549a55df5711e0306395e8187f03c46f25337fb7e9ab6c014cf26a76ca9cef + md5: 352c39ba5cd9ea01996358f0748e102e + sha256: 56566ea8f3a48c24190c1dcf50681c0a84b26821c335c21b5c3c5d238e4bdb14 category: main optional: false - name: bottleneck @@ -2873,52 +2873,52 @@ package: category: main optional: false - name: cfitsio - version: 4.3.1 + version: 4.3.0 manager: conda platform: linux-64 dependencies: bzip2: ">=1.0.8,<2.0a0" - libcurl: ">=8.4.0,<9.0a0" + libcurl: ">=8.2.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.1-hbdc6101_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/cfitsio-4.3.0-hbdc6101_0.conda hash: - md5: dcea02841b33a9c49f74ca9328de919a - sha256: b91003bff71351a0132c84d69fbb5afcfa90e57d83f76a180c6a5a0289099fb1 + md5: 797554b8b7603011e8677884381fbcc5 + sha256: c74938f1ade9b8f37b9fa8cc98a5b9262b325506f41d7492ad1d00146e0f1d08 category: main optional: false - name: cfitsio - version: 4.3.1 + version: 4.3.0 manager: conda platform: osx-64 dependencies: bzip2: ">=1.0.8,<2.0a0" - libcurl: ">=8.4.0,<9.0a0" + libcurl: ">=8.2.0,<9.0a0" libgfortran: 5.* - libgfortran5: ">=13.2.0" + libgfortran5: ">=12.2.0" libzlib: ">=1.2.13,<1.3.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/cfitsio-4.3.1-h60fb419_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/cfitsio-4.3.0-h66f91ea_0.conda hash: - md5: 03ab895afe3804b527c12193a9612cac - sha256: 5bd157478529ff4d05b8e8654de0580609177252eb11ecf5201b831effeeb2ec + md5: f540472ad8a8ea2b39a4c6ca14ebc1b5 + sha256: 0246d80ce305609c7e810514d1aa578ef498a1f05fd2dba5fa46ea845e4e57b9 category: main optional: false - name: cfitsio - version: 4.3.1 + version: 4.3.0 manager: conda platform: osx-arm64 dependencies: bzip2: ">=1.0.8,<2.0a0" - libcurl: ">=8.4.0,<9.0a0" + libcurl: ">=8.2.0,<9.0a0" libgfortran: 5.* - libgfortran5: ">=13.2.0" + libgfortran5: ">=12.3.0" libzlib: ">=1.2.13,<1.3.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/cfitsio-4.3.1-h808cd33_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/cfitsio-4.3.0-hca87796_0.conda hash: - md5: 22b61b2ad129db82da2eee76710f7551 - sha256: 9395bd24ef552ac6063e2d6a6fc57e5c7067a74b8d8ee3f06d8389baffacf016 + md5: a5a1019a6405052124e97999a5204a74 + sha256: 5d03f8d484d29f8d3bdd64afe22ed29d75c639834b40382f8a520f96a7af27c4 category: main optional: false - name: chardet @@ -3658,7 +3658,7 @@ package: category: main optional: false - name: cryptography - version: 41.0.7 + version: 41.0.5 manager: conda platform: linux-64 dependencies: @@ -3667,14 +3667,14 @@ package: openssl: ">=3.1.4,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-41.0.7-py311hcb13ee4_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-41.0.5-py311h63ff55d_0.conda hash: - md5: ca6e04ac7262ecaec846e483d6fdc6c8 - sha256: 0959d015727ae5f55f385556a0a19b9f6036752ea05f78a99cb534803e325cab + md5: 22584e5c97ed8f1a6b63a0ff43dba827 + sha256: 236ed2218fb857fecaa11fc7fee23574f683b3d03576f8f26f628b7fd2ced5fa category: main optional: false - name: cryptography - version: 41.0.7 + version: 41.0.5 manager: conda platform: osx-64 dependencies: @@ -3682,14 +3682,14 @@ package: openssl: ">=3.1.4,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/cryptography-41.0.7-py311h48c7838_1.conda + url: https://conda.anaconda.org/conda-forge/osx-64/cryptography-41.0.5-py311hd51016d_0.conda hash: - md5: 65293feff96135571de02c047ecbd5a2 - sha256: f4c5e683386acf06cfa85805d264c9cd540361ec6e86740cb03312e560aa706a + md5: 99f1edef251a9fe4edf620b527ee70ea + sha256: 26ee22b99771f0d338eca6299cbe866f695c544d855d5eab82539497b0a24fc1 category: main optional: false - name: cryptography - version: 41.0.7 + version: 41.0.5 manager: conda platform: osx-arm64 dependencies: @@ -3697,10 +3697,10 @@ package: openssl: ">=3.1.4,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/cryptography-41.0.7-py311h08c85a6_1.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/cryptography-41.0.5-py311h71175c2_0.conda hash: - md5: 729546a91873db64ab8e675008845fb5 - sha256: 9d51ba743069d19aae08361a7b051ca1f281fb3b3ccb162e96c2503cf5a7d365 + md5: adc55f424334b834098d50e57efe0789 + sha256: 00c9b389b51b6e951a1f639aa04dceca9e329e144275c79b4f6baacd3fb90345 category: main optional: false - name: curl @@ -3792,7 +3792,7 @@ package: category: main optional: false - name: dagster - version: 1.5.10 + version: 1.5.9 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.9,<1.5.10.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.9-pyhd8ed1ab_0.conda hash: - md5: bcf42b675edb2999669116bc3b1ed789 - sha256: dcee8473cbd1823005285f5fc82fbb16d9d1b2b46bcdf8371ee4fe2fdb0ad50c + md5: d8ab27112f82687ffcd456a3b88092e5 + sha256: 238b08bf9afbc98405cb0c8c9845514da7b4b21aac5817c2b5f0de04e3a19b1b category: main optional: false - name: dagster - version: 1.5.10 + version: 1.5.9 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.9,<1.5.10.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.9-pyhd8ed1ab_0.conda hash: - md5: bcf42b675edb2999669116bc3b1ed789 - sha256: dcee8473cbd1823005285f5fc82fbb16d9d1b2b46bcdf8371ee4fe2fdb0ad50c + md5: d8ab27112f82687ffcd456a3b88092e5 + sha256: 238b08bf9afbc98405cb0c8c9845514da7b4b21aac5817c2b5f0de04e3a19b1b category: main optional: false - name: dagster - version: 1.5.10 + version: 1.5.9 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.9,<1.5.10.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.9-pyhd8ed1ab_0.conda hash: - md5: bcf42b675edb2999669116bc3b1ed789 - sha256: dcee8473cbd1823005285f5fc82fbb16d9d1b2b46bcdf8371ee4fe2fdb0ad50c + md5: d8ab27112f82687ffcd456a3b88092e5 + sha256: 238b08bf9afbc98405cb0c8c9845514da7b4b21aac5817c2b5f0de04e3a19b1b category: main optional: false - name: dagster-graphql - version: 1.5.10 + version: 1.5.9 manager: conda platform: linux-64 dependencies: - dagster: ">=1.5.10,<1.5.11.0a0" + dagster: ">=1.5.9,<1.5.10.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.9-pyhd8ed1ab_0.conda hash: - md5: fd3569582db65a0c88fbc7d1bb803853 - sha256: a142f082da2b7905713b09e0ad19eef971a5d4f66063ba7a2b19247e3932e129 + md5: 7dcd105a5451f9800aa6de278d86db72 + sha256: 8484c6b0db1a3505fc7d16e83e0da75b9c886ae3d497266fd06f72fcd3246786 category: dev optional: true - name: dagster-graphql - version: 1.5.10 + version: 1.5.9 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.9,<1.5.10.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.9-pyhd8ed1ab_0.conda hash: - md5: fd3569582db65a0c88fbc7d1bb803853 - sha256: a142f082da2b7905713b09e0ad19eef971a5d4f66063ba7a2b19247e3932e129 + md5: 7dcd105a5451f9800aa6de278d86db72 + sha256: 8484c6b0db1a3505fc7d16e83e0da75b9c886ae3d497266fd06f72fcd3246786 category: dev optional: true - name: dagster-graphql - version: 1.5.10 + version: 1.5.9 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.9,<1.5.10.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.9-pyhd8ed1ab_0.conda hash: - md5: fd3569582db65a0c88fbc7d1bb803853 - sha256: a142f082da2b7905713b09e0ad19eef971a5d4f66063ba7a2b19247e3932e129 + md5: 7dcd105a5451f9800aa6de278d86db72 + sha256: 8484c6b0db1a3505fc7d16e83e0da75b9c886ae3d497266fd06f72fcd3246786 category: dev optional: true - name: dagster-pipes - version: 1.5.10 + version: 1.5.9 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.9-pyhd8ed1ab_0.conda hash: - md5: 69600c68efc23fb84c05c2e9c1c05947 - sha256: a98a8b2501af4bc112d5b2f5e3edea6c22a084651cc720786c405877b8507630 + md5: 0a9787859365c4d2425e589ac53c462b + sha256: eebc7dca517350678ebfb8b3fff7ec47c60aff62dae2e69b8c4845b6080ec3e8 category: main optional: false - name: dagster-pipes - version: 1.5.10 + version: 1.5.9 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.9-pyhd8ed1ab_0.conda hash: - md5: 69600c68efc23fb84c05c2e9c1c05947 - sha256: a98a8b2501af4bc112d5b2f5e3edea6c22a084651cc720786c405877b8507630 + md5: 0a9787859365c4d2425e589ac53c462b + sha256: eebc7dca517350678ebfb8b3fff7ec47c60aff62dae2e69b8c4845b6080ec3e8 category: main optional: false - name: dagster-pipes - version: 1.5.10 + version: 1.5.9 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.9-pyhd8ed1ab_0.conda hash: - md5: 69600c68efc23fb84c05c2e9c1c05947 - sha256: a98a8b2501af4bc112d5b2f5e3edea6c22a084651cc720786c405877b8507630 + md5: 0a9787859365c4d2425e589ac53c462b + sha256: eebc7dca517350678ebfb8b3fff7ec47c60aff62dae2e69b8c4845b6080ec3e8 category: main optional: false - name: dagster-postgres - version: 0.21.10 + version: 0.21.9 manager: conda platform: linux-64 dependencies: - dagster: 1.5.10.* + dagster: 1.5.9.* 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.9-pyhd8ed1ab_1.conda hash: - md5: ec155b3a7172590ccbc89f461427b5aa - sha256: 4eb986655ef547d4dc72cd34b60687c9c3c390806493c15187c4d26d89d58fc0 + md5: 8c1a941fe77b920b1c7933a7a0c6bf2e + sha256: 0e947f376d6878bd8e505932277e84c373da492a38d2c4ef9d96fc25f5327845 category: main optional: false - name: dagster-postgres - version: 0.21.10 + version: 0.21.9 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.9.* + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.9-pyhd8ed1ab_1.conda hash: - md5: ec155b3a7172590ccbc89f461427b5aa - sha256: 4eb986655ef547d4dc72cd34b60687c9c3c390806493c15187c4d26d89d58fc0 + md5: 8c1a941fe77b920b1c7933a7a0c6bf2e + sha256: 0e947f376d6878bd8e505932277e84c373da492a38d2c4ef9d96fc25f5327845 category: main optional: false - name: dagster-postgres - version: 0.21.10 + version: 0.21.9 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.9.* + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.9-pyhd8ed1ab_1.conda hash: - md5: ec155b3a7172590ccbc89f461427b5aa - sha256: 4eb986655ef547d4dc72cd34b60687c9c3c390806493c15187c4d26d89d58fc0 + md5: 8c1a941fe77b920b1c7933a7a0c6bf2e + sha256: 0e947f376d6878bd8e505932277e84c373da492a38d2c4ef9d96fc25f5327845 category: main optional: false - name: dagster-webserver - version: 1.5.10 + version: 1.5.9 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.9,<1.5.10.0a0" + dagster-graphql: ">=1.5.9,<1.5.10.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.9-pyhd8ed1ab_0.conda hash: - md5: 6161623733c03c21098dce0af904ea6b - sha256: 975173f6a39f40d5fa505354007200741689714bb1eaf1cba8e52fab1a2bfc88 + md5: 880fa7acdbf3494cef45759bb866bb63 + sha256: 2fce08b607d97f72d7452350a0c917d96419074381bf8791ebe116ec3a57b8f4 category: dev optional: true - name: dagster-webserver - version: 1.5.10 + version: 1.5.9 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.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 hash: - md5: 6161623733c03c21098dce0af904ea6b - sha256: 975173f6a39f40d5fa505354007200741689714bb1eaf1cba8e52fab1a2bfc88 + md5: 880fa7acdbf3494cef45759bb866bb63 + sha256: 2fce08b607d97f72d7452350a0c917d96419074381bf8791ebe116ec3a57b8f4 category: dev optional: true - name: dagster-webserver - version: 1.5.10 + version: 1.5.9 manager: conda platform: osx-arm64 dependencies: @@ -4086,16 +4086,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.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 hash: - md5: 6161623733c03c21098dce0af904ea6b - sha256: 975173f6a39f40d5fa505354007200741689714bb1eaf1cba8e52fab1a2bfc88 + md5: 880fa7acdbf3494cef45759bb866bb63 + sha256: 2fce08b607d97f72d7452350a0c917d96419074381bf8791ebe116ec3a57b8f4 category: dev optional: true - name: dask-core - version: 2023.12.0 + version: 2023.11.0 manager: conda platform: linux-64 dependencies: @@ -4108,14 +4108,14 @@ package: python: ">=3.9" pyyaml: ">=5.3.1" toolz: ">=0.10.0" - url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.12.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.11.0-pyhd8ed1ab_0.conda hash: - md5: 95eae0785aed72998493140dc0115382 - sha256: e366163aa7325d14ca38ca72ca4672eeb4b7a7453573c47cfa90d0db60136b48 + md5: 3bf8f5c3fbab9e0cfffdf5914f021854 + sha256: f23b4e5d8f118d9d7916d8def04dab9a299d73879216da72dd7168c1c30ecb9e category: main optional: false - name: dask-core - version: 2023.12.0 + version: 2023.11.0 manager: conda platform: osx-64 dependencies: @@ -4128,14 +4128,14 @@ package: importlib_metadata: ">=4.13.0" fsspec: ">=2021.09.0" click: ">=8.1" - url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.12.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.11.0-pyhd8ed1ab_0.conda hash: - md5: 95eae0785aed72998493140dc0115382 - sha256: e366163aa7325d14ca38ca72ca4672eeb4b7a7453573c47cfa90d0db60136b48 + md5: 3bf8f5c3fbab9e0cfffdf5914f021854 + sha256: f23b4e5d8f118d9d7916d8def04dab9a299d73879216da72dd7168c1c30ecb9e category: main optional: false - name: dask-core - version: 2023.12.0 + version: 2023.11.0 manager: conda platform: osx-arm64 dependencies: @@ -4148,10 +4148,10 @@ package: importlib_metadata: ">=4.13.0" fsspec: ">=2021.09.0" click: ">=8.1" - url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.12.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.11.0-pyhd8ed1ab_0.conda hash: - md5: 95eae0785aed72998493140dc0115382 - sha256: e366163aa7325d14ca38ca72ca4672eeb4b7a7453573c47cfa90d0db60136b48 + md5: 3bf8f5c3fbab9e0cfffdf5914f021854 + sha256: f23b4e5d8f118d9d7916d8def04dab9a299d73879216da72dd7168c1c30ecb9e category: main optional: false - name: dataclasses @@ -4528,8 +4528,8 @@ package: dependencies: sniffio: "" python: ">=3.8.0,<4.0.0" - httpcore: ">=0.17.3" cryptography: ">=2.6,<42.0" + httpcore: ">=0.17.3" idna: ">=2.1,<4.0" url: https://conda.anaconda.org/conda-forge/noarch/dnspython-2.4.2-pyhd8ed1ab_1.conda hash: @@ -4544,8 +4544,8 @@ package: dependencies: sniffio: "" python: ">=3.8.0,<4.0.0" - httpcore: ">=0.17.3" cryptography: ">=2.6,<42.0" + httpcore: ">=0.17.3" idna: ">=2.1,<4.0" url: https://conda.anaconda.org/conda-forge/noarch/dnspython-2.4.2-pyhd8ed1ab_1.conda hash: @@ -5104,7 +5104,7 @@ package: category: main optional: false - name: folium - version: 0.15.1 + version: 0.15.0 manager: conda platform: linux-64 dependencies: @@ -5113,45 +5113,42 @@ package: numpy: "" python: ">=3.7" requests: "" - xyzservices: "" - url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.0-pyhd8ed1ab_0.conda hash: - md5: 4fdfc338f6fb875b1078a7e20dbc99e2 - sha256: c0730ddfaf35e39ac92b7fd07315843e7948b2ce3361d164ec1b722dd0440c2b + md5: 25f5dbce4f946240dea7d2ee79d34254 + sha256: afe869f136fca1dbda8be0c342392fda99d951c4c4612f134a70efbf5449ef30 category: main optional: false - name: folium - version: 0.15.1 + version: 0.15.0 manager: conda platform: osx-64 dependencies: numpy: "" requests: "" - xyzservices: "" python: ">=3.7" jinja2: ">=2.9" branca: ">=0.7.0" - url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.0-pyhd8ed1ab_0.conda hash: - md5: 4fdfc338f6fb875b1078a7e20dbc99e2 - sha256: c0730ddfaf35e39ac92b7fd07315843e7948b2ce3361d164ec1b722dd0440c2b + md5: 25f5dbce4f946240dea7d2ee79d34254 + sha256: afe869f136fca1dbda8be0c342392fda99d951c4c4612f134a70efbf5449ef30 category: main optional: false - name: folium - version: 0.15.1 + version: 0.15.0 manager: conda platform: osx-arm64 dependencies: numpy: "" requests: "" - xyzservices: "" python: ">=3.7" jinja2: ">=2.9" branca: ">=0.7.0" - url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.0-pyhd8ed1ab_0.conda hash: - md5: 4fdfc338f6fb875b1078a7e20dbc99e2 - sha256: c0730ddfaf35e39ac92b7fd07315843e7948b2ce3361d164ec1b722dd0440c2b + md5: 25f5dbce4f946240dea7d2ee79d34254 + sha256: afe869f136fca1dbda8be0c342392fda99d951c4c4612f134a70efbf5449ef30 category: main optional: false - name: font-ttf-dejavu-sans-mono @@ -5412,7 +5409,7 @@ package: category: main optional: false - name: fonttools - version: 4.46.0 + version: 4.45.1 manager: conda platform: linux-64 dependencies: @@ -5421,14 +5418,14 @@ package: munkres: "" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.46.0-py311h459d7ec_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.45.1-py311h459d7ec_0.conda hash: - md5: a14114f70e23f7fd5ab9941fec45b095 - sha256: a40f8415d9ceaf5f217034814b984d13017e4dab577085a83a2d0cc39b9d7239 + md5: 5b24692ece82f89e5cb9a469d9619731 + sha256: 57d311f86568d46f33845ea8c7d1c9e449a1fa85e510baa17f09e2cae2283681 category: main optional: false - name: fonttools - version: 4.46.0 + version: 4.45.1 manager: conda platform: osx-64 dependencies: @@ -5436,14 +5433,14 @@ package: munkres: "" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/fonttools-4.46.0-py311he705e18_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/fonttools-4.45.1-py311he705e18_0.conda hash: - md5: c68a6370b0db24b87be1a4cd7a511545 - sha256: 05c4b4fe22ce74bd5145dacf261cec44bbadac82d1e65a0b3a03d2675330f1bb + md5: 2910a2886c556ce4085fd59d73ae96f2 + sha256: 5a60241d7585b33160c169ae59b9bd9445c89bfb4604b2d77e7a0db48c04ccc5 category: main optional: false - name: fonttools - version: 4.46.0 + version: 4.45.1 manager: conda platform: osx-arm64 dependencies: @@ -5451,10 +5448,10 @@ package: munkres: "" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/fonttools-4.46.0-py311h05b510d_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/fonttools-4.45.1-py311h05b510d_0.conda hash: - md5: 1bac60f34700b22c8e8364f32b502211 - sha256: 300d8cc1cc987ab913e3b24c38f8eaf679acff0e885747a3f71471fd92db3e33 + md5: 40c7471beb6af15161a202c0ddf04d82 + sha256: 7d8d2c8de468dc5a432e8d083f3b56eeec4380749bcfd09a44c81d42cacceece category: main optional: false - name: fqdn @@ -5738,39 +5735,39 @@ package: category: main optional: false - name: fsspec - version: 2023.12.0 + version: 2023.10.0 manager: conda platform: linux-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.0-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.10.0-pyhca7485f_0.conda hash: - md5: 036539452871d3b0906ff194ad808c9b - sha256: 72c84d372aa5d60eb31c53c108bacefb0c6fb854047441b543738e144f1fae65 + md5: 5b86cf1ceaaa9be2ec4627377e538db1 + sha256: 1bbdfadb93cc768252fd207dca406cde928f9a81ff985ea1760b6539c55923e6 category: main optional: false - name: fsspec - version: 2023.12.0 + version: 2023.10.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.0-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.10.0-pyhca7485f_0.conda hash: - md5: 036539452871d3b0906ff194ad808c9b - sha256: 72c84d372aa5d60eb31c53c108bacefb0c6fb854047441b543738e144f1fae65 + md5: 5b86cf1ceaaa9be2ec4627377e538db1 + sha256: 1bbdfadb93cc768252fd207dca406cde928f9a81ff985ea1760b6539c55923e6 category: main optional: false - name: fsspec - version: 2023.12.0 + version: 2023.10.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.0-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.10.0-pyhca7485f_0.conda hash: - md5: 036539452871d3b0906ff194ad808c9b - sha256: 72c84d372aa5d60eb31c53c108bacefb0c6fb854047441b543738e144f1fae65 + md5: 5b86cf1ceaaa9be2ec4627377e538db1 + sha256: 1bbdfadb93cc768252fd207dca406cde928f9a81ff985ea1760b6539c55923e6 category: main optional: false - name: furo @@ -5822,26 +5819,26 @@ package: category: main optional: false - name: gcsfs - version: 2023.12.0 + version: 2023.10.0 manager: conda platform: linux-64 dependencies: aiohttp: "" decorator: ">4.1.2" - fsspec: 2023.12.0 + fsspec: 2023.10.0 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.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.10.0-pyhd8ed1ab_0.conda hash: - md5: ad178e852250983982f3e2247635029d - sha256: 39dfbcb02360069206835f395cc0f169ead32005ff0c941a73526cdcfc18cd4b + md5: 500521931bdcc0f6d19c1c2e2ab4a5d9 + sha256: dd7559c5297359e475a125742e9cb30938579e93a17ce7537af64a04c98407a5 category: main optional: false - name: gcsfs - version: 2023.12.0 + version: 2023.10.0 manager: conda platform: osx-64 dependencies: @@ -5852,15 +5849,15 @@ package: google-auth: ">=1.2" decorator: ">4.1.2" google-cloud-storage: ">1.40" - fsspec: 2023.12.0 - url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.12.0-pyhd8ed1ab_0.conda + fsspec: 2023.10.0 + url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.10.0-pyhd8ed1ab_0.conda hash: - md5: ad178e852250983982f3e2247635029d - sha256: 39dfbcb02360069206835f395cc0f169ead32005ff0c941a73526cdcfc18cd4b + md5: 500521931bdcc0f6d19c1c2e2ab4a5d9 + sha256: dd7559c5297359e475a125742e9cb30938579e93a17ce7537af64a04c98407a5 category: main optional: false - name: gcsfs - version: 2023.12.0 + version: 2023.10.0 manager: conda platform: osx-arm64 dependencies: @@ -5871,71 +5868,71 @@ package: google-auth: ">=1.2" decorator: ">4.1.2" google-cloud-storage: ">1.40" - fsspec: 2023.12.0 - url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.12.0-pyhd8ed1ab_0.conda + fsspec: 2023.10.0 + url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.10.0-pyhd8ed1ab_0.conda hash: - md5: ad178e852250983982f3e2247635029d - sha256: 39dfbcb02360069206835f395cc0f169ead32005ff0c941a73526cdcfc18cd4b + md5: 500521931bdcc0f6d19c1c2e2ab4a5d9 + sha256: dd7559c5297359e475a125742e9cb30938579e93a17ce7537af64a04c98407a5 category: main optional: false - name: gdal - version: 3.8.1 + version: 3.8.0 manager: conda platform: linux-64 dependencies: hdf5: ">=1.14.2,<1.14.3.0a0" libgcc-ng: ">=12" - libgdal: 3.8.1 + libgdal: 3.8.0 libstdcxx-ng: ">=12" libxml2: ">=2.11.6,<2.12.0a0" numpy: ">=1.23.5,<2.0a0" - openssl: ">=3.2.0,<4.0a0" + openssl: ">=3.1.4,<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.0-py311h815a124_6.conda hash: - md5: 6e9577466e5f1d18bd659746a5d948b7 - sha256: 6f1de976174089589b1ff7a6dd0d627f107f051a15cb046cb4703c0fc18480e3 + md5: a20379b7539caea4fd3ba6628d862138 + sha256: 7aab0e96f76d15a35b78704d13523f234a47cd8c653d8085c1219a8d7d45ef22 category: main optional: false - name: gdal - version: 3.8.1 + version: 3.8.0 manager: conda platform: osx-64 dependencies: __osx: ">=10.9" hdf5: ">=1.14.2,<1.14.3.0a0" libcxx: ">=16.0.6" - libgdal: 3.8.1 + libgdal: 3.8.0 libxml2: ">=2.11.6,<2.12.0a0" numpy: ">=1.23.5,<2.0a0" - openssl: ">=3.2.0,<4.0a0" + openssl: ">=3.1.4,<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.0-py311h5646c56_6.conda hash: - md5: 040c7cfdae3033444b9f193f9ac7dda2 - sha256: dc12757089d571dc33a5be6428bb50374fcfe2839230d8bc2b6aecf019545e64 + md5: 1cb3c8b063c0aca152dd7d7045e8ec2e + sha256: b9428ade4519d84f5ef68174f403cac65ee8d44ba10992809ea54ac56508457b category: main optional: false - name: gdal - version: 3.8.1 + version: 3.8.0 manager: conda platform: osx-arm64 dependencies: __osx: ">=10.9" hdf5: ">=1.14.2,<1.14.3.0a0" libcxx: ">=16.0.6" - libgdal: 3.8.1 + libgdal: 3.8.0 libxml2: ">=2.11.6,<2.12.0a0" numpy: ">=1.23.5,<2.0a0" - openssl: ">=3.2.0,<4.0a0" + openssl: ">=3.1.4,<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.0-py311h32a4f3d_6.conda hash: - md5: 22050ed6dfba916d82f470c4e5c820e9 - sha256: f6f8555e164a37371dc729b9aa0773e60716218ed706cd621b3f5cbfbe2ea51e + md5: b266b8795152cc1dfc9296ac95cb60ad + sha256: f8d113f50e12756c4b6640a8f70b2bccc54cc2e1a29b11f5e3cb3e4671d259be category: main optional: false - name: gdk-pixbuf @@ -8295,78 +8292,78 @@ package: category: main optional: false - name: importlib-metadata - version: 7.0.0 + version: 6.8.0 manager: conda platform: linux-64 dependencies: python: ">=3.8" zipp: ">=0.5" - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-7.0.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.8.0-pyha770c72_0.conda hash: - md5: a941237cd06538837b25cd245fcd25d8 - sha256: 9731e82a00d36b182dc515e31723e711ac82890bb1ca86c6a17a4b471135564f + md5: 4e9f59a060c3be52bc4ddc46ee9b6946 + sha256: 2797ed927d65324309b6c630190d917b9f2111e0c217b721f80429aeb57f9fcf category: main optional: false - name: importlib-metadata - version: 7.0.0 + version: 6.8.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" zipp: ">=0.5" - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-7.0.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.8.0-pyha770c72_0.conda hash: - md5: a941237cd06538837b25cd245fcd25d8 - sha256: 9731e82a00d36b182dc515e31723e711ac82890bb1ca86c6a17a4b471135564f + md5: 4e9f59a060c3be52bc4ddc46ee9b6946 + sha256: 2797ed927d65324309b6c630190d917b9f2111e0c217b721f80429aeb57f9fcf category: main optional: false - name: importlib-metadata - version: 7.0.0 + version: 6.8.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" zipp: ">=0.5" - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-7.0.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.8.0-pyha770c72_0.conda hash: - md5: a941237cd06538837b25cd245fcd25d8 - sha256: 9731e82a00d36b182dc515e31723e711ac82890bb1ca86c6a17a4b471135564f + md5: 4e9f59a060c3be52bc4ddc46ee9b6946 + sha256: 2797ed927d65324309b6c630190d917b9f2111e0c217b721f80429aeb57f9fcf category: main optional: false - name: importlib_metadata - version: 7.0.0 + version: 6.8.0 manager: conda platform: linux-64 dependencies: - importlib-metadata: ">=7.0.0,<7.0.1.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-7.0.0-hd8ed1ab_0.conda + importlib-metadata: ">=6.8.0,<6.8.1.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.8.0-hd8ed1ab_0.conda hash: - md5: 12aff14f84c337be5e5636bf612f4140 - sha256: b9e8ed41df6c55222e3777f422e77a22a6a19ff779b2e65aa8dfdea792c1f7de + md5: b279b07ce18058034e5b3606ba103a8b + sha256: b96e01dc42d547d6d9ceb1c5b52a5232cc04e40153534350f702c3e0418a6b3f category: main optional: false - name: importlib_metadata - version: 7.0.0 + version: 6.8.0 manager: conda platform: osx-64 dependencies: - importlib-metadata: ">=7.0.0,<7.0.1.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-7.0.0-hd8ed1ab_0.conda + importlib-metadata: ">=6.8.0,<6.8.1.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.8.0-hd8ed1ab_0.conda hash: - md5: 12aff14f84c337be5e5636bf612f4140 - sha256: b9e8ed41df6c55222e3777f422e77a22a6a19ff779b2e65aa8dfdea792c1f7de + md5: b279b07ce18058034e5b3606ba103a8b + sha256: b96e01dc42d547d6d9ceb1c5b52a5232cc04e40153534350f702c3e0418a6b3f category: main optional: false - name: importlib_metadata - version: 7.0.0 + version: 6.8.0 manager: conda platform: osx-arm64 dependencies: - importlib-metadata: ">=7.0.0,<7.0.1.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-7.0.0-hd8ed1ab_0.conda + importlib-metadata: ">=6.8.0,<6.8.1.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.8.0-hd8ed1ab_0.conda hash: - md5: 12aff14f84c337be5e5636bf612f4140 - sha256: b9e8ed41df6c55222e3777f422e77a22a6a19ff779b2e65aa8dfdea792c1f7de + md5: b279b07ce18058034e5b3606ba103a8b + sha256: b96e01dc42d547d6d9ceb1c5b52a5232cc04e40153534350f702c3e0418a6b3f category: main optional: false - name: importlib_resources @@ -10276,43 +10273,43 @@ package: category: main optional: false - name: lcms2 - version: "2.16" + version: "2.15" manager: conda platform: linux-64 dependencies: libgcc-ng: ">=12" libjpeg-turbo: ">=3.0.0,<4.0a0" libtiff: ">=4.6.0,<4.7.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.16-hb7c19ff_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.15-hb7c19ff_3.conda hash: - md5: 51bb7010fc86f70eee639b4bb7a894f5 - sha256: 5c878d104b461b7ef922abe6320711c0d01772f4cd55de18b674f88547870041 + md5: e96637dd92c5f340215c753a5c9a22d7 + sha256: cc0b2ddab52b20698b26fe8622ebe37e0d462d8691a1f324e7b00f7d904765e3 category: main optional: false - name: lcms2 - version: "2.16" + version: "2.15" manager: conda platform: osx-64 dependencies: libjpeg-turbo: ">=3.0.0,<4.0a0" libtiff: ">=4.6.0,<4.7.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/lcms2-2.16-ha2f27b4_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/lcms2-2.15-hd6ba6f3_3.conda hash: - md5: 1442db8f03517834843666c422238c9b - sha256: 222ebc0a55544b9922f61e75015d02861e65b48f12113af41d48ba0814e14e4e + md5: 8059507d52f477fbd4b81841e085e25b + sha256: b2234f24e3b0030762430ec3414410119d1129804a95ef65af50ad36cabd9bd5 category: main optional: false - name: lcms2 - version: "2.16" + version: "2.15" manager: conda platform: osx-arm64 dependencies: libjpeg-turbo: ">=3.0.0,<4.0a0" libtiff: ">=4.6.0,<4.7.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/lcms2-2.16-ha0e7c42_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/lcms2-2.15-hf2736f0_3.conda hash: - md5: 66f6c134e76fe13cce8a9ea5814b5dd5 - sha256: 151e0c84feb7e0747fabcc85006b8973b22f5abbc3af76a9add0b0ef0320ebe4 + md5: bbaac531169fed3e09ae31aff80aa069 + sha256: 3d07ba04602617c3084b302c8a6fa30b2e4b20511180f45992b289c312298018 category: main optional: false - name: ld_impl_linux-64 @@ -11505,13 +11502,13 @@ package: category: dev optional: true - name: libgdal - version: 3.8.1 + version: 3.8.0 manager: conda platform: linux-64 dependencies: __glibc: ">=2.17,<3.0.a0" blosc: ">=1.21.5,<2.0a0" - cfitsio: ">=4.3.1,<4.3.2.0a0" + cfitsio: ">=4.3.0,<4.3.1.0a0" freexl: ">=2.0.0,<3.0a0" geos: ">=3.12.1,<3.12.2.0a0" geotiff: ">=1.7.1,<1.8.0a0" @@ -11534,7 +11531,7 @@ package: libpng: ">=1.6.39,<1.7.0a0" libpq: ">=16.1,<17.0a0" libspatialite: ">=5.1.0,<5.2.0a0" - libsqlite: ">=3.44.2,<4.0a0" + libsqlite: ">=3.44.1,<4.0a0" libstdcxx-ng: ">=12" libtiff: ">=4.6.0,<4.7.0a0" libuuid: ">=2.38.1,<3.0a0" @@ -11543,29 +11540,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.2.0,<4.0a0" + openssl: ">=3.1.4,<4.0a0" pcre2: ">=10.42,<10.43.0a0" - poppler: ">=23.12.0,<23.13.0a0" + poppler: ">=23.11.0,<23.12.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.1-hcae7082_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libgdal-3.8.0-he7dcfe9_6.conda hash: - md5: e96d24ccc597439cda2859fe948aac77 - sha256: 9d6a19f03ea1437e951ba5e09c12faf11aa47a375a76f80f9bab1d2c3aed4aa9 + md5: 16ff703a847430fa074c5d53916740c1 + sha256: 06ccb879fc2783c371f1b02d062c4e90dfe4d8c5e9f2f83213bbef0fe27a00b0 category: main optional: false - name: libgdal - version: 3.8.1 + version: 3.8.0 manager: conda platform: osx-64 dependencies: __osx: ">=10.9" blosc: ">=1.21.5,<2.0a0" - cfitsio: ">=4.3.1,<4.3.2.0a0" + cfitsio: ">=4.3.0,<4.3.1.0a0" freexl: ">=2.0.0,<3.0a0" geos: ">=3.12.1,<3.12.2.0a0" geotiff: ">=1.7.1,<1.8.0a0" @@ -11588,36 +11585,36 @@ package: libpng: ">=1.6.39,<1.7.0a0" libpq: ">=16.1,<17.0a0" libspatialite: ">=5.1.0,<5.2.0a0" - libsqlite: ">=3.44.2,<4.0a0" + libsqlite: ">=3.44.1,<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.2.0,<4.0a0" + openssl: ">=3.1.4,<4.0a0" pcre2: ">=10.42,<10.43.0a0" - poppler: ">=23.12.0,<23.13.0a0" + poppler: ">=23.11.0,<23.12.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.1-hb7f764b_1.conda + url: https://conda.anaconda.org/conda-forge/osx-64/libgdal-3.8.0-h5b0c7d5_6.conda hash: - md5: eee8b19233a243e229af4399af2c4a10 - sha256: efe25d85efe856c1db71e2a40ce9736e07cf5c06e53285248866a62a43363a0d + md5: 01e293a419480a02fc7775f6c6afa530 + sha256: fc602de0bb3d5b7c0493b25b1e4345018fd68f26c672c8abff621c492f67abf4 category: main optional: false - name: libgdal - version: 3.8.1 + version: 3.8.0 manager: conda platform: osx-arm64 dependencies: __osx: ">=10.9" blosc: ">=1.21.5,<2.0a0" - cfitsio: ">=4.3.1,<4.3.2.0a0" + cfitsio: ">=4.3.0,<4.3.1.0a0" freexl: ">=2.0.0,<3.0a0" geos: ">=3.12.1,<3.12.2.0a0" geotiff: ">=1.7.1,<1.8.0a0" @@ -11640,26 +11637,26 @@ package: libpng: ">=1.6.39,<1.7.0a0" libpq: ">=16.1,<17.0a0" libspatialite: ">=5.1.0,<5.2.0a0" - libsqlite: ">=3.44.2,<4.0a0" + libsqlite: ">=3.44.1,<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.2.0,<4.0a0" + openssl: ">=3.1.4,<4.0a0" pcre2: ">=10.42,<10.43.0a0" - poppler: ">=23.12.0,<23.13.0a0" + poppler: ">=23.11.0,<23.12.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.1-hac00559_1.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/libgdal-3.8.0-h76f3012_6.conda hash: - md5: a65e999f85ab35663d7e9753ca7eaa13 - sha256: 636ff5b1f95edc083dc7b3ba9f35a87fe18695349b1bd57ae72c54d00ef5034e + md5: c7efc96733da609c84411293fa3a8457 + sha256: 34d8f93a03a58396074dbbcc832a0c84bb6192d9e0ddf70992c4fa40349366c5 category: main optional: false - name: libgfortran @@ -12438,11 +12435,11 @@ package: krb5: ">=1.21.2,<1.22.0a0" libgcc-ng: ">=12" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.2.0,<4.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/libpq-16.1-hfc447b1_2.conda + openssl: ">=3.1.4,<3.2.0a0" + url: https://conda.anaconda.org/conda-forge/linux-64/libpq-16.1-hfc447b1_0.conda hash: - md5: 3cfa1ceef6936e656677ba59480106ce - sha256: 6ce23d046522c39cda5c25e47d303b39f8b31a2aac2c59ea3e41710a072ff0bf + md5: 2b7f1893cf40b4ccdc0230bcd94d5ed9 + sha256: 8c92a8cce329a83cc9e94b19d18200c661957c00cfb464f26237d24730864585 category: main optional: false - name: libpq @@ -12452,11 +12449,11 @@ package: dependencies: krb5: ">=1.21.2,<1.22.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.2.0,<4.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/libpq-16.1-h6dd4ff7_2.conda + openssl: ">=3.1.4,<3.2.0a0" + url: https://conda.anaconda.org/conda-forge/osx-64/libpq-16.1-h6dd4ff7_0.conda hash: - md5: 7aa484702ee6f49c7a728b578a544b27 - sha256: 13011b0b9b31771197155d3547dcdf2c5f8f8a91f86f2b4d45fbf8a4d6f53d0a + md5: 39de94ff4ccc306f3d24ef7aef13c689 + sha256: 1a51c9b3451eebf04ac1f7a7a58fec07c2e44d2298514a30f62b5b432a653c07 category: main optional: false - name: libpq @@ -12466,11 +12463,11 @@ package: dependencies: krb5: ">=1.21.2,<1.22.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.2.0,<4.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/libpq-16.1-hd435d45_2.conda + openssl: ">=3.1.4,<3.2.0a0" + url: https://conda.anaconda.org/conda-forge/osx-arm64/libpq-16.1-hd435d45_0.conda hash: - md5: b4d4402f19365ed54ad529e09bfa7cdb - sha256: 50e96d4014b59ef337a74322be4394e27e6be65c3c5356b98ee0be1f6f4086a1 + md5: 883bbf64780c91608f1a7df9203b79a5 + sha256: 1b5c86d5f247b3e154ae373dcebea6979368c4a0ee722d39ec33ee2fc8528c04 category: main optional: false - name: libprotobuf @@ -15316,40 +15313,40 @@ package: category: main optional: false - name: openssl - version: 3.2.0 + version: 3.1.4 manager: conda platform: linux-64 dependencies: ca-certificates: "" libgcc-ng: ">=12" - url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.2.0-hd590300_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.4-hd590300_0.conda hash: - md5: 603827b39ea2b835268adb8c821b8570 - sha256: 80efc6f429bd8e622d999652e5cba2ca56fcdb9c16a439d2ce9b4313116e4a87 + md5: 412ba6938c3e2abaca8b1129ea82e238 + sha256: d15b3e83ce66c6f6fbb4707f2f5c53337124c01fb03bfda1cf25c5b41123efc7 category: main optional: false - name: openssl - version: 3.2.0 + version: 3.1.4 manager: conda platform: osx-64 dependencies: ca-certificates: "" - url: https://conda.anaconda.org/conda-forge/osx-64/openssl-3.2.0-hd75f5a5_1.conda + url: https://conda.anaconda.org/conda-forge/osx-64/openssl-3.1.4-hd75f5a5_0.conda hash: - md5: 06cb561619487c88891839b9beb5244c - sha256: 99161bf349f5dc80322f2a2c188588d11efa662566e4e19f2ac0a36d9fa3de25 + md5: bc9201da6eb1e0df4107901df5371347 + sha256: 1c436103a8de0dc82c9c56974badaa1b8b8f8cd9f37c2766bd50cd9899720f6b category: main optional: false - name: openssl - version: 3.2.0 + version: 3.1.4 manager: conda platform: osx-arm64 dependencies: ca-certificates: "" - url: https://conda.anaconda.org/conda-forge/osx-arm64/openssl-3.2.0-h0d3ecfb_1.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/openssl-3.1.4-h0d3ecfb_0.conda hash: - md5: 47d16d26100f19ca495882882b7bc93b - sha256: a53e1c6c058b621fd1d13cca6f9cccd534d2b3f4b4ac789fe26f7902031d6c41 + md5: 5a89552fececf4cd99628318ccbb67a3 + sha256: 3c715b1d4940c7ad6065935db18924b85a54048dde066f963cfc250340639457 category: main optional: false - name: orc @@ -16415,7 +16412,7 @@ package: category: main optional: false - name: poppler - version: 23.12.0 + version: 23.11.0 manager: conda platform: linux-64 dependencies: @@ -16426,7 +16423,7 @@ package: lcms2: ">=2.15,<3.0a0" libcurl: ">=8.4.0,<9.0a0" libgcc-ng: ">=12" - libglib: ">=2.78.1,<3.0a0" + libglib: ">=2.78.0,<3.0a0" libiconv: ">=1.17,<2.0a0" libjpeg-turbo: ">=3.0.0,<4.0a0" libpng: ">=1.6.39,<1.7.0a0" @@ -16434,17 +16431,17 @@ package: libtiff: ">=4.6.0,<4.7.0a0" libzlib: ">=1.2.13,<1.3.0a0" nspr: ">=4.35,<5.0a0" - nss: ">=3.95,<4.0a0" + nss: ">=3.94,<4.0a0" openjpeg: ">=2.5.0,<3.0a0" poppler-data: "" - url: https://conda.anaconda.org/conda-forge/linux-64/poppler-23.12.0-h590f24d_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/poppler-23.11.0-h590f24d_0.conda hash: - md5: 480189ac126a8c6c61e14476c8ba7c9a - sha256: b313920277aca763b590dddf806c56b0aadcdff82f5ace39827cab4792ae4b20 + md5: 671439d8eca2084bb5a75561fff23a85 + sha256: 8050002e01be124efcb82e32e740676f5ed7dfe852f335408554e6dc3b060ad9 category: main optional: false - name: poppler - version: 23.12.0 + version: 23.11.0 manager: conda platform: osx-64 dependencies: @@ -16457,24 +16454,24 @@ package: lcms2: ">=2.15,<3.0a0" libcurl: ">=8.4.0,<9.0a0" libcxx: ">=16.0.6" - libglib: ">=2.78.1,<3.0a0" + libglib: ">=2.78.0,<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.95,<4.0a0" + nss: ">=3.94,<4.0a0" openjpeg: ">=2.5.0,<3.0a0" poppler-data: "" - url: https://conda.anaconda.org/conda-forge/osx-64/poppler-23.12.0-hdd5a5e8_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/poppler-23.11.0-hdd5a5e8_0.conda hash: - md5: e1cb9f8e9e21dfa600b08be85d905e5f - sha256: 1271e3c8163125fc1ff14833ddba3f2c6465df5b1d13db76912415bd5a39b492 + md5: 60ffe2d3a09ff99eb2601487d6ddaeea + sha256: fb6a53ddac3fa8c097b4a0b7d2f40219b13bfa3324147aaf6c5a14ee5fb27521 category: main optional: false - name: poppler - version: 23.12.0 + version: 23.11.0 manager: conda platform: osx-arm64 dependencies: @@ -16487,20 +16484,20 @@ package: lcms2: ">=2.15,<3.0a0" libcurl: ">=8.4.0,<9.0a0" libcxx: ">=16.0.6" - libglib: ">=2.78.1,<3.0a0" + libglib: ">=2.78.0,<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.95,<4.0a0" + nss: ">=3.94,<4.0a0" openjpeg: ">=2.5.0,<3.0a0" poppler-data: "" - url: https://conda.anaconda.org/conda-forge/osx-arm64/poppler-23.12.0-hcdd998b_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/poppler-23.11.0-hcdd998b_0.conda hash: - md5: e072f524004eee193e30d243d68c520f - sha256: 13ebaac3bf9b77e92e777d3ed245c2f0a8ac93985e334b0cd797a39f321ae5dd + md5: 19386a03a7c57a378953bafb4f598156 + sha256: a6677b507cbdb6202c872aa461b4bf8cfcbe5791721fe1f42615b89205d4a4a6 category: main optional: false - name: poppler-data @@ -16544,17 +16541,17 @@ package: krb5: ">=1.21.2,<1.22.0a0" libgcc-ng: ">=12" libpq: "16.1" - libxml2: ">=2.11.6,<2.12.0a0" + libxml2: ">=2.11.5,<2.12.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.2.0,<4.0a0" + openssl: ">=3.1.4,<4.0a0" readline: ">=8.2,<9.0a0" tzcode: "" tzdata: "" zlib: "" - url: https://conda.anaconda.org/conda-forge/linux-64/postgresql-16.1-h8972f4a_2.conda + url: https://conda.anaconda.org/conda-forge/linux-64/postgresql-16.1-h8972f4a_0.conda hash: - md5: a175fe7a349a7e4cda81f4d7ae2bc2b2 - sha256: b2c258a78effab00f8db53e5dd04a43baf309c9a3c164c0d6f52de836b3baea5 + md5: 1e9ab0760262044fa00814088667e451 + sha256: 74dfb5793a00a0a9e85296ce0944d8af0f71758574b7c8f9e7d5590250441e24 category: main optional: false - name: postgresql @@ -16564,17 +16561,17 @@ package: dependencies: krb5: ">=1.21.2,<1.22.0a0" libpq: "16.1" - libxml2: ">=2.11.6,<2.12.0a0" + libxml2: ">=2.11.5,<2.12.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.2.0,<4.0a0" + openssl: ">=3.1.4,<4.0a0" readline: ">=8.2,<9.0a0" tzcode: "" tzdata: "" zlib: "" - url: https://conda.anaconda.org/conda-forge/osx-64/postgresql-16.1-h413614c_2.conda + url: https://conda.anaconda.org/conda-forge/osx-64/postgresql-16.1-h413614c_0.conda hash: - md5: ad5e3602657162ddcab580d052df0bd4 - sha256: 47282bff8ca6c64f72276401e8bcfff625cadcdcbfd3804bb08d9dcbe7485907 + md5: b7322d27093606b939fb92fa33b92beb + sha256: 612393024639882d7515429e639c85fa3b712d114c5a6b3a4b3891b061e1bc89 category: main optional: false - name: postgresql @@ -16584,17 +16581,17 @@ package: dependencies: krb5: ">=1.21.2,<1.22.0a0" libpq: "16.1" - libxml2: ">=2.11.6,<2.12.0a0" + libxml2: ">=2.11.5,<2.12.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.2.0,<4.0a0" + openssl: ">=3.1.4,<4.0a0" readline: ">=8.2,<9.0a0" tzcode: "" tzdata: "" zlib: "" - url: https://conda.anaconda.org/conda-forge/osx-arm64/postgresql-16.1-hc6ab77f_2.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/postgresql-16.1-hc6ab77f_0.conda hash: - md5: a2562d92a27e19371e2655fe48e6952f - sha256: a896c5ab8930a4d9f980471b64d6eb254a22c46565ebb777d99e235c8c0fb7f9 + md5: 37398d1ad2fbeaa7733711b845da863e + sha256: 441f5ad3fac42e7daf9c246ad0dc0962c7f0b4c9ac1044038d3a053d339320bf category: main optional: false - name: pre-commit @@ -21170,45 +21167,45 @@ package: category: main optional: false - name: starlette - version: 0.33.0 + version: 0.32.0.post1 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.33.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/starlette-0.32.0.post1-pyhd8ed1ab_0.conda hash: - md5: 55027cf7f50803f0f5ece8b661eff47b - sha256: 3923f4c3e31d8c3a9c574779585137ff834a6108558a8956ef93022d4fcb37a8 + md5: 9aa6d56db739eee2ff473becbe178fd1 + sha256: 9692b83467670b473dc71137376f735249ef2ee6eeefce9068b0dec94810c24c category: dev optional: true - name: starlette - version: 0.33.0 + version: 0.32.0.post1 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.33.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/starlette-0.32.0.post1-pyhd8ed1ab_0.conda hash: - md5: 55027cf7f50803f0f5ece8b661eff47b - sha256: 3923f4c3e31d8c3a9c574779585137ff834a6108558a8956ef93022d4fcb37a8 + md5: 9aa6d56db739eee2ff473becbe178fd1 + sha256: 9692b83467670b473dc71137376f735249ef2ee6eeefce9068b0dec94810c24c category: dev optional: true - name: starlette - version: 0.33.0 + version: 0.32.0.post1 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.33.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/starlette-0.32.0.post1-pyhd8ed1ab_0.conda hash: - md5: 55027cf7f50803f0f5ece8b661eff47b - sha256: 3923f4c3e31d8c3a9c574779585137ff834a6108558a8956ef93022d4fcb37a8 + md5: 9aa6d56db739eee2ff473becbe178fd1 + sha256: 9692b83467670b473dc71137376f735249ef2ee6eeefce9068b0dec94810c24c category: dev optional: true - name: stevedore @@ -22879,7 +22876,7 @@ package: category: main optional: false - name: virtualenv - version: 20.25.0 + version: 20.24.7 manager: conda platform: linux-64 dependencies: @@ -22887,14 +22884,14 @@ package: filelock: <4,>=3.12.2 platformdirs: <5,>=3.9.1 python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.25.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.24.7-pyhd8ed1ab_0.conda hash: - md5: c119653cba436d8183c27bf6d190e587 - sha256: 50827c3721a9dbf973b568709d4381add2a6552fa562f26a385c5edc16a534af + md5: db990278c2c00b268eed778de44f6057 + sha256: ad661ae59c64bd73c25dfadb00c601659f4d9cafbf428e36a690075e52bac96a category: main optional: false - name: virtualenv - version: 20.25.0 + version: 20.24.7 manager: conda platform: osx-64 dependencies: @@ -22902,14 +22899,14 @@ package: distlib: <1,>=0.3.7 filelock: <4,>=3.12.2 platformdirs: <5,>=3.9.1 - url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.25.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.24.7-pyhd8ed1ab_0.conda hash: - md5: c119653cba436d8183c27bf6d190e587 - sha256: 50827c3721a9dbf973b568709d4381add2a6552fa562f26a385c5edc16a534af + md5: db990278c2c00b268eed778de44f6057 + sha256: ad661ae59c64bd73c25dfadb00c601659f4d9cafbf428e36a690075e52bac96a category: main optional: false - name: virtualenv - version: 20.25.0 + version: 20.24.7 manager: conda platform: osx-arm64 dependencies: @@ -22917,10 +22914,10 @@ package: distlib: <1,>=0.3.7 filelock: <4,>=3.12.2 platformdirs: <5,>=3.9.1 - url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.25.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.24.7-pyhd8ed1ab_0.conda hash: - md5: c119653cba436d8183c27bf6d190e587 - sha256: 50827c3721a9dbf973b568709d4381add2a6552fa562f26a385c5edc16a534af + md5: db990278c2c00b268eed778de44f6057 + sha256: ad661ae59c64bd73c25dfadb00c601659f4d9cafbf428e36a690075e52bac96a category: main optional: false - name: watchdog @@ -23117,39 +23114,39 @@ package: category: main optional: false - name: websocket-client - version: 1.7.0 + version: 1.6.4 manager: conda platform: linux-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.7.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.6.4-pyhd8ed1ab_0.conda hash: - md5: 50ad31e07d706aae88b14a4ac9c73f23 - sha256: d9b537d5b7c5aa7a02a4ce4c6b755e458bd8083b67752a73c92d113ccec6c10f + md5: bdb77b28cf16deac0eef431a068320e8 + sha256: df45b89862edcd7cd5180ec7b8c0c0ca9fb4d3f7d49ddafccdc76afcf50d8da6 category: main optional: false - name: websocket-client - version: 1.7.0 + version: 1.6.4 manager: conda platform: osx-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.7.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.6.4-pyhd8ed1ab_0.conda hash: - md5: 50ad31e07d706aae88b14a4ac9c73f23 - sha256: d9b537d5b7c5aa7a02a4ce4c6b755e458bd8083b67752a73c92d113ccec6c10f + md5: bdb77b28cf16deac0eef431a068320e8 + sha256: df45b89862edcd7cd5180ec7b8c0c0ca9fb4d3f7d49ddafccdc76afcf50d8da6 category: main optional: false - name: websocket-client - version: 1.7.0 + version: 1.6.4 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.7.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.6.4-pyhd8ed1ab_0.conda hash: - md5: 50ad31e07d706aae88b14a4ac9c73f23 - sha256: d9b537d5b7c5aa7a02a4ce4c6b755e458bd8083b67752a73c92d113ccec6c10f + md5: bdb77b28cf16deac0eef431a068320e8 + sha256: df45b89862edcd7cd5180ec7b8c0c0ca9fb4d3f7d49ddafccdc76afcf50d8da6 category: main optional: false - name: websockets diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index da2a4d0732..12d78b1972 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -70,7 +70,7 @@ dependencies: - lz4-c=1.9.4=hf0c8a7f_0 - ncurses=6.4=h93d8f39_2 - nspr=4.35=hea0b92c_0 - - openssl=3.2.0=hd75f5a5_1 + - openssl=3.1.4=hd75f5a5_0 - pandoc=3.1.3=h9d075a6_0 - pcre2=10.42=h0ad2156_0 - pixman=0.42.2=he965462_0 @@ -114,7 +114,7 @@ dependencies: - gdk-pixbuf=2.42.10=hbb5a27d_4 - gts=0.7.6=h53e17e3_4 - krb5=1.21.2=hb884880_0 - - lcms2=2.16=ha2f27b4_0 + - lcms2=2.15=hd6ba6f3_3 - libopenblas=0.3.25=openmp_hfef2a42_0 - libthrift=0.19.0=h064b379_1 - libwebp=1.3.2=h44782d1_1 @@ -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.9=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - debugpy=1.8.0=py311hdf8f085_1 - decorator=5.1.1=pyhd8ed1ab_0 @@ -167,7 +167,7 @@ dependencies: - executing=2.0.1=pyhd8ed1ab_0 - filelock=3.13.1=pyhd8ed1ab_0 - frozenlist=1.4.0=py311h2725bcf_1 - - fsspec=2023.12.0=pyhca7485f_0 + - fsspec=2023.10.0=pyhca7485f_0 - google-cloud-sdk=455.0.0=py311h6eed73b_0 - greenlet=3.0.1=py311hd39e593_0 - hpack=4.0.0=pyh9f0ad1d_0 @@ -190,7 +190,7 @@ dependencies: - libcurl=8.4.0=h726d00d_0 - libgd=2.3.3=h0dceb68_9 - libgrpc=1.59.2=ha7f534c_0 - - libpq=16.1=h6dd4ff7_2 + - libpq=16.1=h6dd4ff7_0 - llvmlite=0.41.1=py311hb5c2e0a_0 - locket=1.0.0=pyhd8ed1ab_0 - lxml=4.9.3=py311h19a211c_1 @@ -279,7 +279,7 @@ dependencies: - wcwidth=0.2.12=pyhd8ed1ab_0 - webcolors=1.13=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_2 - - websocket-client=1.7.0=pyhd8ed1ab_0 + - websocket-client=1.6.4=pyhd8ed1ab_0 - websockets=10.4=py311h5547dcb_1 - wheel=0.42.0=pyhd8ed1ab_0 - widgetsnbextension=4.0.9=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.1=h60fb419_0 + - cfitsio=4.3.0=h66f91ea_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 @@ -310,7 +310,7 @@ dependencies: - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311h2725bcf_0 - curl=8.4.0=h726d00d_0 - - fonttools=4.46.0=py311he705e18_0 + - fonttools=4.45.1=py311he705e18_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 - grpcio=1.59.2=py311hfd95bfa_0 @@ -320,7 +320,7 @@ dependencies: - hdf5=1.14.2=nompi_hedada53_100 - html5lib=1.1=pyh9f0ad1d_0 - hypothesis=6.91.0=pyha770c72_0 - - importlib-metadata=7.0.0=pyha770c72_0 + - importlib-metadata=6.8.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 - janus=1.0.0=pyhd8ed1ab_0 @@ -345,8 +345,8 @@ dependencies: - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - platformdirs=4.0.0=pyhd8ed1ab_0 - - poppler=23.12.0=hdd5a5e8_0 - - postgresql=16.1=h413614c_2 + - poppler=23.11.0=hdd5a5e8_0 + - postgresql=16.1=h413614c_0 - proj=9.3.0=h23b96cc_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h021eaf5_0 @@ -381,10 +381,10 @@ 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.6=pyhd8ed1ab_0 + - botocore=1.33.5=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - - cryptography=41.0.7=py311h48c7838_1 + - cryptography=41.0.5=py311hd51016d_0 - fqdn=1.5.1=pyhd8ed1ab_0 - geotiff=1.7.1=h889ec99_14 - gitpython=3.1.40=pyhd8ed1ab_0 @@ -394,7 +394,7 @@ dependencies: - graphql-relay=3.2.0=pyhd8ed1ab_0 - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - httpcore=1.0.2=pyhd8ed1ab_0 - - importlib_metadata=7.0.0=hd8ed1ab_0 + - importlib_metadata=6.8.0=hd8ed1ab_0 - jsonschema-specifications=2023.11.2=pyhd8ed1ab_0 - jupyter_core=5.5.0=py311h6eed73b_0 - jupyter_server_terminals=0.4.4=pyhd8ed1ab_1 @@ -421,24 +421,24 @@ dependencies: - rich=13.7.0=pyhd8ed1ab_0 - sqlalchemy=2.0.23=py311he705e18_0 - stack_data=0.6.2=pyhd8ed1ab_0 - - starlette=0.33.0=pyhd8ed1ab_0 + - starlette=0.32.0.post1=pyhd8ed1ab_0 - tiledb=2.16.3=hd3a41d5_3 - ukkonen=1.0.1=py311h5fe6e05_4 - uvicorn=0.24.0.post1=py311h6eed73b_0 - - virtualenv=20.25.0=pyhd8ed1ab_0 + - virtualenv=20.24.7=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h5e0f0e4_0 - aiohttp=3.8.6=py311he705e18_1 - - alembic=1.13.0=pyhd8ed1ab_0 + - alembic=1.12.1=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 - cachecontrol=0.13.1=pyhd8ed1ab_0 - contourpy=1.2.0=py311h7bea37d_0 - - dask-core=2023.12.0=pyhd8ed1ab_0 + - dask-core=2023.11.0=pyhd8ed1ab_0 - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - - folium=0.15.1=pyhd8ed1ab_0 + - folium=0.15.0=pyhd8ed1ab_0 - google-resumable-media=2.6.0=pyhd8ed1ab_0 - graphene=3.3=pyhd8ed1ab_0 - grpcio-status=1.59.2=pyhd8ed1ab_0 @@ -451,7 +451,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.0=h5b0c7d5_6 - librsvg=2.56.3=hec3db73_0 - numba=0.58.1=py311h32f2313_0 - numexpr=2.8.7=py311h1eadf79_4 @@ -471,14 +471,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.6=pyhd8ed1ab_0 + - boto3=1.33.5=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - - dagster=1.5.10=pyhd8ed1ab_0 + - dagster=1.5.9=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.0=py311h5646c56_6 - geopandas-base=0.14.1=pyha770c72_0 - google-auth=2.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 @@ -497,8 +497,8 @@ dependencies: - timezonefinder=6.2.0=py311he705e18_2 - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.10=pyhd8ed1ab_0 - - dagster-postgres=0.21.10=pyhd8ed1ab_0 + - dagster-graphql=1.5.9=pyhd8ed1ab_0 + - dagster-postgres=0.21.9=pyhd8ed1ab_1 - 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.10=pyhd8ed1ab_0 + - dagster-webserver=1.5.9=pyhd8ed1ab_0 - geopandas=0.14.1=pyhd8ed1ab_0 - google-cloud-core=2.3.3=pyhd8ed1ab_0 - libarrow-dataset=14.0.1=hc222712_3_cpu @@ -526,7 +526,7 @@ dependencies: - jupyter_server=2.11.1=pyhd8ed1ab_0 - libarrow-substrait=14.0.1=h2cc6c1c_3_cpu - nbconvert-pandoc=7.11.0=pyhd8ed1ab_0 - - gcsfs=2023.12.0=pyhd8ed1ab_0 + - gcsfs=2023.10.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 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 631841e00f..4cd3f6d3c9 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -71,7 +71,7 @@ dependencies: - lz4-c=1.9.4=hb7217d7_0 - ncurses=6.4=h463b476_2 - nspr=4.35=hb7217d7_0 - - openssl=3.2.0=h0d3ecfb_1 + - openssl=3.1.4=h0d3ecfb_0 - pcre2=10.42=h26f9a81_0 - pixman=0.42.2=h13dd4ca_0 - snappy=1.1.10=h17c5cce_0 @@ -114,7 +114,7 @@ dependencies: - gdk-pixbuf=2.42.10=h15fa40c_4 - gts=0.7.6=he42f4ea_4 - krb5=1.21.2=h92f50d5_0 - - lcms2=2.16=ha0e7c42_0 + - lcms2=2.15=hf2736f0_3 - libopenblas=0.3.25=openmp_h6c19121_0 - libthrift=0.19.0=h026a170_1 - libwebp=1.3.2=hf30222e_1 @@ -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.9=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - debugpy=1.8.0=py311ha891d26_1 - decorator=5.1.1=pyhd8ed1ab_0 @@ -167,7 +167,7 @@ dependencies: - executing=2.0.1=pyhd8ed1ab_0 - filelock=3.13.1=pyhd8ed1ab_0 - frozenlist=1.4.0=py311heffc1b2_1 - - fsspec=2023.12.0=pyhca7485f_0 + - fsspec=2023.10.0=pyhca7485f_0 - google-cloud-sdk=455.0.0=py311h267d04e_0 - greenlet=3.0.1=py311hbaf5611_0 - hpack=4.0.0=pyh9f0ad1d_0 @@ -190,7 +190,7 @@ dependencies: - libcurl=8.4.0=h2d989ff_0 - libgd=2.3.3=hfdf3952_9 - libgrpc=1.59.2=hbcf6334_0 - - libpq=16.1=hd435d45_2 + - libpq=16.1=hd435d45_0 - llvmlite=0.41.1=py311hf5d242d_0 - locket=1.0.0=pyhd8ed1ab_0 - lxml=4.9.3=py311hbafe683_1 @@ -279,7 +279,7 @@ dependencies: - wcwidth=0.2.12=pyhd8ed1ab_0 - webcolors=1.13=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_2 - - websocket-client=1.7.0=pyhd8ed1ab_0 + - websocket-client=1.6.4=pyhd8ed1ab_0 - websockets=10.4=py311he2be06e_1 - wheel=0.42.0=pyhd8ed1ab_0 - widgetsnbextension=4.0.9=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.1=h808cd33_0 + - cfitsio=4.3.0=hca87796_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 @@ -310,7 +310,7 @@ dependencies: - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311heffc1b2_0 - curl=8.4.0=h2d989ff_0 - - fonttools=4.46.0=py311h05b510d_0 + - fonttools=4.45.1=py311h05b510d_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 - grpcio=1.59.2=py311h79dd126_0 @@ -320,7 +320,7 @@ dependencies: - hdf5=1.14.2=nompi_h3aba7b3_100 - html5lib=1.1=pyh9f0ad1d_0 - hypothesis=6.91.0=pyha770c72_0 - - importlib-metadata=7.0.0=pyha770c72_0 + - importlib-metadata=6.8.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 - janus=1.0.0=pyhd8ed1ab_0 @@ -345,8 +345,8 @@ dependencies: - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - platformdirs=4.0.0=pyhd8ed1ab_0 - - poppler=23.12.0=hcdd998b_0 - - postgresql=16.1=hc6ab77f_2 + - poppler=23.11.0=hcdd998b_0 + - postgresql=16.1=hc6ab77f_0 - proj=9.3.0=h52fb9d0_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h4d1eceb_0 @@ -381,10 +381,10 @@ 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.6=pyhd8ed1ab_0 + - botocore=1.33.5=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - - cryptography=41.0.7=py311h08c85a6_1 + - cryptography=41.0.5=py311h71175c2_0 - fqdn=1.5.1=pyhd8ed1ab_0 - geotiff=1.7.1=h71398c0_14 - gitpython=3.1.40=pyhd8ed1ab_0 @@ -394,7 +394,7 @@ dependencies: - graphql-relay=3.2.0=pyhd8ed1ab_0 - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - httpcore=1.0.2=pyhd8ed1ab_0 - - importlib_metadata=7.0.0=hd8ed1ab_0 + - importlib_metadata=6.8.0=hd8ed1ab_0 - jsonschema-specifications=2023.11.2=pyhd8ed1ab_0 - jupyter_core=5.5.0=py311h267d04e_0 - jupyter_server_terminals=0.4.4=pyhd8ed1ab_1 @@ -421,24 +421,24 @@ dependencies: - rich=13.7.0=pyhd8ed1ab_0 - sqlalchemy=2.0.23=py311h05b510d_0 - stack_data=0.6.2=pyhd8ed1ab_0 - - starlette=0.33.0=pyhd8ed1ab_0 + - starlette=0.32.0.post1=pyhd8ed1ab_0 - tiledb=2.16.3=he15c4da_3 - ukkonen=1.0.1=py311he4fd1f5_4 - uvicorn=0.24.0.post1=py311h267d04e_0 - - virtualenv=20.25.0=pyhd8ed1ab_0 + - virtualenv=20.24.7=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h94f323b_0 - aiohttp=3.8.6=py311h05b510d_1 - - alembic=1.13.0=pyhd8ed1ab_0 + - alembic=1.12.1=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 - cachecontrol=0.13.1=pyhd8ed1ab_0 - contourpy=1.2.0=py311hd03642b_0 - - dask-core=2023.12.0=pyhd8ed1ab_0 + - dask-core=2023.11.0=pyhd8ed1ab_0 - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - - folium=0.15.1=pyhd8ed1ab_0 + - folium=0.15.0=pyhd8ed1ab_0 - google-resumable-media=2.6.0=pyhd8ed1ab_0 - graphene=3.3=pyhd8ed1ab_0 - grpcio-status=1.59.2=pyhd8ed1ab_0 @@ -451,7 +451,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.0=h76f3012_6 - librsvg=2.56.3=h0db3404_0 - numba=0.58.1=py311h9ec4793_0 - numexpr=2.8.7=py311h6e08293_4 @@ -471,14 +471,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.6=pyhd8ed1ab_0 + - boto3=1.33.5=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - - dagster=1.5.10=pyhd8ed1ab_0 + - dagster=1.5.9=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.0=py311h32a4f3d_6 - geopandas-base=0.14.1=pyha770c72_0 - google-auth=2.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 @@ -497,8 +497,8 @@ dependencies: - timezonefinder=6.2.0=py311h05b510d_2 - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.10=pyhd8ed1ab_0 - - dagster-postgres=0.21.10=pyhd8ed1ab_0 + - dagster-graphql=1.5.9=pyhd8ed1ab_0 + - dagster-postgres=0.21.9=pyhd8ed1ab_1 - 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.10=pyhd8ed1ab_0 + - dagster-webserver=1.5.9=pyhd8ed1ab_0 - geopandas=0.14.1=pyhd8ed1ab_0 - google-cloud-core=2.3.3=pyhd8ed1ab_0 - libarrow-dataset=14.0.1=had9dd58_3_cpu @@ -526,7 +526,7 @@ dependencies: - jupyter_server=2.11.1=pyhd8ed1ab_0 - libarrow-substrait=14.0.1=h594d712_3_cpu - nbconvert-pandoc=7.11.0=pyhd8ed1ab_0 - - gcsfs=2023.12.0=pyhd8ed1ab_0 + - gcsfs=2023.10.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 From e03c9d246ea83c3c9f2511f5b8ff63fce27df614 Mon Sep 17 00:00:00 2001 From: bendnorman Date: Tue, 5 Dec 2023 01:07:02 +0000 Subject: [PATCH 40/47] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 70 +- environments/conda-lock.yml | 974 +++++++++++++------------- environments/conda-osx-64.lock.yml | 70 +- environments/conda-osx-arm64.lock.yml | 70 +- 4 files changed, 592 insertions(+), 592 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index 3d6da6f452..2eec140474 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -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 @@ -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 @@ -178,7 +178,7 @@ dependencies: - fontconfig=2.14.2=h14ed4e7_0 - freexl=2.0.0=h743c826_0 - frozenlist=1.4.0=py311h459d7ec_1 - - fsspec=2023.10.0=pyhca7485f_0 + - fsspec=2023.12.0=pyhca7485f_0 - gdk-pixbuf=2.42.10=h829c605_4 - google-cloud-sdk=455.0.0=py311h38be061_0 - greenlet=3.0.1=py311hb755f60_0 @@ -200,11 +200,11 @@ dependencies: - jsonpointer=2.4=py311h38be061_3 - jupyterlab_widgets=3.0.9=pyhd8ed1ab_0 - kiwisolver=1.4.5=py311h9547e67_1 - - lcms2=2.15=hb7c19ff_3 + - lcms2=2.16=hb7c19ff_0 - libblas=3.9.0=20_linux64_openblas - libcurl=8.4.0=hca28451_0 - libgrpc=1.59.2=hd6c4280_0 - - libpq=16.1=hfc447b1_0 + - libpq=16.1=hfc447b1_2 - libwebp=1.3.2=h658648e_1 - llvmlite=0.41.1=py311ha6695c7_0 - locket=1.0.0=pyhd8ed1ab_0 @@ -232,6 +232,7 @@ dependencies: - pickleshare=0.7.5=py_1003 - pkginfo=1.9.6=pyhd8ed1ab_0 - 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 - prometheus_client=0.19.0=pyhd8ed1ab_0 @@ -296,7 +297,7 @@ dependencies: - wcwidth=0.2.12=pyhd8ed1ab_0 - webcolors=1.13=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_2 - - websocket-client=1.6.4=pyhd8ed1ab_0 + - websocket-client=1.7.0=pyhd8ed1ab_0 - websockets=10.4=py311hd4cff14_1 - wheel=0.42.0=pyhd8ed1ab_0 - widgetsnbextension=4.0.9=pyhd8ed1ab_0 @@ -321,7 +322,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 @@ -331,7 +332,7 @@ dependencies: - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311h459d7ec_0 - curl=8.4.0=hca28451_0 - - fonttools=4.45.1=py311h459d7ec_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 @@ -340,7 +341,7 @@ dependencies: - hdf5=1.14.2=nompi_h4f84152_100 - html5lib=1.1=pyh9f0ad1d_0 - hypothesis=6.91.0=pyha770c72_0 - - importlib-metadata=6.8.0=pyha770c72_0 + - importlib-metadata=7.0.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 - janus=1.0.0=pyhd8ed1ab_0 @@ -349,6 +350,7 @@ dependencies: - jinja2=3.1.2=pyhd8ed1ab_1 - joblib=1.3.2=pyhd8ed1ab_0 - jsonlines=4.0.0=pyhd8ed1ab_0 + - jupyter_core=5.5.0=py311h38be061_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - libcblas=3.9.0=20_linux64_openblas @@ -366,8 +368,7 @@ dependencies: - pillow=10.1.0=py311ha6c5da5_0 - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - - platformdirs=4.0.0=pyhd8ed1ab_0 - - postgresql=16.1=h8972f4a_0 + - postgresql=16.1=h8972f4a_2 - proj=9.3.0=h1d62c97_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h46cbc50_0 @@ -391,6 +392,7 @@ dependencies: - typing_inspect=0.9.0=pyhd8ed1ab_0 - universal_pathlib=0.1.4=pyhd8ed1ab_0 - urllib3=1.26.18=pyhd8ed1ab_0 + - virtualenv=20.25.0=pyhd8ed1ab_0 - watchdog=3.0.0=py311h38be061_1 - xerces-c=3.2.4=hac6953d_3 - yarl=1.9.3=py311h459d7ec_0 @@ -401,10 +403,10 @@ 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.5=pyhd8ed1ab_0 + - botocore=1.33.6=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - - cryptography=41.0.5=py311h63ff55d_0 + - cryptography=41.0.7=py311hcb13ee4_1 - fqdn=1.5.1=pyhd8ed1ab_0 - geotiff=1.7.1=hf074850_14 - gitpython=3.1.40=pyhd8ed1ab_0 @@ -415,9 +417,8 @@ dependencies: - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - harfbuzz=8.3.0=h3d44ed6_0 - httpcore=1.0.2=pyhd8ed1ab_0 - - importlib_metadata=6.8.0=hd8ed1ab_0 + - importlib_metadata=7.0.0=hd8ed1ab_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 - libnetcdf=4.9.2=nompi_h80fb2b6_112 @@ -426,7 +427,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.7=pyhd8ed1ab_1 - pybtex=0.24.0=pyhd8ed1ab_2 @@ -441,35 +442,34 @@ 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.post1=py311h38be061_0 - - virtualenv=20.24.7=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h46250e7_0 - aiohttp=3.8.6=py311h459d7ec_1 - - alembic=1.12.1=pyhd8ed1ab_0 - - arelle-release=2.17.7=pyhd8ed1ab_0 + - alembic=1.13.0=pyhd8ed1ab_0 + - arelle-release=2.18.0=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - aws-crt-cpp=0.24.7=h97e63c7_6 - bottleneck=1.3.7=py311h1f0f07a_1 - cachecontrol=0.13.1=pyhd8ed1ab_0 - contourpy=1.2.0=py311h9547e67_0 - - dask-core=2023.11.0=pyhd8ed1ab_0 + - dask-core=2023.12.0=pyhd8ed1ab_0 - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - - folium=0.15.0=pyhd8ed1ab_0 + - folium=0.15.1=pyhd8ed1ab_0 - google-resumable-media=2.6.0=pyhd8ed1ab_0 - graphene=3.3=pyhd8ed1ab_0 - grpcio-status=1.59.2=pyhd8ed1ab_0 - h3-py=3.7.6=py311hb755f60_1 - httpx=0.25.2=pyhd8ed1ab_0 - identify=2.5.32=pyhd8ed1ab_0 - - ipython=8.18.1=pyh31011fe_1 + - ipython=8.18.1=pyh31011fe_2 - 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 @@ -490,14 +490,14 @@ 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.5=pyhd8ed1ab_0 + - boto3=1.33.6=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 + - gdal=3.8.1=py311h815a124_1 - geopandas-base=0.14.1=pyha770c72_0 - google-auth=2.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 @@ -517,8 +517,8 @@ dependencies: - timezonefinder=6.2.0=py311h459d7ec_2 - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.9=pyhd8ed1ab_0 - - dagster-postgres=0.21.9=pyhd8ed1ab_1 + - 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,28 +531,28 @@ 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 - libarrow-flight=14.0.1=h120cb0d_3_cpu - libarrow-gandiva=14.0.1=hacb8726_3_cpu - libparquet=14.0.1=h352af49_3_cpu - - nbconvert-core=7.11.0=pyhd8ed1ab_0 + - nbconvert-core=7.12.0=pyhd8ed1ab_0 - 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 - - jupyter_server=2.11.1=pyhd8ed1ab_0 + - jupyter_server=2.11.2=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 + - nbconvert-pandoc=7.12.0=pyhd8ed1ab_0 + - gcsfs=2023.12.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 - - nbconvert=7.11.0=pyhd8ed1ab_0 + - nbconvert=7.12.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - jupyterlab=4.0.9=pyhd8ed1ab_0 - pyarrow=14.0.1=py311h39c9aba_3_cpu diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 148e867498..4baf150d36 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -266,7 +266,7 @@ package: category: main optional: false - name: alembic - version: 1.12.1 + version: 1.13.0 manager: conda platform: linux-64 dependencies: @@ -276,14 +276,14 @@ package: python: ">=3.7" sqlalchemy: ">=1.3.0" typing-extensions: ">=4" - url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.12.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.13.0-pyhd8ed1ab_0.conda hash: - md5: 15de9992b4096a2a6656ca202fde6e4c - sha256: 24019b1af4777e32843b230dd7a9bf7082943eb21bba03379ceed0bda50facf9 + md5: 7f0372c1cfa41891787ddf267334c0c7 + sha256: d6dd010632bc5272fe7e51646651c5fb9ae9b7663113b94aa585d6bcb43834b0 category: main optional: false - name: alembic - version: 1.12.1 + version: 1.13.0 manager: conda platform: osx-64 dependencies: @@ -293,14 +293,14 @@ package: python: ">=3.7" sqlalchemy: ">=1.3.0" typing-extensions: ">=4" - url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.12.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.13.0-pyhd8ed1ab_0.conda hash: - md5: 15de9992b4096a2a6656ca202fde6e4c - sha256: 24019b1af4777e32843b230dd7a9bf7082943eb21bba03379ceed0bda50facf9 + md5: 7f0372c1cfa41891787ddf267334c0c7 + sha256: d6dd010632bc5272fe7e51646651c5fb9ae9b7663113b94aa585d6bcb43834b0 category: main optional: false - name: alembic - version: 1.12.1 + version: 1.13.0 manager: conda platform: osx-arm64 dependencies: @@ -310,10 +310,10 @@ package: python: ">=3.7" sqlalchemy: ">=1.3.0" typing-extensions: ">=4" - url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.12.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.13.0-pyhd8ed1ab_0.conda hash: - md5: 15de9992b4096a2a6656ca202fde6e4c - sha256: 24019b1af4777e32843b230dd7a9bf7082943eb21bba03379ceed0bda50facf9 + md5: 7f0372c1cfa41891787ddf267334c0c7 + sha256: d6dd010632bc5272fe7e51646651c5fb9ae9b7663113b94aa585d6bcb43834b0 category: main optional: false - name: aniso8601 @@ -536,7 +536,7 @@ package: category: main optional: false - name: arelle-release - version: 2.17.7 + version: 2.18.0 manager: conda platform: linux-64 dependencies: @@ -549,50 +549,50 @@ package: python: ">=3.8" python-dateutil: 2.* regex: "" - url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.17.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.18.0-pyhd8ed1ab_0.conda hash: - md5: b42bbf2e318b6bbbd9de2d81ecf8ed50 - sha256: 3094446e601ad9160677c2bb5b75b9946c81b679bebf42bf52c126e71d76fb43 + md5: cf492dd79a1d1d1ef2af299da2a604ca + sha256: f3fa253f2a26faa56348acc2a76eaf55778f871b995af429c9636d9159a4b483 category: main optional: false - name: arelle-release - version: 2.17.7 + version: 2.18.0 manager: conda platform: osx-64 dependencies: certifi: "" regex: "" python: ">=3.8" - numpy: 1.* python-dateutil: 2.* + numpy: 1.* isodate: 0.* lxml: 4.* openpyxl: 3.* pyparsing: 3.* - url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.17.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.18.0-pyhd8ed1ab_0.conda hash: - md5: b42bbf2e318b6bbbd9de2d81ecf8ed50 - sha256: 3094446e601ad9160677c2bb5b75b9946c81b679bebf42bf52c126e71d76fb43 + md5: cf492dd79a1d1d1ef2af299da2a604ca + sha256: f3fa253f2a26faa56348acc2a76eaf55778f871b995af429c9636d9159a4b483 category: main optional: false - name: arelle-release - version: 2.17.7 + version: 2.18.0 manager: conda platform: osx-arm64 dependencies: certifi: "" regex: "" python: ">=3.8" - numpy: 1.* python-dateutil: 2.* + numpy: 1.* isodate: 0.* lxml: 4.* openpyxl: 3.* pyparsing: 3.* - url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.17.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.18.0-pyhd8ed1ab_0.conda hash: - md5: b42bbf2e318b6bbbd9de2d81ecf8ed50 - sha256: 3094446e601ad9160677c2bb5b75b9946c81b679bebf42bf52c126e71d76fb43 + md5: cf492dd79a1d1d1ef2af299da2a604ca + sha256: f3fa253f2a26faa56348acc2a76eaf55778f871b995af429c9636d9159a4b483 category: main optional: false - name: argon2-cffi @@ -1914,52 +1914,52 @@ package: category: main optional: false - name: boto3 - version: 1.33.5 + version: 1.33.6 manager: conda platform: linux-64 dependencies: - botocore: ">=1.33.5,<1.34.0" + botocore: ">=1.33.6,<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.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.6-pyhd8ed1ab_0.conda hash: - md5: 7485d3ee00269cd33baa2ad64a0923ee - sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 + md5: fff8f43d8786f4e2a0ab4ed431f8c511 + sha256: 7fad398c6730cb751de3495b8204a7cd133aeecdd684273bc3359f31e1c01eca category: main optional: false - name: boto3 - version: 1.33.5 + version: 1.33.6 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.5,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.5-pyhd8ed1ab_0.conda + botocore: ">=1.33.6,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.6-pyhd8ed1ab_0.conda hash: - md5: 7485d3ee00269cd33baa2ad64a0923ee - sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 + md5: fff8f43d8786f4e2a0ab4ed431f8c511 + sha256: 7fad398c6730cb751de3495b8204a7cd133aeecdd684273bc3359f31e1c01eca category: main optional: false - name: boto3 - version: 1.33.5 + version: 1.33.6 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.5,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.5-pyhd8ed1ab_0.conda + botocore: ">=1.33.6,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.6-pyhd8ed1ab_0.conda hash: - md5: 7485d3ee00269cd33baa2ad64a0923ee - sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 + md5: fff8f43d8786f4e2a0ab4ed431f8c511 + sha256: 7fad398c6730cb751de3495b8204a7cd133aeecdd684273bc3359f31e1c01eca category: main optional: false - name: botocore - version: 1.33.5 + version: 1.33.6 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.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.6-pyhd8ed1ab_0.conda hash: - md5: 352c39ba5cd9ea01996358f0748e102e - sha256: 56566ea8f3a48c24190c1dcf50681c0a84b26821c335c21b5c3c5d238e4bdb14 + md5: e1c7565a0bfba34c3be07a3ad882356f + sha256: 06549a55df5711e0306395e8187f03c46f25337fb7e9ab6c014cf26a76ca9cef category: main optional: false - name: botocore - version: 1.33.5 + version: 1.33.6 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.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.6-pyhd8ed1ab_0.conda hash: - md5: 352c39ba5cd9ea01996358f0748e102e - sha256: 56566ea8f3a48c24190c1dcf50681c0a84b26821c335c21b5c3c5d238e4bdb14 + md5: e1c7565a0bfba34c3be07a3ad882356f + sha256: 06549a55df5711e0306395e8187f03c46f25337fb7e9ab6c014cf26a76ca9cef category: main optional: false - name: botocore - version: 1.33.5 + version: 1.33.6 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.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.6-pyhd8ed1ab_0.conda hash: - md5: 352c39ba5cd9ea01996358f0748e102e - sha256: 56566ea8f3a48c24190c1dcf50681c0a84b26821c335c21b5c3c5d238e4bdb14 + md5: e1c7565a0bfba34c3be07a3ad882356f + sha256: 06549a55df5711e0306395e8187f03c46f25337fb7e9ab6c014cf26a76ca9cef 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 @@ -3658,7 +3658,7 @@ package: category: main optional: false - name: cryptography - version: 41.0.5 + version: 41.0.7 manager: conda platform: linux-64 dependencies: @@ -3667,14 +3667,14 @@ package: openssl: ">=3.1.4,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-41.0.5-py311h63ff55d_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-41.0.7-py311hcb13ee4_1.conda hash: - md5: 22584e5c97ed8f1a6b63a0ff43dba827 - sha256: 236ed2218fb857fecaa11fc7fee23574f683b3d03576f8f26f628b7fd2ced5fa + md5: ca6e04ac7262ecaec846e483d6fdc6c8 + sha256: 0959d015727ae5f55f385556a0a19b9f6036752ea05f78a99cb534803e325cab category: main optional: false - name: cryptography - version: 41.0.5 + version: 41.0.7 manager: conda platform: osx-64 dependencies: @@ -3682,14 +3682,14 @@ package: openssl: ">=3.1.4,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/cryptography-41.0.5-py311hd51016d_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/cryptography-41.0.7-py311h48c7838_1.conda hash: - md5: 99f1edef251a9fe4edf620b527ee70ea - sha256: 26ee22b99771f0d338eca6299cbe866f695c544d855d5eab82539497b0a24fc1 + md5: 65293feff96135571de02c047ecbd5a2 + sha256: f4c5e683386acf06cfa85805d264c9cd540361ec6e86740cb03312e560aa706a category: main optional: false - name: cryptography - version: 41.0.5 + version: 41.0.7 manager: conda platform: osx-arm64 dependencies: @@ -3697,10 +3697,10 @@ package: openssl: ">=3.1.4,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/cryptography-41.0.5-py311h71175c2_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/cryptography-41.0.7-py311h08c85a6_1.conda hash: - md5: adc55f424334b834098d50e57efe0789 - sha256: 00c9b389b51b6e951a1f639aa04dceca9e329e144275c79b4f6baacd3fb90345 + md5: 729546a91873db64ab8e675008845fb5 + sha256: 9d51ba743069d19aae08361a7b051ca1f281fb3b3ccb162e96c2503cf5a7d365 category: main optional: false - name: curl @@ -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_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.10-pyhd8ed1ab_0.conda hash: - md5: 8c1a941fe77b920b1c7933a7a0c6bf2e - sha256: 0e947f376d6878bd8e505932277e84c373da492a38d2c4ef9d96fc25f5327845 + 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_1.conda + dagster: 1.5.10.* + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.10-pyhd8ed1ab_0.conda hash: - md5: 8c1a941fe77b920b1c7933a7a0c6bf2e - sha256: 0e947f376d6878bd8e505932277e84c373da492a38d2c4ef9d96fc25f5327845 + 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_1.conda + dagster: 1.5.10.* + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.10-pyhd8ed1ab_0.conda hash: - md5: 8c1a941fe77b920b1c7933a7a0c6bf2e - sha256: 0e947f376d6878bd8e505932277e84c373da492a38d2c4ef9d96fc25f5327845 + 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,16 +4086,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: dask-core - version: 2023.11.0 + version: 2023.12.0 manager: conda platform: linux-64 dependencies: @@ -4108,14 +4108,14 @@ package: python: ">=3.9" pyyaml: ">=5.3.1" toolz: ">=0.10.0" - url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.12.0-pyhd8ed1ab_0.conda hash: - md5: 3bf8f5c3fbab9e0cfffdf5914f021854 - sha256: f23b4e5d8f118d9d7916d8def04dab9a299d73879216da72dd7168c1c30ecb9e + md5: 95eae0785aed72998493140dc0115382 + sha256: e366163aa7325d14ca38ca72ca4672eeb4b7a7453573c47cfa90d0db60136b48 category: main optional: false - name: dask-core - version: 2023.11.0 + version: 2023.12.0 manager: conda platform: osx-64 dependencies: @@ -4128,14 +4128,14 @@ package: importlib_metadata: ">=4.13.0" fsspec: ">=2021.09.0" click: ">=8.1" - url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.12.0-pyhd8ed1ab_0.conda hash: - md5: 3bf8f5c3fbab9e0cfffdf5914f021854 - sha256: f23b4e5d8f118d9d7916d8def04dab9a299d73879216da72dd7168c1c30ecb9e + md5: 95eae0785aed72998493140dc0115382 + sha256: e366163aa7325d14ca38ca72ca4672eeb4b7a7453573c47cfa90d0db60136b48 category: main optional: false - name: dask-core - version: 2023.11.0 + version: 2023.12.0 manager: conda platform: osx-arm64 dependencies: @@ -4148,10 +4148,10 @@ package: importlib_metadata: ">=4.13.0" fsspec: ">=2021.09.0" click: ">=8.1" - url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.12.0-pyhd8ed1ab_0.conda hash: - md5: 3bf8f5c3fbab9e0cfffdf5914f021854 - sha256: f23b4e5d8f118d9d7916d8def04dab9a299d73879216da72dd7168c1c30ecb9e + md5: 95eae0785aed72998493140dc0115382 + sha256: e366163aa7325d14ca38ca72ca4672eeb4b7a7453573c47cfa90d0db60136b48 category: main optional: false - name: dataclasses @@ -4528,8 +4528,8 @@ package: dependencies: sniffio: "" python: ">=3.8.0,<4.0.0" - cryptography: ">=2.6,<42.0" httpcore: ">=0.17.3" + cryptography: ">=2.6,<42.0" idna: ">=2.1,<4.0" url: https://conda.anaconda.org/conda-forge/noarch/dnspython-2.4.2-pyhd8ed1ab_1.conda hash: @@ -4544,8 +4544,8 @@ package: dependencies: sniffio: "" python: ">=3.8.0,<4.0.0" - cryptography: ">=2.6,<42.0" httpcore: ">=0.17.3" + cryptography: ">=2.6,<42.0" idna: ">=2.1,<4.0" url: https://conda.anaconda.org/conda-forge/noarch/dnspython-2.4.2-pyhd8ed1ab_1.conda hash: @@ -5104,7 +5104,7 @@ package: category: main optional: false - name: folium - version: 0.15.0 + version: 0.15.1 manager: conda platform: linux-64 dependencies: @@ -5113,42 +5113,45 @@ package: numpy: "" python: ">=3.7" requests: "" - url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.0-pyhd8ed1ab_0.conda + xyzservices: "" + url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.1-pyhd8ed1ab_0.conda hash: - md5: 25f5dbce4f946240dea7d2ee79d34254 - sha256: afe869f136fca1dbda8be0c342392fda99d951c4c4612f134a70efbf5449ef30 + md5: 4fdfc338f6fb875b1078a7e20dbc99e2 + sha256: c0730ddfaf35e39ac92b7fd07315843e7948b2ce3361d164ec1b722dd0440c2b category: main optional: false - name: folium - version: 0.15.0 + version: 0.15.1 manager: conda platform: osx-64 dependencies: numpy: "" requests: "" + xyzservices: "" python: ">=3.7" jinja2: ">=2.9" branca: ">=0.7.0" - url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.1-pyhd8ed1ab_0.conda hash: - md5: 25f5dbce4f946240dea7d2ee79d34254 - sha256: afe869f136fca1dbda8be0c342392fda99d951c4c4612f134a70efbf5449ef30 + md5: 4fdfc338f6fb875b1078a7e20dbc99e2 + sha256: c0730ddfaf35e39ac92b7fd07315843e7948b2ce3361d164ec1b722dd0440c2b category: main optional: false - name: folium - version: 0.15.0 + version: 0.15.1 manager: conda platform: osx-arm64 dependencies: numpy: "" requests: "" + xyzservices: "" python: ">=3.7" jinja2: ">=2.9" branca: ">=0.7.0" - url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.1-pyhd8ed1ab_0.conda hash: - md5: 25f5dbce4f946240dea7d2ee79d34254 - sha256: afe869f136fca1dbda8be0c342392fda99d951c4c4612f134a70efbf5449ef30 + md5: 4fdfc338f6fb875b1078a7e20dbc99e2 + sha256: c0730ddfaf35e39ac92b7fd07315843e7948b2ce3361d164ec1b722dd0440c2b category: main optional: false - name: font-ttf-dejavu-sans-mono @@ -5409,7 +5412,7 @@ package: category: main optional: false - name: fonttools - version: 4.45.1 + version: 4.46.0 manager: conda platform: linux-64 dependencies: @@ -5418,14 +5421,14 @@ package: munkres: "" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.45.1-py311h459d7ec_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.46.0-py311h459d7ec_0.conda hash: - md5: 5b24692ece82f89e5cb9a469d9619731 - sha256: 57d311f86568d46f33845ea8c7d1c9e449a1fa85e510baa17f09e2cae2283681 + md5: a14114f70e23f7fd5ab9941fec45b095 + sha256: a40f8415d9ceaf5f217034814b984d13017e4dab577085a83a2d0cc39b9d7239 category: main optional: false - name: fonttools - version: 4.45.1 + version: 4.46.0 manager: conda platform: osx-64 dependencies: @@ -5433,14 +5436,14 @@ package: munkres: "" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/fonttools-4.45.1-py311he705e18_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/fonttools-4.46.0-py311he705e18_0.conda hash: - md5: 2910a2886c556ce4085fd59d73ae96f2 - sha256: 5a60241d7585b33160c169ae59b9bd9445c89bfb4604b2d77e7a0db48c04ccc5 + md5: c68a6370b0db24b87be1a4cd7a511545 + sha256: 05c4b4fe22ce74bd5145dacf261cec44bbadac82d1e65a0b3a03d2675330f1bb category: main optional: false - name: fonttools - version: 4.45.1 + version: 4.46.0 manager: conda platform: osx-arm64 dependencies: @@ -5448,10 +5451,10 @@ package: munkres: "" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/fonttools-4.45.1-py311h05b510d_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/fonttools-4.46.0-py311h05b510d_0.conda hash: - md5: 40c7471beb6af15161a202c0ddf04d82 - sha256: 7d8d2c8de468dc5a432e8d083f3b56eeec4380749bcfd09a44c81d42cacceece + md5: 1bac60f34700b22c8e8364f32b502211 + sha256: 300d8cc1cc987ab913e3b24c38f8eaf679acff0e885747a3f71471fd92db3e33 category: main optional: false - name: fqdn @@ -5735,39 +5738,39 @@ package: category: main optional: false - name: fsspec - version: 2023.10.0 + version: 2023.12.0 manager: conda platform: linux-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.10.0-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.0-pyhca7485f_0.conda hash: - md5: 5b86cf1ceaaa9be2ec4627377e538db1 - sha256: 1bbdfadb93cc768252fd207dca406cde928f9a81ff985ea1760b6539c55923e6 + md5: 036539452871d3b0906ff194ad808c9b + sha256: 72c84d372aa5d60eb31c53c108bacefb0c6fb854047441b543738e144f1fae65 category: main optional: false - name: fsspec - version: 2023.10.0 + version: 2023.12.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.10.0-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.0-pyhca7485f_0.conda hash: - md5: 5b86cf1ceaaa9be2ec4627377e538db1 - sha256: 1bbdfadb93cc768252fd207dca406cde928f9a81ff985ea1760b6539c55923e6 + md5: 036539452871d3b0906ff194ad808c9b + sha256: 72c84d372aa5d60eb31c53c108bacefb0c6fb854047441b543738e144f1fae65 category: main optional: false - name: fsspec - version: 2023.10.0 + version: 2023.12.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.10.0-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.0-pyhca7485f_0.conda hash: - md5: 5b86cf1ceaaa9be2ec4627377e538db1 - sha256: 1bbdfadb93cc768252fd207dca406cde928f9a81ff985ea1760b6539c55923e6 + md5: 036539452871d3b0906ff194ad808c9b + sha256: 72c84d372aa5d60eb31c53c108bacefb0c6fb854047441b543738e144f1fae65 category: main optional: false - name: furo @@ -5819,26 +5822,26 @@ package: category: main optional: false - name: gcsfs - version: 2023.10.0 + version: 2023.12.0 manager: conda platform: linux-64 dependencies: aiohttp: "" decorator: ">4.1.2" - fsspec: 2023.10.0 + fsspec: 2023.12.0 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.10.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.12.0-pyhd8ed1ab_0.conda hash: - md5: 500521931bdcc0f6d19c1c2e2ab4a5d9 - sha256: dd7559c5297359e475a125742e9cb30938579e93a17ce7537af64a04c98407a5 + md5: ad178e852250983982f3e2247635029d + sha256: 39dfbcb02360069206835f395cc0f169ead32005ff0c941a73526cdcfc18cd4b category: main optional: false - name: gcsfs - version: 2023.10.0 + version: 2023.12.0 manager: conda platform: osx-64 dependencies: @@ -5849,15 +5852,15 @@ package: google-auth: ">=1.2" decorator: ">4.1.2" google-cloud-storage: ">1.40" - fsspec: 2023.10.0 - url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.10.0-pyhd8ed1ab_0.conda + fsspec: 2023.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.12.0-pyhd8ed1ab_0.conda hash: - md5: 500521931bdcc0f6d19c1c2e2ab4a5d9 - sha256: dd7559c5297359e475a125742e9cb30938579e93a17ce7537af64a04c98407a5 + md5: ad178e852250983982f3e2247635029d + sha256: 39dfbcb02360069206835f395cc0f169ead32005ff0c941a73526cdcfc18cd4b category: main optional: false - name: gcsfs - version: 2023.10.0 + version: 2023.12.0 manager: conda platform: osx-arm64 dependencies: @@ -5868,71 +5871,71 @@ package: google-auth: ">=1.2" decorator: ">4.1.2" google-cloud-storage: ">1.40" - fsspec: 2023.10.0 - url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.10.0-pyhd8ed1ab_0.conda + fsspec: 2023.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.12.0-pyhd8ed1ab_0.conda hash: - md5: 500521931bdcc0f6d19c1c2e2ab4a5d9 - sha256: dd7559c5297359e475a125742e9cb30938579e93a17ce7537af64a04c98407a5 + md5: ad178e852250983982f3e2247635029d + sha256: 39dfbcb02360069206835f395cc0f169ead32005ff0c941a73526cdcfc18cd4b 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.3.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.3.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.3.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 @@ -8292,78 +8295,78 @@ package: category: main optional: false - name: importlib-metadata - version: 6.8.0 + version: 7.0.0 manager: conda platform: linux-64 dependencies: python: ">=3.8" zipp: ">=0.5" - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.8.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-7.0.0-pyha770c72_0.conda hash: - md5: 4e9f59a060c3be52bc4ddc46ee9b6946 - sha256: 2797ed927d65324309b6c630190d917b9f2111e0c217b721f80429aeb57f9fcf + md5: a941237cd06538837b25cd245fcd25d8 + sha256: 9731e82a00d36b182dc515e31723e711ac82890bb1ca86c6a17a4b471135564f category: main optional: false - name: importlib-metadata - version: 6.8.0 + version: 7.0.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" zipp: ">=0.5" - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.8.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-7.0.0-pyha770c72_0.conda hash: - md5: 4e9f59a060c3be52bc4ddc46ee9b6946 - sha256: 2797ed927d65324309b6c630190d917b9f2111e0c217b721f80429aeb57f9fcf + md5: a941237cd06538837b25cd245fcd25d8 + sha256: 9731e82a00d36b182dc515e31723e711ac82890bb1ca86c6a17a4b471135564f category: main optional: false - name: importlib-metadata - version: 6.8.0 + version: 7.0.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" zipp: ">=0.5" - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.8.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-7.0.0-pyha770c72_0.conda hash: - md5: 4e9f59a060c3be52bc4ddc46ee9b6946 - sha256: 2797ed927d65324309b6c630190d917b9f2111e0c217b721f80429aeb57f9fcf + md5: a941237cd06538837b25cd245fcd25d8 + sha256: 9731e82a00d36b182dc515e31723e711ac82890bb1ca86c6a17a4b471135564f category: main optional: false - name: importlib_metadata - version: 6.8.0 + version: 7.0.0 manager: conda platform: linux-64 dependencies: - importlib-metadata: ">=6.8.0,<6.8.1.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.8.0-hd8ed1ab_0.conda + importlib-metadata: ">=7.0.0,<7.0.1.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-7.0.0-hd8ed1ab_0.conda hash: - md5: b279b07ce18058034e5b3606ba103a8b - sha256: b96e01dc42d547d6d9ceb1c5b52a5232cc04e40153534350f702c3e0418a6b3f + md5: 12aff14f84c337be5e5636bf612f4140 + sha256: b9e8ed41df6c55222e3777f422e77a22a6a19ff779b2e65aa8dfdea792c1f7de category: main optional: false - name: importlib_metadata - version: 6.8.0 + version: 7.0.0 manager: conda platform: osx-64 dependencies: - importlib-metadata: ">=6.8.0,<6.8.1.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.8.0-hd8ed1ab_0.conda + importlib-metadata: ">=7.0.0,<7.0.1.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-7.0.0-hd8ed1ab_0.conda hash: - md5: b279b07ce18058034e5b3606ba103a8b - sha256: b96e01dc42d547d6d9ceb1c5b52a5232cc04e40153534350f702c3e0418a6b3f + md5: 12aff14f84c337be5e5636bf612f4140 + sha256: b9e8ed41df6c55222e3777f422e77a22a6a19ff779b2e65aa8dfdea792c1f7de category: main optional: false - name: importlib_metadata - version: 6.8.0 + version: 7.0.0 manager: conda platform: osx-arm64 dependencies: - importlib-metadata: ">=6.8.0,<6.8.1.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.8.0-hd8ed1ab_0.conda + importlib-metadata: ">=7.0.0,<7.0.1.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-7.0.0-hd8ed1ab_0.conda hash: - md5: b279b07ce18058034e5b3606ba103a8b - sha256: b96e01dc42d547d6d9ceb1c5b52a5232cc04e40153534350f702c3e0418a6b3f + md5: 12aff14f84c337be5e5636bf612f4140 + sha256: b9e8ed41df6c55222e3777f422e77a22a6a19ff779b2e65aa8dfdea792c1f7de category: main optional: false - name: importlib_resources @@ -8530,16 +8533,16 @@ package: matplotlib-inline: "" pexpect: ">4.3" pickleshare: "" - prompt-toolkit: ">=3.0.30,<3.1.0,!=3.0.37" + prompt-toolkit: ">=3.0.41,<3.1.0" pygments: ">=2.4.0" python: ">=3.9" stack_data: "" traitlets: ">=5" typing_extensions: "" - url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_2.conda hash: - md5: ac2f9c2e10c2e90e8d135cef51f9753a - sha256: 67490e640faa372d663a5c5cd2d61f417cce22a019a4de82a9e5ddb1cf2ee181 + md5: 5e23d20fc6e33061c063220146579990 + sha256: c956b70ed41b7f61a780a7e584f03f68e7e5073c8c138960bfbc5e705d9124b1 category: main optional: false - name: ipython @@ -8559,11 +8562,11 @@ package: 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.1-pyh31011fe_1.conda + prompt-toolkit: ">=3.0.41,<3.1.0" + url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_2.conda hash: - md5: ac2f9c2e10c2e90e8d135cef51f9753a - sha256: 67490e640faa372d663a5c5cd2d61f417cce22a019a4de82a9e5ddb1cf2ee181 + md5: 5e23d20fc6e33061c063220146579990 + sha256: c956b70ed41b7f61a780a7e584f03f68e7e5073c8c138960bfbc5e705d9124b1 category: main optional: false - name: ipython @@ -8583,11 +8586,11 @@ package: 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.1-pyh31011fe_1.conda + prompt-toolkit: ">=3.0.41,<3.1.0" + url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_2.conda hash: - md5: ac2f9c2e10c2e90e8d135cef51f9753a - sha256: 67490e640faa372d663a5c5cd2d61f417cce22a019a4de82a9e5ddb1cf2ee181 + md5: 5e23d20fc6e33061c063220146579990 + sha256: c956b70ed41b7f61a780a7e584f03f68e7e5073c8c138960bfbc5e705d9124b1 category: main optional: false - name: ipywidgets @@ -9373,8 +9376,8 @@ package: dependencies: ipywidgets: "" notebook: "" - ipykernel: "" nbconvert: "" + ipykernel: "" qtconsole-base: "" jupyter_console: "" python: ">=3.6" @@ -9391,8 +9394,8 @@ package: dependencies: ipywidgets: "" notebook: "" - ipykernel: "" nbconvert: "" + ipykernel: "" qtconsole-base: "" jupyter_console: "" python: ">=3.6" @@ -9706,7 +9709,7 @@ package: category: main optional: false - name: jupyter_server - version: 2.11.1 + version: 2.11.2 manager: conda platform: linux-64 dependencies: @@ -9729,14 +9732,14 @@ package: tornado: ">=6.2.0" traitlets: ">=5.6.0" websocket-client: "" - url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.11.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.11.2-pyhd8ed1ab_0.conda hash: - md5: 0699b715659c026f7f81c27d0e744205 - sha256: 605825c0e2d5af7935b37319b9a46ff39e081e7a0f4dc973f0dd583f41c69ce5 + md5: c831341804aecf5abcdbb348be301f92 + sha256: 9e56c09fa7f4b95aab30b51008416d041c53cfd94ef3a4abc339d1eabb015df2 category: main optional: false - name: jupyter_server - version: 2.11.1 + version: 2.11.2 manager: conda platform: osx-64 dependencies: @@ -9759,14 +9762,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.11.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.11.2-pyhd8ed1ab_0.conda hash: - md5: 0699b715659c026f7f81c27d0e744205 - sha256: 605825c0e2d5af7935b37319b9a46ff39e081e7a0f4dc973f0dd583f41c69ce5 + md5: c831341804aecf5abcdbb348be301f92 + sha256: 9e56c09fa7f4b95aab30b51008416d041c53cfd94ef3a4abc339d1eabb015df2 category: main optional: false - name: jupyter_server - version: 2.11.1 + version: 2.11.2 manager: conda platform: osx-arm64 dependencies: @@ -9789,10 +9792,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.11.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.11.2-pyhd8ed1ab_0.conda hash: - md5: 0699b715659c026f7f81c27d0e744205 - sha256: 605825c0e2d5af7935b37319b9a46ff39e081e7a0f4dc973f0dd583f41c69ce5 + md5: c831341804aecf5abcdbb348be301f92 + sha256: 9e56c09fa7f4b95aab30b51008416d041c53cfd94ef3a4abc339d1eabb015df2 category: main optional: false - name: jupyter_server_terminals @@ -9871,8 +9874,8 @@ package: ipykernel: "" jupyter_core: "" python: ">=3.8" - jinja2: ">=3.0.3" tornado: ">=6.2.0" + jinja2: ">=3.0.3" importlib_metadata: ">=4.8.3" jupyter_server: ">=2.4.0,<3" importlib_resources: ">=1.4" @@ -9897,8 +9900,8 @@ package: ipykernel: "" jupyter_core: "" python: ">=3.8" - jinja2: ">=3.0.3" tornado: ">=6.2.0" + jinja2: ">=3.0.3" importlib_metadata: ">=4.8.3" jupyter_server: ">=2.4.0,<3" importlib_resources: ">=1.4" @@ -10273,43 +10276,43 @@ package: category: main optional: false - name: lcms2 - version: "2.15" + version: "2.16" manager: conda platform: linux-64 dependencies: libgcc-ng: ">=12" libjpeg-turbo: ">=3.0.0,<4.0a0" libtiff: ">=4.6.0,<4.7.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.15-hb7c19ff_3.conda + url: https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.16-hb7c19ff_0.conda hash: - md5: e96637dd92c5f340215c753a5c9a22d7 - sha256: cc0b2ddab52b20698b26fe8622ebe37e0d462d8691a1f324e7b00f7d904765e3 + md5: 51bb7010fc86f70eee639b4bb7a894f5 + sha256: 5c878d104b461b7ef922abe6320711c0d01772f4cd55de18b674f88547870041 category: main optional: false - name: lcms2 - version: "2.15" + version: "2.16" manager: conda platform: osx-64 dependencies: libjpeg-turbo: ">=3.0.0,<4.0a0" libtiff: ">=4.6.0,<4.7.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/lcms2-2.15-hd6ba6f3_3.conda + url: https://conda.anaconda.org/conda-forge/osx-64/lcms2-2.16-ha2f27b4_0.conda hash: - md5: 8059507d52f477fbd4b81841e085e25b - sha256: b2234f24e3b0030762430ec3414410119d1129804a95ef65af50ad36cabd9bd5 + md5: 1442db8f03517834843666c422238c9b + sha256: 222ebc0a55544b9922f61e75015d02861e65b48f12113af41d48ba0814e14e4e category: main optional: false - name: lcms2 - version: "2.15" + version: "2.16" manager: conda platform: osx-arm64 dependencies: libjpeg-turbo: ">=3.0.0,<4.0a0" libtiff: ">=4.6.0,<4.7.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/lcms2-2.15-hf2736f0_3.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/lcms2-2.16-ha0e7c42_0.conda hash: - md5: bbaac531169fed3e09ae31aff80aa069 - sha256: 3d07ba04602617c3084b302c8a6fa30b2e4b20511180f45992b289c312298018 + md5: 66f6c134e76fe13cce8a9ea5814b5dd5 + sha256: 151e0c84feb7e0747fabcc85006b8973b22f5abbc3af76a9add0b0ef0320ebe4 category: main optional: false - name: ld_impl_linux-64 @@ -11502,13 +11505,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" @@ -11531,7 +11534,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" @@ -11540,29 +11543,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" @@ -11585,36 +11588,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" @@ -11637,26 +11640,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 @@ -12435,11 +12438,11 @@ package: 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-hfc447b1_2.conda hash: - md5: 2b7f1893cf40b4ccdc0230bcd94d5ed9 - sha256: 8c92a8cce329a83cc9e94b19d18200c661957c00cfb464f26237d24730864585 + md5: 3cfa1ceef6936e656677ba59480106ce + sha256: 6ce23d046522c39cda5c25e47d303b39f8b31a2aac2c59ea3e41710a072ff0bf category: main optional: false - name: libpq @@ -12449,11 +12452,11 @@ package: 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-h6dd4ff7_2.conda hash: - md5: 39de94ff4ccc306f3d24ef7aef13c689 - sha256: 1a51c9b3451eebf04ac1f7a7a58fec07c2e44d2298514a30f62b5b432a653c07 + md5: 7aa484702ee6f49c7a728b578a544b27 + sha256: 13011b0b9b31771197155d3547dcdf2c5f8f8a91f86f2b4d45fbf8a4d6f53d0a category: main optional: false - name: libpq @@ -12463,11 +12466,11 @@ package: 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-hd435d45_2.conda hash: - md5: 883bbf64780c91608f1a7df9203b79a5 - sha256: 1b5c86d5f247b3e154ae373dcebea6979368c4a0ee722d39ec33ee2fc8528c04 + md5: b4d4402f19365ed54ad529e09bfa7cdb + sha256: 50e96d4014b59ef337a74322be4394e27e6be65c3c5356b98ee0be1f6f4086a1 category: main optional: false - name: libprotobuf @@ -14417,49 +14420,49 @@ package: category: main optional: false - name: nbconvert - version: 7.11.0 + version: 7.12.0 manager: conda platform: linux-64 dependencies: - nbconvert-core: 7.11.0 - nbconvert-pandoc: 7.11.0 + nbconvert-core: 7.12.0 + nbconvert-pandoc: 7.12.0 python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.12.0-pyhd8ed1ab_0.conda hash: - md5: e492b36cbea1c83d1663fa73a8abff9b - sha256: 6af7048b30c0ce6746297548df981037802f713853a1e856aedd2f8164946d39 + md5: 364e28ab12477494e72839aaa588073d + sha256: 0137330ab16bddf1fcaf60c0501c6145705b775fd547823708ed84364c934b76 category: main optional: false - name: nbconvert - version: 7.11.0 + version: 7.12.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" - nbconvert-core: 7.11.0 - nbconvert-pandoc: 7.11.0 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.11.0-pyhd8ed1ab_0.conda + nbconvert-core: 7.12.0 + nbconvert-pandoc: 7.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.12.0-pyhd8ed1ab_0.conda hash: - md5: e492b36cbea1c83d1663fa73a8abff9b - sha256: 6af7048b30c0ce6746297548df981037802f713853a1e856aedd2f8164946d39 + md5: 364e28ab12477494e72839aaa588073d + sha256: 0137330ab16bddf1fcaf60c0501c6145705b775fd547823708ed84364c934b76 category: main optional: false - name: nbconvert - version: 7.11.0 + version: 7.12.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - nbconvert-core: 7.11.0 - nbconvert-pandoc: 7.11.0 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.11.0-pyhd8ed1ab_0.conda + nbconvert-core: 7.12.0 + nbconvert-pandoc: 7.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.12.0-pyhd8ed1ab_0.conda hash: - md5: e492b36cbea1c83d1663fa73a8abff9b - sha256: 6af7048b30c0ce6746297548df981037802f713853a1e856aedd2f8164946d39 + md5: 364e28ab12477494e72839aaa588073d + sha256: 0137330ab16bddf1fcaf60c0501c6145705b775fd547823708ed84364c934b76 category: main optional: false - name: nbconvert-core - version: 7.11.0 + version: 7.12.0 manager: conda platform: linux-64 dependencies: @@ -14480,14 +14483,14 @@ package: python: ">=3.8" tinycss2: "" traitlets: ">=5.0" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.12.0-pyhd8ed1ab_0.conda hash: - md5: d59e0cb1ca993f8f910cfdf393232acf - sha256: 81732e083c4c85a52248e20ff0e40a14b0b49db9cc7ce414e8aa7d6f8980dad0 + md5: 4d67c68fd0d130091ada039bc2d81b33 + sha256: 04c3ac88701d98d58139569e4899c3254bf99908179a898cc3dcadd8c0ef44b4 category: main optional: false - name: nbconvert-core - version: 7.11.0 + version: 7.12.0 manager: conda platform: osx-64 dependencies: @@ -14508,14 +14511,14 @@ package: pygments: ">=2.4.1" nbclient: ">=0.5.0" mistune: ">=2.0.3,<4" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.12.0-pyhd8ed1ab_0.conda hash: - md5: d59e0cb1ca993f8f910cfdf393232acf - sha256: 81732e083c4c85a52248e20ff0e40a14b0b49db9cc7ce414e8aa7d6f8980dad0 + md5: 4d67c68fd0d130091ada039bc2d81b33 + sha256: 04c3ac88701d98d58139569e4899c3254bf99908179a898cc3dcadd8c0ef44b4 category: main optional: false - name: nbconvert-core - version: 7.11.0 + version: 7.12.0 manager: conda platform: osx-arm64 dependencies: @@ -14536,52 +14539,52 @@ package: pygments: ">=2.4.1" nbclient: ">=0.5.0" mistune: ">=2.0.3,<4" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.12.0-pyhd8ed1ab_0.conda hash: - md5: d59e0cb1ca993f8f910cfdf393232acf - sha256: 81732e083c4c85a52248e20ff0e40a14b0b49db9cc7ce414e8aa7d6f8980dad0 + md5: 4d67c68fd0d130091ada039bc2d81b33 + sha256: 04c3ac88701d98d58139569e4899c3254bf99908179a898cc3dcadd8c0ef44b4 category: main optional: false - name: nbconvert-pandoc - version: 7.11.0 + version: 7.12.0 manager: conda platform: linux-64 dependencies: - nbconvert-core: 7.11.0 + nbconvert-core: 7.12.0 pandoc: "" python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.12.0-pyhd8ed1ab_0.conda hash: - md5: 51bd005efab7e5c5c2af2570327bd213 - sha256: 377d3c3f973b6885406ff6606d24c5e1fbd0d0fdc64c0dc17162f6daf35e08cf + md5: 460d7cac50322a39b61a833885a6a8d5 + sha256: ebf25caef387ec79f8d8f6771240d451ffaebcc2cdd127c0b152c6697d661d10 category: main optional: false - name: nbconvert-pandoc - version: 7.11.0 + version: 7.12.0 manager: conda platform: osx-64 dependencies: pandoc: "" python: ">=3.8" - nbconvert-core: 7.11.0 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.11.0-pyhd8ed1ab_0.conda + nbconvert-core: 7.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.12.0-pyhd8ed1ab_0.conda hash: - md5: 51bd005efab7e5c5c2af2570327bd213 - sha256: 377d3c3f973b6885406ff6606d24c5e1fbd0d0fdc64c0dc17162f6daf35e08cf + md5: 460d7cac50322a39b61a833885a6a8d5 + sha256: ebf25caef387ec79f8d8f6771240d451ffaebcc2cdd127c0b152c6697d661d10 category: main optional: false - name: nbconvert-pandoc - version: 7.11.0 + version: 7.12.0 manager: conda platform: osx-arm64 dependencies: pandoc: "" python: ">=3.8" - nbconvert-core: 7.11.0 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.11.0-pyhd8ed1ab_0.conda + nbconvert-core: 7.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.12.0-pyhd8ed1ab_0.conda hash: - md5: 51bd005efab7e5c5c2af2570327bd213 - sha256: 377d3c3f973b6885406ff6606d24c5e1fbd0d0fdc64c0dc17162f6daf35e08cf + md5: 460d7cac50322a39b61a833885a6a8d5 + sha256: ebf25caef387ec79f8d8f6771240d451ffaebcc2cdd127c0b152c6697d661d10 category: main optional: false - name: nbformat @@ -15313,40 +15316,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 @@ -16337,42 +16340,39 @@ package: category: main optional: false - name: platformdirs - version: 4.0.0 + version: 4.1.0 manager: conda platform: linux-64 dependencies: - python: ">=3.7" - typing_extensions: ">=4.7.1" - url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.0.0-pyhd8ed1ab_0.conda + python: ">=3.8" + url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.1.0-pyhd8ed1ab_0.conda hash: - md5: 6bb4ee32cd435deaeac72776c001e7ac - sha256: 67381d3f7cadca7df7699238e0dcce680ad20d7fd28804bab48611fecb084937 + md5: 45a5065664da0d1dfa8f8cd2eaf05ab9 + sha256: 9e4ff17ce802159ed31344eb913eaa877688226765b77947b102b42255a53853 category: main optional: false - name: platformdirs - version: 4.0.0 + version: 4.1.0 manager: conda platform: osx-64 dependencies: - python: ">=3.7" - typing_extensions: ">=4.7.1" - url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.0.0-pyhd8ed1ab_0.conda + python: ">=3.8" + url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.1.0-pyhd8ed1ab_0.conda hash: - md5: 6bb4ee32cd435deaeac72776c001e7ac - sha256: 67381d3f7cadca7df7699238e0dcce680ad20d7fd28804bab48611fecb084937 + md5: 45a5065664da0d1dfa8f8cd2eaf05ab9 + sha256: 9e4ff17ce802159ed31344eb913eaa877688226765b77947b102b42255a53853 category: main optional: false - name: platformdirs - version: 4.0.0 + version: 4.1.0 manager: conda platform: osx-arm64 dependencies: - python: ">=3.7" - typing_extensions: ">=4.7.1" - url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.0.0-pyhd8ed1ab_0.conda + python: ">=3.8" + url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.1.0-pyhd8ed1ab_0.conda hash: - md5: 6bb4ee32cd435deaeac72776c001e7ac - sha256: 67381d3f7cadca7df7699238e0dcce680ad20d7fd28804bab48611fecb084937 + md5: 45a5065664da0d1dfa8f8cd2eaf05ab9 + sha256: 9e4ff17ce802159ed31344eb913eaa877688226765b77947b102b42255a53853 category: main optional: false - name: pluggy @@ -16412,7 +16412,7 @@ package: category: main optional: false - name: poppler - version: 23.11.0 + version: 23.12.0 manager: conda platform: linux-64 dependencies: @@ -16423,7 +16423,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" @@ -16431,17 +16431,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: @@ -16454,24 +16454,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: @@ -16484,20 +16484,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 @@ -16541,17 +16541,17 @@ 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_2.conda hash: - md5: 1e9ab0760262044fa00814088667e451 - sha256: 74dfb5793a00a0a9e85296ce0944d8af0f71758574b7c8f9e7d5590250441e24 + md5: a175fe7a349a7e4cda81f4d7ae2bc2b2 + sha256: b2c258a78effab00f8db53e5dd04a43baf309c9a3c164c0d6f52de836b3baea5 category: main optional: false - name: postgresql @@ -16561,17 +16561,17 @@ 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_2.conda hash: - md5: b7322d27093606b939fb92fa33b92beb - sha256: 612393024639882d7515429e639c85fa3b712d114c5a6b3a4b3891b061e1bc89 + md5: ad5e3602657162ddcab580d052df0bd4 + sha256: 47282bff8ca6c64f72276401e8bcfff625cadcdcbfd3804bb08d9dcbe7485907 category: main optional: false - name: postgresql @@ -16581,17 +16581,17 @@ 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_2.conda hash: - md5: 37398d1ad2fbeaa7733711b845da863e - sha256: 441f5ad3fac42e7daf9c246ad0dc0962c7f0b4c9ac1044038d3a053d339320bf + md5: a2562d92a27e19371e2655fe48e6952f + sha256: a896c5ab8930a4d9f980471b64d6eb254a22c46565ebb777d99e235c8c0fb7f9 category: main optional: false - name: pre-commit @@ -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 @@ -22876,7 +22876,7 @@ package: category: main optional: false - name: virtualenv - version: 20.24.7 + version: 20.25.0 manager: conda platform: linux-64 dependencies: @@ -22884,14 +22884,14 @@ package: filelock: <4,>=3.12.2 platformdirs: <5,>=3.9.1 python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.24.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.25.0-pyhd8ed1ab_0.conda hash: - md5: db990278c2c00b268eed778de44f6057 - sha256: ad661ae59c64bd73c25dfadb00c601659f4d9cafbf428e36a690075e52bac96a + md5: c119653cba436d8183c27bf6d190e587 + sha256: 50827c3721a9dbf973b568709d4381add2a6552fa562f26a385c5edc16a534af category: main optional: false - name: virtualenv - version: 20.24.7 + version: 20.25.0 manager: conda platform: osx-64 dependencies: @@ -22899,14 +22899,14 @@ package: distlib: <1,>=0.3.7 filelock: <4,>=3.12.2 platformdirs: <5,>=3.9.1 - url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.24.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.25.0-pyhd8ed1ab_0.conda hash: - md5: db990278c2c00b268eed778de44f6057 - sha256: ad661ae59c64bd73c25dfadb00c601659f4d9cafbf428e36a690075e52bac96a + md5: c119653cba436d8183c27bf6d190e587 + sha256: 50827c3721a9dbf973b568709d4381add2a6552fa562f26a385c5edc16a534af category: main optional: false - name: virtualenv - version: 20.24.7 + version: 20.25.0 manager: conda platform: osx-arm64 dependencies: @@ -22914,10 +22914,10 @@ package: distlib: <1,>=0.3.7 filelock: <4,>=3.12.2 platformdirs: <5,>=3.9.1 - url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.24.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.25.0-pyhd8ed1ab_0.conda hash: - md5: db990278c2c00b268eed778de44f6057 - sha256: ad661ae59c64bd73c25dfadb00c601659f4d9cafbf428e36a690075e52bac96a + md5: c119653cba436d8183c27bf6d190e587 + sha256: 50827c3721a9dbf973b568709d4381add2a6552fa562f26a385c5edc16a534af category: main optional: false - name: watchdog @@ -23114,39 +23114,39 @@ package: category: main optional: false - name: websocket-client - version: 1.6.4 + version: 1.7.0 manager: conda platform: linux-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.6.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.7.0-pyhd8ed1ab_0.conda hash: - md5: bdb77b28cf16deac0eef431a068320e8 - sha256: df45b89862edcd7cd5180ec7b8c0c0ca9fb4d3f7d49ddafccdc76afcf50d8da6 + md5: 50ad31e07d706aae88b14a4ac9c73f23 + sha256: d9b537d5b7c5aa7a02a4ce4c6b755e458bd8083b67752a73c92d113ccec6c10f category: main optional: false - name: websocket-client - version: 1.6.4 + version: 1.7.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.6.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.7.0-pyhd8ed1ab_0.conda hash: - md5: bdb77b28cf16deac0eef431a068320e8 - sha256: df45b89862edcd7cd5180ec7b8c0c0ca9fb4d3f7d49ddafccdc76afcf50d8da6 + md5: 50ad31e07d706aae88b14a4ac9c73f23 + sha256: d9b537d5b7c5aa7a02a4ce4c6b755e458bd8083b67752a73c92d113ccec6c10f category: main optional: false - name: websocket-client - version: 1.6.4 + version: 1.7.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.6.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.7.0-pyhd8ed1ab_0.conda hash: - md5: bdb77b28cf16deac0eef431a068320e8 - sha256: df45b89862edcd7cd5180ec7b8c0c0ca9fb4d3f7d49ddafccdc76afcf50d8da6 + md5: 50ad31e07d706aae88b14a4ac9c73f23 + sha256: d9b537d5b7c5aa7a02a4ce4c6b755e458bd8083b67752a73c92d113ccec6c10f category: main optional: false - name: websockets diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index 12d78b1972..af75e5e3dc 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -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 @@ -114,7 +114,7 @@ dependencies: - gdk-pixbuf=2.42.10=hbb5a27d_4 - gts=0.7.6=h53e17e3_4 - krb5=1.21.2=hb884880_0 - - lcms2=2.15=hd6ba6f3_3 + - lcms2=2.16=ha2f27b4_0 - libopenblas=0.3.25=openmp_hfef2a42_0 - libthrift=0.19.0=h064b379_1 - libwebp=1.3.2=h44782d1_1 @@ -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 @@ -167,7 +167,7 @@ dependencies: - executing=2.0.1=pyhd8ed1ab_0 - filelock=3.13.1=pyhd8ed1ab_0 - frozenlist=1.4.0=py311h2725bcf_1 - - fsspec=2023.10.0=pyhca7485f_0 + - fsspec=2023.12.0=pyhca7485f_0 - google-cloud-sdk=455.0.0=py311h6eed73b_0 - greenlet=3.0.1=py311hd39e593_0 - hpack=4.0.0=pyh9f0ad1d_0 @@ -190,7 +190,7 @@ dependencies: - libcurl=8.4.0=h726d00d_0 - libgd=2.3.3=h0dceb68_9 - libgrpc=1.59.2=ha7f534c_0 - - libpq=16.1=h6dd4ff7_0 + - libpq=16.1=h6dd4ff7_2 - llvmlite=0.41.1=py311hb5c2e0a_0 - locket=1.0.0=pyhd8ed1ab_0 - lxml=4.9.3=py311h19a211c_1 @@ -217,6 +217,7 @@ dependencies: - pillow=10.1.0=py311hea5c87a_0 - pkginfo=1.9.6=pyhd8ed1ab_0 - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_1 + - platformdirs=4.1.0=pyhd8ed1ab_0 - pluggy=1.3.0=pyhd8ed1ab_0 - prometheus_client=0.19.0=pyhd8ed1ab_0 - psutil=5.9.5=py311h2725bcf_1 @@ -279,7 +280,7 @@ dependencies: - wcwidth=0.2.12=pyhd8ed1ab_0 - webcolors=1.13=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_2 - - websocket-client=1.6.4=pyhd8ed1ab_0 + - websocket-client=1.7.0=pyhd8ed1ab_0 - websockets=10.4=py311h5547dcb_1 - wheel=0.42.0=pyhd8ed1ab_0 - widgetsnbextension=4.0.9=pyhd8ed1ab_0 @@ -300,7 +301,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 @@ -310,7 +311,7 @@ dependencies: - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311h2725bcf_0 - curl=8.4.0=h726d00d_0 - - fonttools=4.45.1=py311he705e18_0 + - fonttools=4.46.0=py311he705e18_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 - grpcio=1.59.2=py311hfd95bfa_0 @@ -320,7 +321,7 @@ dependencies: - hdf5=1.14.2=nompi_hedada53_100 - html5lib=1.1=pyh9f0ad1d_0 - hypothesis=6.91.0=pyha770c72_0 - - importlib-metadata=6.8.0=pyha770c72_0 + - importlib-metadata=7.0.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 - janus=1.0.0=pyhd8ed1ab_0 @@ -329,6 +330,7 @@ dependencies: - jinja2=3.1.2=pyhd8ed1ab_1 - joblib=1.3.2=pyhd8ed1ab_0 - jsonlines=4.0.0=pyhd8ed1ab_0 + - jupyter_core=5.5.0=py311h6eed73b_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - libcblas=3.9.0=20_osx64_openblas @@ -344,9 +346,8 @@ dependencies: - pexpect=4.8.0=pyh1a96a4e_2 - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - - platformdirs=4.0.0=pyhd8ed1ab_0 - - poppler=23.11.0=hdd5a5e8_0 - - postgresql=16.1=h413614c_0 + - poppler=23.12.0=hdd5a5e8_0 + - postgresql=16.1=h413614c_2 - proj=9.3.0=h23b96cc_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h021eaf5_0 @@ -371,6 +372,7 @@ dependencies: - typing_inspect=0.9.0=pyhd8ed1ab_0 - universal_pathlib=0.1.4=pyhd8ed1ab_0 - urllib3=1.26.18=pyhd8ed1ab_0 + - virtualenv=20.25.0=pyhd8ed1ab_0 - watchdog=3.0.0=py311h5ef12f2_1 - xerces-c=3.2.4=h6314983_3 - yarl=1.9.3=py311he705e18_0 @@ -381,10 +383,10 @@ 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.5=pyhd8ed1ab_0 + - botocore=1.33.6=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - - cryptography=41.0.5=py311hd51016d_0 + - cryptography=41.0.7=py311h48c7838_1 - fqdn=1.5.1=pyhd8ed1ab_0 - geotiff=1.7.1=h889ec99_14 - gitpython=3.1.40=pyhd8ed1ab_0 @@ -394,9 +396,8 @@ dependencies: - graphql-relay=3.2.0=pyhd8ed1ab_0 - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - httpcore=1.0.2=pyhd8ed1ab_0 - - importlib_metadata=6.8.0=hd8ed1ab_0 + - importlib_metadata=7.0.0=hd8ed1ab_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 - libnetcdf=4.9.2=nompi_h6a32802_112 @@ -421,24 +422,23 @@ 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.post1=py311h6eed73b_0 - - virtualenv=20.24.7=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h5e0f0e4_0 - aiohttp=3.8.6=py311he705e18_1 - - alembic=1.12.1=pyhd8ed1ab_0 - - arelle-release=2.17.7=pyhd8ed1ab_0 + - alembic=1.13.0=pyhd8ed1ab_0 + - arelle-release=2.18.0=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - aws-sdk-cpp=1.11.182=h28d282b_7 - bottleneck=1.3.7=py311h4a70a88_1 - cachecontrol=0.13.1=pyhd8ed1ab_0 - contourpy=1.2.0=py311h7bea37d_0 - - dask-core=2023.11.0=pyhd8ed1ab_0 + - dask-core=2023.12.0=pyhd8ed1ab_0 - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - - folium=0.15.0=pyhd8ed1ab_0 + - folium=0.15.1=pyhd8ed1ab_0 - google-resumable-media=2.6.0=pyhd8ed1ab_0 - graphene=3.3=pyhd8ed1ab_0 - grpcio-status=1.59.2=pyhd8ed1ab_0 @@ -446,12 +446,12 @@ dependencies: - h3-py=3.7.6=py311hdf8f085_1 - httpx=0.25.2=pyhd8ed1ab_0 - identify=2.5.32=pyhd8ed1ab_0 - - ipython=8.18.1=pyh31011fe_1 + - ipython=8.18.1=pyh31011fe_2 - isoduration=20.11.0=pyhd8ed1ab_0 - 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 @@ -471,14 +471,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.5=pyhd8ed1ab_0 + - boto3=1.33.6=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 + - gdal=3.8.1=py311h5646c56_1 - geopandas-base=0.14.1=pyha770c72_0 - google-auth=2.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 @@ -497,8 +497,8 @@ dependencies: - timezonefinder=6.2.0=py311he705e18_2 - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.9=pyhd8ed1ab_0 - - dagster-postgres=0.21.9=pyhd8ed1ab_1 + - 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,23 +514,23 @@ 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 - libarrow-flight-sql=14.0.1=h2cc6c1c_3_cpu - - nbconvert-core=7.11.0=pyhd8ed1ab_0 + - 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 - - jupyter_server=2.11.1=pyhd8ed1ab_0 + - jupyter_server=2.11.2=pyhd8ed1ab_0 - libarrow-substrait=14.0.1=h2cc6c1c_3_cpu - - nbconvert-pandoc=7.11.0=pyhd8ed1ab_0 - - gcsfs=2023.10.0=pyhd8ed1ab_0 + - nbconvert-pandoc=7.12.0=pyhd8ed1ab_0 + - gcsfs=2023.12.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 + - nbconvert=7.12.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - pyarrow=14.0.1=py311h98a0319_3_cpu - jupyterlab=4.0.9=pyhd8ed1ab_0 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 4cd3f6d3c9..992644fc0d 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -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 @@ -114,7 +114,7 @@ dependencies: - gdk-pixbuf=2.42.10=h15fa40c_4 - gts=0.7.6=he42f4ea_4 - krb5=1.21.2=h92f50d5_0 - - lcms2=2.15=hf2736f0_3 + - lcms2=2.16=ha0e7c42_0 - libopenblas=0.3.25=openmp_h6c19121_0 - libthrift=0.19.0=h026a170_1 - libwebp=1.3.2=hf30222e_1 @@ -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 @@ -167,7 +167,7 @@ dependencies: - executing=2.0.1=pyhd8ed1ab_0 - filelock=3.13.1=pyhd8ed1ab_0 - frozenlist=1.4.0=py311heffc1b2_1 - - fsspec=2023.10.0=pyhca7485f_0 + - fsspec=2023.12.0=pyhca7485f_0 - google-cloud-sdk=455.0.0=py311h267d04e_0 - greenlet=3.0.1=py311hbaf5611_0 - hpack=4.0.0=pyh9f0ad1d_0 @@ -190,7 +190,7 @@ dependencies: - libcurl=8.4.0=h2d989ff_0 - libgd=2.3.3=hfdf3952_9 - libgrpc=1.59.2=hbcf6334_0 - - libpq=16.1=hd435d45_0 + - libpq=16.1=hd435d45_2 - llvmlite=0.41.1=py311hf5d242d_0 - locket=1.0.0=pyhd8ed1ab_0 - lxml=4.9.3=py311hbafe683_1 @@ -217,6 +217,7 @@ dependencies: - pillow=10.1.0=py311hb9c5795_0 - pkginfo=1.9.6=pyhd8ed1ab_0 - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_1 + - platformdirs=4.1.0=pyhd8ed1ab_0 - pluggy=1.3.0=pyhd8ed1ab_0 - prometheus_client=0.19.0=pyhd8ed1ab_0 - psutil=5.9.5=py311heffc1b2_1 @@ -279,7 +280,7 @@ dependencies: - wcwidth=0.2.12=pyhd8ed1ab_0 - webcolors=1.13=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_2 - - websocket-client=1.6.4=pyhd8ed1ab_0 + - websocket-client=1.7.0=pyhd8ed1ab_0 - websockets=10.4=py311he2be06e_1 - wheel=0.42.0=pyhd8ed1ab_0 - widgetsnbextension=4.0.9=pyhd8ed1ab_0 @@ -300,7 +301,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 @@ -310,7 +311,7 @@ dependencies: - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311heffc1b2_0 - curl=8.4.0=h2d989ff_0 - - fonttools=4.45.1=py311h05b510d_0 + - fonttools=4.46.0=py311h05b510d_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 - grpcio=1.59.2=py311h79dd126_0 @@ -320,7 +321,7 @@ dependencies: - hdf5=1.14.2=nompi_h3aba7b3_100 - html5lib=1.1=pyh9f0ad1d_0 - hypothesis=6.91.0=pyha770c72_0 - - importlib-metadata=6.8.0=pyha770c72_0 + - importlib-metadata=7.0.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 - janus=1.0.0=pyhd8ed1ab_0 @@ -329,6 +330,7 @@ dependencies: - jinja2=3.1.2=pyhd8ed1ab_1 - joblib=1.3.2=pyhd8ed1ab_0 - jsonlines=4.0.0=pyhd8ed1ab_0 + - jupyter_core=5.5.0=py311h267d04e_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - libcblas=3.9.0=20_osxarm64_openblas @@ -344,9 +346,8 @@ dependencies: - pexpect=4.8.0=pyh1a96a4e_2 - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - - platformdirs=4.0.0=pyhd8ed1ab_0 - - poppler=23.11.0=hcdd998b_0 - - postgresql=16.1=hc6ab77f_0 + - poppler=23.12.0=hcdd998b_0 + - postgresql=16.1=hc6ab77f_2 - proj=9.3.0=h52fb9d0_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h4d1eceb_0 @@ -371,6 +372,7 @@ dependencies: - typing_inspect=0.9.0=pyhd8ed1ab_0 - universal_pathlib=0.1.4=pyhd8ed1ab_0 - urllib3=1.26.18=pyhd8ed1ab_0 + - virtualenv=20.25.0=pyhd8ed1ab_0 - watchdog=3.0.0=py311heffc1b2_1 - xerces-c=3.2.4=hd886eac_3 - yarl=1.9.3=py311h05b510d_0 @@ -381,10 +383,10 @@ 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.5=pyhd8ed1ab_0 + - botocore=1.33.6=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - - cryptography=41.0.5=py311h71175c2_0 + - cryptography=41.0.7=py311h08c85a6_1 - fqdn=1.5.1=pyhd8ed1ab_0 - geotiff=1.7.1=h71398c0_14 - gitpython=3.1.40=pyhd8ed1ab_0 @@ -394,9 +396,8 @@ dependencies: - graphql-relay=3.2.0=pyhd8ed1ab_0 - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - httpcore=1.0.2=pyhd8ed1ab_0 - - importlib_metadata=6.8.0=hd8ed1ab_0 + - importlib_metadata=7.0.0=hd8ed1ab_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 - libnetcdf=4.9.2=nompi_hb2fb864_112 @@ -421,24 +422,23 @@ 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.post1=py311h267d04e_0 - - virtualenv=20.24.7=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h94f323b_0 - aiohttp=3.8.6=py311h05b510d_1 - - alembic=1.12.1=pyhd8ed1ab_0 - - arelle-release=2.17.7=pyhd8ed1ab_0 + - alembic=1.13.0=pyhd8ed1ab_0 + - arelle-release=2.18.0=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - aws-sdk-cpp=1.11.182=h31542fa_7 - bottleneck=1.3.7=py311hb49d859_1 - cachecontrol=0.13.1=pyhd8ed1ab_0 - contourpy=1.2.0=py311hd03642b_0 - - dask-core=2023.11.0=pyhd8ed1ab_0 + - dask-core=2023.12.0=pyhd8ed1ab_0 - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - - folium=0.15.0=pyhd8ed1ab_0 + - folium=0.15.1=pyhd8ed1ab_0 - google-resumable-media=2.6.0=pyhd8ed1ab_0 - graphene=3.3=pyhd8ed1ab_0 - grpcio-status=1.59.2=pyhd8ed1ab_0 @@ -446,12 +446,12 @@ dependencies: - h3-py=3.7.6=py311ha891d26_1 - httpx=0.25.2=pyhd8ed1ab_0 - identify=2.5.32=pyhd8ed1ab_0 - - ipython=8.18.1=pyh31011fe_1 + - ipython=8.18.1=pyh31011fe_2 - isoduration=20.11.0=pyhd8ed1ab_0 - 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 @@ -471,14 +471,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.5=pyhd8ed1ab_0 + - boto3=1.33.6=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 + - gdal=3.8.1=py311h32a4f3d_1 - geopandas-base=0.14.1=pyha770c72_0 - google-auth=2.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 @@ -497,8 +497,8 @@ dependencies: - timezonefinder=6.2.0=py311h05b510d_2 - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.9=pyhd8ed1ab_0 - - dagster-postgres=0.21.9=pyhd8ed1ab_1 + - 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,23 +514,23 @@ 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 - libarrow-flight-sql=14.0.1=h660fe36_3_cpu - - nbconvert-core=7.11.0=pyhd8ed1ab_0 + - 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 - - jupyter_server=2.11.1=pyhd8ed1ab_0 + - jupyter_server=2.11.2=pyhd8ed1ab_0 - libarrow-substrait=14.0.1=h594d712_3_cpu - - nbconvert-pandoc=7.11.0=pyhd8ed1ab_0 - - gcsfs=2023.10.0=pyhd8ed1ab_0 + - nbconvert-pandoc=7.12.0=pyhd8ed1ab_0 + - gcsfs=2023.12.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 + - nbconvert=7.12.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - pyarrow=14.0.1=py311h637fcfe_3_cpu - jupyterlab=4.0.9=pyhd8ed1ab_0 From f0a75b74e8bc3d94e1efa2b909114897ab67ef78 Mon Sep 17 00:00:00 2001 From: bendnorman Date: Mon, 4 Dec 2023 16:08:58 -0900 Subject: [PATCH 41/47] Checkout env files from 7cc80dab59437b0dda3dbac3bed28be5f4e33858 [no ci] --- environments/conda-linux-64.lock.yml | 70 +- environments/conda-lock.yml | 974 +++++++++++++------------- environments/conda-osx-64.lock.yml | 70 +- environments/conda-osx-arm64.lock.yml | 70 +- 4 files changed, 592 insertions(+), 592 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index 2eec140474..3d6da6f452 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -62,7 +62,7 @@ dependencies: - lzo=2.10=h516909a_1000 - ncurses=6.4=h59595ed_2 - nspr=4.35=h27087fc_0 - - openssl=3.2.0=hd590300_1 + - openssl=3.1.4=hd590300_0 - pixman=0.42.2=h59595ed_0 - pthread-stubs=0.4=h36c2ea0_1001 - rdma-core=49.0=hd3aeb46_1 @@ -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.9=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - dbus=1.13.6=h5008d03_3 - debugpy=1.8.0=py311hb755f60_1 @@ -178,7 +178,7 @@ dependencies: - fontconfig=2.14.2=h14ed4e7_0 - freexl=2.0.0=h743c826_0 - frozenlist=1.4.0=py311h459d7ec_1 - - fsspec=2023.12.0=pyhca7485f_0 + - fsspec=2023.10.0=pyhca7485f_0 - gdk-pixbuf=2.42.10=h829c605_4 - google-cloud-sdk=455.0.0=py311h38be061_0 - greenlet=3.0.1=py311hb755f60_0 @@ -200,11 +200,11 @@ dependencies: - jsonpointer=2.4=py311h38be061_3 - jupyterlab_widgets=3.0.9=pyhd8ed1ab_0 - kiwisolver=1.4.5=py311h9547e67_1 - - lcms2=2.16=hb7c19ff_0 + - lcms2=2.15=hb7c19ff_3 - libblas=3.9.0=20_linux64_openblas - libcurl=8.4.0=hca28451_0 - libgrpc=1.59.2=hd6c4280_0 - - libpq=16.1=hfc447b1_2 + - libpq=16.1=hfc447b1_0 - libwebp=1.3.2=h658648e_1 - llvmlite=0.41.1=py311ha6695c7_0 - locket=1.0.0=pyhd8ed1ab_0 @@ -232,7 +232,6 @@ dependencies: - pickleshare=0.7.5=py_1003 - pkginfo=1.9.6=pyhd8ed1ab_0 - 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 - prometheus_client=0.19.0=pyhd8ed1ab_0 @@ -297,7 +296,7 @@ dependencies: - wcwidth=0.2.12=pyhd8ed1ab_0 - webcolors=1.13=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_2 - - websocket-client=1.7.0=pyhd8ed1ab_0 + - websocket-client=1.6.4=pyhd8ed1ab_0 - websockets=10.4=py311hd4cff14_1 - wheel=0.42.0=pyhd8ed1ab_0 - widgetsnbextension=4.0.9=pyhd8ed1ab_0 @@ -322,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.1=hbdc6101_0 + - cfitsio=4.3.0=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 @@ -332,7 +331,7 @@ dependencies: - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311h459d7ec_0 - curl=8.4.0=hca28451_0 - - fonttools=4.46.0=py311h459d7ec_0 + - fonttools=4.45.1=py311h459d7ec_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 - grpcio=1.59.2=py311ha6695c7_0 @@ -341,7 +340,7 @@ dependencies: - hdf5=1.14.2=nompi_h4f84152_100 - html5lib=1.1=pyh9f0ad1d_0 - hypothesis=6.91.0=pyha770c72_0 - - importlib-metadata=7.0.0=pyha770c72_0 + - importlib-metadata=6.8.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 - janus=1.0.0=pyhd8ed1ab_0 @@ -350,7 +349,6 @@ dependencies: - jinja2=3.1.2=pyhd8ed1ab_1 - joblib=1.3.2=pyhd8ed1ab_0 - jsonlines=4.0.0=pyhd8ed1ab_0 - - jupyter_core=5.5.0=py311h38be061_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - libcblas=3.9.0=20_linux64_openblas @@ -368,7 +366,8 @@ dependencies: - pillow=10.1.0=py311ha6c5da5_0 - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - - postgresql=16.1=h8972f4a_2 + - platformdirs=4.0.0=pyhd8ed1ab_0 + - postgresql=16.1=h8972f4a_0 - proj=9.3.0=h1d62c97_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h46cbc50_0 @@ -392,7 +391,6 @@ dependencies: - typing_inspect=0.9.0=pyhd8ed1ab_0 - universal_pathlib=0.1.4=pyhd8ed1ab_0 - urllib3=1.26.18=pyhd8ed1ab_0 - - virtualenv=20.25.0=pyhd8ed1ab_0 - watchdog=3.0.0=py311h38be061_1 - xerces-c=3.2.4=hac6953d_3 - yarl=1.9.3=py311h459d7ec_0 @@ -403,10 +401,10 @@ 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.6=pyhd8ed1ab_0 + - botocore=1.33.5=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - - cryptography=41.0.7=py311hcb13ee4_1 + - cryptography=41.0.5=py311h63ff55d_0 - fqdn=1.5.1=pyhd8ed1ab_0 - geotiff=1.7.1=hf074850_14 - gitpython=3.1.40=pyhd8ed1ab_0 @@ -417,8 +415,9 @@ dependencies: - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - harfbuzz=8.3.0=h3d44ed6_0 - httpcore=1.0.2=pyhd8ed1ab_0 - - importlib_metadata=7.0.0=hd8ed1ab_0 + - importlib_metadata=6.8.0=hd8ed1ab_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 - libnetcdf=4.9.2=nompi_h80fb2b6_112 @@ -427,7 +426,7 @@ dependencies: - numpy=1.26.2=py311h64a7726_0 - pbr=6.0.0=pyhd8ed1ab_0 - pendulum=2.1.2=py311h459d7ec_6 - - poppler=23.12.0=h590f24d_0 + - poppler=23.11.0=h590f24d_0 - prompt_toolkit=3.0.41=hd8ed1ab_0 - psycopg2-binary=2.9.7=pyhd8ed1ab_1 - pybtex=0.24.0=pyhd8ed1ab_2 @@ -442,34 +441,35 @@ dependencies: - rich=13.7.0=pyhd8ed1ab_0 - sqlalchemy=2.0.23=py311h459d7ec_0 - stack_data=0.6.2=pyhd8ed1ab_0 - - starlette=0.33.0=pyhd8ed1ab_0 + - starlette=0.32.0.post1=pyhd8ed1ab_0 - tiledb=2.16.3=h8c794c1_3 - ukkonen=1.0.1=py311h9547e67_4 - 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 - - alembic=1.13.0=pyhd8ed1ab_0 - - arelle-release=2.18.0=pyhd8ed1ab_0 + - alembic=1.12.1=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 - cachecontrol=0.13.1=pyhd8ed1ab_0 - contourpy=1.2.0=py311h9547e67_0 - - dask-core=2023.12.0=pyhd8ed1ab_0 + - dask-core=2023.11.0=pyhd8ed1ab_0 - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - - folium=0.15.1=pyhd8ed1ab_0 + - folium=0.15.0=pyhd8ed1ab_0 - google-resumable-media=2.6.0=pyhd8ed1ab_0 - graphene=3.3=pyhd8ed1ab_0 - grpcio-status=1.59.2=pyhd8ed1ab_0 - h3-py=3.7.6=py311hb755f60_1 - httpx=0.25.2=pyhd8ed1ab_0 - identify=2.5.32=pyhd8ed1ab_0 - - ipython=8.18.1=pyh31011fe_2 + - 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 - - libgdal=3.8.1=hcae7082_1 + - libgdal=3.8.0=he7dcfe9_6 - numba=0.58.1=py311h96b013e_0 - numexpr=2.8.7=py311h039bad6_104 - oauthlib=3.2.2=pyhd8ed1ab_0 @@ -490,14 +490,14 @@ 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.6=pyhd8ed1ab_0 + - boto3=1.33.5=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - - dagster=1.5.10=pyhd8ed1ab_0 + - dagster=1.5.9=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.0=py311h815a124_6 - geopandas-base=0.14.1=pyha770c72_0 - google-auth=2.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 @@ -517,8 +517,8 @@ dependencies: - timezonefinder=6.2.0=py311h459d7ec_2 - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.10=pyhd8ed1ab_0 - - dagster-postgres=0.21.10=pyhd8ed1ab_0 + - dagster-graphql=1.5.9=pyhd8ed1ab_0 + - dagster-postgres=0.21.9=pyhd8ed1ab_1 - fiona=1.9.5=py311hf8e0aa6_1 - google-api-core=2.14.0=pyhd8ed1ab_0 - google-auth-oauthlib=1.1.0=pyhd8ed1ab_0 @@ -531,28 +531,28 @@ 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.9=pyhd8ed1ab_0 - geopandas=0.14.1=pyhd8ed1ab_0 - google-cloud-core=2.3.3=pyhd8ed1ab_0 - libarrow-acero=14.0.1=h59595ed_3_cpu - libarrow-flight=14.0.1=h120cb0d_3_cpu - libarrow-gandiva=14.0.1=hacb8726_3_cpu - libparquet=14.0.1=h352af49_3_cpu - - nbconvert-core=7.12.0=pyhd8ed1ab_0 + - nbconvert-core=7.11.0=pyhd8ed1ab_0 - 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 - - jupyter_server=2.11.2=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.12.0=pyhd8ed1ab_0 - - gcsfs=2023.12.0=pyhd8ed1ab_0 + - nbconvert-pandoc=7.11.0=pyhd8ed1ab_0 + - gcsfs=2023.10.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 - - nbconvert=7.12.0=pyhd8ed1ab_0 + - nbconvert=7.11.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - jupyterlab=4.0.9=pyhd8ed1ab_0 - pyarrow=14.0.1=py311h39c9aba_3_cpu diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 4baf150d36..148e867498 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -266,7 +266,7 @@ package: category: main optional: false - name: alembic - version: 1.13.0 + version: 1.12.1 manager: conda platform: linux-64 dependencies: @@ -276,14 +276,14 @@ package: python: ">=3.7" sqlalchemy: ">=1.3.0" typing-extensions: ">=4" - url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.13.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.12.1-pyhd8ed1ab_0.conda hash: - md5: 7f0372c1cfa41891787ddf267334c0c7 - sha256: d6dd010632bc5272fe7e51646651c5fb9ae9b7663113b94aa585d6bcb43834b0 + md5: 15de9992b4096a2a6656ca202fde6e4c + sha256: 24019b1af4777e32843b230dd7a9bf7082943eb21bba03379ceed0bda50facf9 category: main optional: false - name: alembic - version: 1.13.0 + version: 1.12.1 manager: conda platform: osx-64 dependencies: @@ -293,14 +293,14 @@ package: python: ">=3.7" sqlalchemy: ">=1.3.0" typing-extensions: ">=4" - url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.13.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.12.1-pyhd8ed1ab_0.conda hash: - md5: 7f0372c1cfa41891787ddf267334c0c7 - sha256: d6dd010632bc5272fe7e51646651c5fb9ae9b7663113b94aa585d6bcb43834b0 + md5: 15de9992b4096a2a6656ca202fde6e4c + sha256: 24019b1af4777e32843b230dd7a9bf7082943eb21bba03379ceed0bda50facf9 category: main optional: false - name: alembic - version: 1.13.0 + version: 1.12.1 manager: conda platform: osx-arm64 dependencies: @@ -310,10 +310,10 @@ package: python: ">=3.7" sqlalchemy: ">=1.3.0" typing-extensions: ">=4" - url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.13.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.12.1-pyhd8ed1ab_0.conda hash: - md5: 7f0372c1cfa41891787ddf267334c0c7 - sha256: d6dd010632bc5272fe7e51646651c5fb9ae9b7663113b94aa585d6bcb43834b0 + md5: 15de9992b4096a2a6656ca202fde6e4c + sha256: 24019b1af4777e32843b230dd7a9bf7082943eb21bba03379ceed0bda50facf9 category: main optional: false - name: aniso8601 @@ -536,7 +536,7 @@ package: category: main optional: false - name: arelle-release - version: 2.18.0 + version: 2.17.7 manager: conda platform: linux-64 dependencies: @@ -549,50 +549,50 @@ 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.17.7-pyhd8ed1ab_0.conda hash: - md5: cf492dd79a1d1d1ef2af299da2a604ca - sha256: f3fa253f2a26faa56348acc2a76eaf55778f871b995af429c9636d9159a4b483 + md5: b42bbf2e318b6bbbd9de2d81ecf8ed50 + sha256: 3094446e601ad9160677c2bb5b75b9946c81b679bebf42bf52c126e71d76fb43 category: main optional: false - name: arelle-release - version: 2.18.0 + version: 2.17.7 manager: conda platform: osx-64 dependencies: certifi: "" regex: "" python: ">=3.8" - python-dateutil: 2.* numpy: 1.* + python-dateutil: 2.* isodate: 0.* 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.17.7-pyhd8ed1ab_0.conda hash: - md5: cf492dd79a1d1d1ef2af299da2a604ca - sha256: f3fa253f2a26faa56348acc2a76eaf55778f871b995af429c9636d9159a4b483 + md5: b42bbf2e318b6bbbd9de2d81ecf8ed50 + sha256: 3094446e601ad9160677c2bb5b75b9946c81b679bebf42bf52c126e71d76fb43 category: main optional: false - name: arelle-release - version: 2.18.0 + version: 2.17.7 manager: conda platform: osx-arm64 dependencies: certifi: "" regex: "" python: ">=3.8" - python-dateutil: 2.* numpy: 1.* + python-dateutil: 2.* isodate: 0.* 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.17.7-pyhd8ed1ab_0.conda hash: - md5: cf492dd79a1d1d1ef2af299da2a604ca - sha256: f3fa253f2a26faa56348acc2a76eaf55778f871b995af429c9636d9159a4b483 + 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.6 + version: 1.33.5 manager: conda platform: linux-64 dependencies: - botocore: ">=1.33.6,<1.34.0" + botocore: ">=1.33.5,<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.6-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.5-pyhd8ed1ab_0.conda hash: - md5: fff8f43d8786f4e2a0ab4ed431f8c511 - sha256: 7fad398c6730cb751de3495b8204a7cd133aeecdd684273bc3359f31e1c01eca + md5: 7485d3ee00269cd33baa2ad64a0923ee + sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 category: main optional: false - name: boto3 - version: 1.33.6 + version: 1.33.5 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.6,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.6-pyhd8ed1ab_0.conda + botocore: ">=1.33.5,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.5-pyhd8ed1ab_0.conda hash: - md5: fff8f43d8786f4e2a0ab4ed431f8c511 - sha256: 7fad398c6730cb751de3495b8204a7cd133aeecdd684273bc3359f31e1c01eca + md5: 7485d3ee00269cd33baa2ad64a0923ee + sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 category: main optional: false - name: boto3 - version: 1.33.6 + version: 1.33.5 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.6,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.6-pyhd8ed1ab_0.conda + botocore: ">=1.33.5,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.5-pyhd8ed1ab_0.conda hash: - md5: fff8f43d8786f4e2a0ab4ed431f8c511 - sha256: 7fad398c6730cb751de3495b8204a7cd133aeecdd684273bc3359f31e1c01eca + md5: 7485d3ee00269cd33baa2ad64a0923ee + sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 category: main optional: false - name: botocore - version: 1.33.6 + 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.6-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.5-pyhd8ed1ab_0.conda hash: - md5: e1c7565a0bfba34c3be07a3ad882356f - sha256: 06549a55df5711e0306395e8187f03c46f25337fb7e9ab6c014cf26a76ca9cef + md5: 352c39ba5cd9ea01996358f0748e102e + sha256: 56566ea8f3a48c24190c1dcf50681c0a84b26821c335c21b5c3c5d238e4bdb14 category: main optional: false - name: botocore - version: 1.33.6 + 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.6-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.5-pyhd8ed1ab_0.conda hash: - md5: e1c7565a0bfba34c3be07a3ad882356f - sha256: 06549a55df5711e0306395e8187f03c46f25337fb7e9ab6c014cf26a76ca9cef + md5: 352c39ba5cd9ea01996358f0748e102e + sha256: 56566ea8f3a48c24190c1dcf50681c0a84b26821c335c21b5c3c5d238e4bdb14 category: main optional: false - name: botocore - version: 1.33.6 + 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.6-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.5-pyhd8ed1ab_0.conda hash: - md5: e1c7565a0bfba34c3be07a3ad882356f - sha256: 06549a55df5711e0306395e8187f03c46f25337fb7e9ab6c014cf26a76ca9cef + md5: 352c39ba5cd9ea01996358f0748e102e + sha256: 56566ea8f3a48c24190c1dcf50681c0a84b26821c335c21b5c3c5d238e4bdb14 category: main optional: false - name: bottleneck @@ -2873,52 +2873,52 @@ package: category: main optional: false - name: cfitsio - version: 4.3.1 + version: 4.3.0 manager: conda platform: linux-64 dependencies: bzip2: ">=1.0.8,<2.0a0" - libcurl: ">=8.4.0,<9.0a0" + libcurl: ">=8.2.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.1-hbdc6101_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/cfitsio-4.3.0-hbdc6101_0.conda hash: - md5: dcea02841b33a9c49f74ca9328de919a - sha256: b91003bff71351a0132c84d69fbb5afcfa90e57d83f76a180c6a5a0289099fb1 + md5: 797554b8b7603011e8677884381fbcc5 + sha256: c74938f1ade9b8f37b9fa8cc98a5b9262b325506f41d7492ad1d00146e0f1d08 category: main optional: false - name: cfitsio - version: 4.3.1 + version: 4.3.0 manager: conda platform: osx-64 dependencies: bzip2: ">=1.0.8,<2.0a0" - libcurl: ">=8.4.0,<9.0a0" + libcurl: ">=8.2.0,<9.0a0" libgfortran: 5.* - libgfortran5: ">=13.2.0" + libgfortran5: ">=12.2.0" libzlib: ">=1.2.13,<1.3.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/cfitsio-4.3.1-h60fb419_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/cfitsio-4.3.0-h66f91ea_0.conda hash: - md5: 03ab895afe3804b527c12193a9612cac - sha256: 5bd157478529ff4d05b8e8654de0580609177252eb11ecf5201b831effeeb2ec + md5: f540472ad8a8ea2b39a4c6ca14ebc1b5 + sha256: 0246d80ce305609c7e810514d1aa578ef498a1f05fd2dba5fa46ea845e4e57b9 category: main optional: false - name: cfitsio - version: 4.3.1 + version: 4.3.0 manager: conda platform: osx-arm64 dependencies: bzip2: ">=1.0.8,<2.0a0" - libcurl: ">=8.4.0,<9.0a0" + libcurl: ">=8.2.0,<9.0a0" libgfortran: 5.* - libgfortran5: ">=13.2.0" + libgfortran5: ">=12.3.0" libzlib: ">=1.2.13,<1.3.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/cfitsio-4.3.1-h808cd33_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/cfitsio-4.3.0-hca87796_0.conda hash: - md5: 22b61b2ad129db82da2eee76710f7551 - sha256: 9395bd24ef552ac6063e2d6a6fc57e5c7067a74b8d8ee3f06d8389baffacf016 + md5: a5a1019a6405052124e97999a5204a74 + sha256: 5d03f8d484d29f8d3bdd64afe22ed29d75c639834b40382f8a520f96a7af27c4 category: main optional: false - name: chardet @@ -3658,7 +3658,7 @@ package: category: main optional: false - name: cryptography - version: 41.0.7 + version: 41.0.5 manager: conda platform: linux-64 dependencies: @@ -3667,14 +3667,14 @@ package: openssl: ">=3.1.4,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-41.0.7-py311hcb13ee4_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-41.0.5-py311h63ff55d_0.conda hash: - md5: ca6e04ac7262ecaec846e483d6fdc6c8 - sha256: 0959d015727ae5f55f385556a0a19b9f6036752ea05f78a99cb534803e325cab + md5: 22584e5c97ed8f1a6b63a0ff43dba827 + sha256: 236ed2218fb857fecaa11fc7fee23574f683b3d03576f8f26f628b7fd2ced5fa category: main optional: false - name: cryptography - version: 41.0.7 + version: 41.0.5 manager: conda platform: osx-64 dependencies: @@ -3682,14 +3682,14 @@ package: openssl: ">=3.1.4,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/cryptography-41.0.7-py311h48c7838_1.conda + url: https://conda.anaconda.org/conda-forge/osx-64/cryptography-41.0.5-py311hd51016d_0.conda hash: - md5: 65293feff96135571de02c047ecbd5a2 - sha256: f4c5e683386acf06cfa85805d264c9cd540361ec6e86740cb03312e560aa706a + md5: 99f1edef251a9fe4edf620b527ee70ea + sha256: 26ee22b99771f0d338eca6299cbe866f695c544d855d5eab82539497b0a24fc1 category: main optional: false - name: cryptography - version: 41.0.7 + version: 41.0.5 manager: conda platform: osx-arm64 dependencies: @@ -3697,10 +3697,10 @@ package: openssl: ">=3.1.4,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/cryptography-41.0.7-py311h08c85a6_1.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/cryptography-41.0.5-py311h71175c2_0.conda hash: - md5: 729546a91873db64ab8e675008845fb5 - sha256: 9d51ba743069d19aae08361a7b051ca1f281fb3b3ccb162e96c2503cf5a7d365 + md5: adc55f424334b834098d50e57efe0789 + sha256: 00c9b389b51b6e951a1f639aa04dceca9e329e144275c79b4f6baacd3fb90345 category: main optional: false - name: curl @@ -3792,7 +3792,7 @@ package: category: main optional: false - name: dagster - version: 1.5.10 + version: 1.5.9 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.9,<1.5.10.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.9-pyhd8ed1ab_0.conda hash: - md5: bcf42b675edb2999669116bc3b1ed789 - sha256: dcee8473cbd1823005285f5fc82fbb16d9d1b2b46bcdf8371ee4fe2fdb0ad50c + md5: d8ab27112f82687ffcd456a3b88092e5 + sha256: 238b08bf9afbc98405cb0c8c9845514da7b4b21aac5817c2b5f0de04e3a19b1b category: main optional: false - name: dagster - version: 1.5.10 + version: 1.5.9 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.9,<1.5.10.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.9-pyhd8ed1ab_0.conda hash: - md5: bcf42b675edb2999669116bc3b1ed789 - sha256: dcee8473cbd1823005285f5fc82fbb16d9d1b2b46bcdf8371ee4fe2fdb0ad50c + md5: d8ab27112f82687ffcd456a3b88092e5 + sha256: 238b08bf9afbc98405cb0c8c9845514da7b4b21aac5817c2b5f0de04e3a19b1b category: main optional: false - name: dagster - version: 1.5.10 + version: 1.5.9 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.9,<1.5.10.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-1.5.9-pyhd8ed1ab_0.conda hash: - md5: bcf42b675edb2999669116bc3b1ed789 - sha256: dcee8473cbd1823005285f5fc82fbb16d9d1b2b46bcdf8371ee4fe2fdb0ad50c + md5: d8ab27112f82687ffcd456a3b88092e5 + sha256: 238b08bf9afbc98405cb0c8c9845514da7b4b21aac5817c2b5f0de04e3a19b1b category: main optional: false - name: dagster-graphql - version: 1.5.10 + version: 1.5.9 manager: conda platform: linux-64 dependencies: - dagster: ">=1.5.10,<1.5.11.0a0" + dagster: ">=1.5.9,<1.5.10.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.9-pyhd8ed1ab_0.conda hash: - md5: fd3569582db65a0c88fbc7d1bb803853 - sha256: a142f082da2b7905713b09e0ad19eef971a5d4f66063ba7a2b19247e3932e129 + md5: 7dcd105a5451f9800aa6de278d86db72 + sha256: 8484c6b0db1a3505fc7d16e83e0da75b9c886ae3d497266fd06f72fcd3246786 category: dev optional: true - name: dagster-graphql - version: 1.5.10 + version: 1.5.9 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.9,<1.5.10.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.9-pyhd8ed1ab_0.conda hash: - md5: fd3569582db65a0c88fbc7d1bb803853 - sha256: a142f082da2b7905713b09e0ad19eef971a5d4f66063ba7a2b19247e3932e129 + md5: 7dcd105a5451f9800aa6de278d86db72 + sha256: 8484c6b0db1a3505fc7d16e83e0da75b9c886ae3d497266fd06f72fcd3246786 category: dev optional: true - name: dagster-graphql - version: 1.5.10 + version: 1.5.9 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.9,<1.5.10.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/dagster-graphql-1.5.9-pyhd8ed1ab_0.conda hash: - md5: fd3569582db65a0c88fbc7d1bb803853 - sha256: a142f082da2b7905713b09e0ad19eef971a5d4f66063ba7a2b19247e3932e129 + md5: 7dcd105a5451f9800aa6de278d86db72 + sha256: 8484c6b0db1a3505fc7d16e83e0da75b9c886ae3d497266fd06f72fcd3246786 category: dev optional: true - name: dagster-pipes - version: 1.5.10 + version: 1.5.9 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.9-pyhd8ed1ab_0.conda hash: - md5: 69600c68efc23fb84c05c2e9c1c05947 - sha256: a98a8b2501af4bc112d5b2f5e3edea6c22a084651cc720786c405877b8507630 + md5: 0a9787859365c4d2425e589ac53c462b + sha256: eebc7dca517350678ebfb8b3fff7ec47c60aff62dae2e69b8c4845b6080ec3e8 category: main optional: false - name: dagster-pipes - version: 1.5.10 + version: 1.5.9 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.9-pyhd8ed1ab_0.conda hash: - md5: 69600c68efc23fb84c05c2e9c1c05947 - sha256: a98a8b2501af4bc112d5b2f5e3edea6c22a084651cc720786c405877b8507630 + md5: 0a9787859365c4d2425e589ac53c462b + sha256: eebc7dca517350678ebfb8b3fff7ec47c60aff62dae2e69b8c4845b6080ec3e8 category: main optional: false - name: dagster-pipes - version: 1.5.10 + version: 1.5.9 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.9-pyhd8ed1ab_0.conda hash: - md5: 69600c68efc23fb84c05c2e9c1c05947 - sha256: a98a8b2501af4bc112d5b2f5e3edea6c22a084651cc720786c405877b8507630 + md5: 0a9787859365c4d2425e589ac53c462b + sha256: eebc7dca517350678ebfb8b3fff7ec47c60aff62dae2e69b8c4845b6080ec3e8 category: main optional: false - name: dagster-postgres - version: 0.21.10 + version: 0.21.9 manager: conda platform: linux-64 dependencies: - dagster: 1.5.10.* + dagster: 1.5.9.* 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.9-pyhd8ed1ab_1.conda hash: - md5: ec155b3a7172590ccbc89f461427b5aa - sha256: 4eb986655ef547d4dc72cd34b60687c9c3c390806493c15187c4d26d89d58fc0 + md5: 8c1a941fe77b920b1c7933a7a0c6bf2e + sha256: 0e947f376d6878bd8e505932277e84c373da492a38d2c4ef9d96fc25f5327845 category: main optional: false - name: dagster-postgres - version: 0.21.10 + version: 0.21.9 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.9.* + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.9-pyhd8ed1ab_1.conda hash: - md5: ec155b3a7172590ccbc89f461427b5aa - sha256: 4eb986655ef547d4dc72cd34b60687c9c3c390806493c15187c4d26d89d58fc0 + md5: 8c1a941fe77b920b1c7933a7a0c6bf2e + sha256: 0e947f376d6878bd8e505932277e84c373da492a38d2c4ef9d96fc25f5327845 category: main optional: false - name: dagster-postgres - version: 0.21.10 + version: 0.21.9 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.9.* + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.9-pyhd8ed1ab_1.conda hash: - md5: ec155b3a7172590ccbc89f461427b5aa - sha256: 4eb986655ef547d4dc72cd34b60687c9c3c390806493c15187c4d26d89d58fc0 + md5: 8c1a941fe77b920b1c7933a7a0c6bf2e + sha256: 0e947f376d6878bd8e505932277e84c373da492a38d2c4ef9d96fc25f5327845 category: main optional: false - name: dagster-webserver - version: 1.5.10 + version: 1.5.9 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.9,<1.5.10.0a0" + dagster-graphql: ">=1.5.9,<1.5.10.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.9-pyhd8ed1ab_0.conda hash: - md5: 6161623733c03c21098dce0af904ea6b - sha256: 975173f6a39f40d5fa505354007200741689714bb1eaf1cba8e52fab1a2bfc88 + md5: 880fa7acdbf3494cef45759bb866bb63 + sha256: 2fce08b607d97f72d7452350a0c917d96419074381bf8791ebe116ec3a57b8f4 category: dev optional: true - name: dagster-webserver - version: 1.5.10 + version: 1.5.9 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.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 hash: - md5: 6161623733c03c21098dce0af904ea6b - sha256: 975173f6a39f40d5fa505354007200741689714bb1eaf1cba8e52fab1a2bfc88 + md5: 880fa7acdbf3494cef45759bb866bb63 + sha256: 2fce08b607d97f72d7452350a0c917d96419074381bf8791ebe116ec3a57b8f4 category: dev optional: true - name: dagster-webserver - version: 1.5.10 + version: 1.5.9 manager: conda platform: osx-arm64 dependencies: @@ -4086,16 +4086,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.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 hash: - md5: 6161623733c03c21098dce0af904ea6b - sha256: 975173f6a39f40d5fa505354007200741689714bb1eaf1cba8e52fab1a2bfc88 + md5: 880fa7acdbf3494cef45759bb866bb63 + sha256: 2fce08b607d97f72d7452350a0c917d96419074381bf8791ebe116ec3a57b8f4 category: dev optional: true - name: dask-core - version: 2023.12.0 + version: 2023.11.0 manager: conda platform: linux-64 dependencies: @@ -4108,14 +4108,14 @@ package: python: ">=3.9" pyyaml: ">=5.3.1" toolz: ">=0.10.0" - url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.12.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.11.0-pyhd8ed1ab_0.conda hash: - md5: 95eae0785aed72998493140dc0115382 - sha256: e366163aa7325d14ca38ca72ca4672eeb4b7a7453573c47cfa90d0db60136b48 + md5: 3bf8f5c3fbab9e0cfffdf5914f021854 + sha256: f23b4e5d8f118d9d7916d8def04dab9a299d73879216da72dd7168c1c30ecb9e category: main optional: false - name: dask-core - version: 2023.12.0 + version: 2023.11.0 manager: conda platform: osx-64 dependencies: @@ -4128,14 +4128,14 @@ package: importlib_metadata: ">=4.13.0" fsspec: ">=2021.09.0" click: ">=8.1" - url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.12.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.11.0-pyhd8ed1ab_0.conda hash: - md5: 95eae0785aed72998493140dc0115382 - sha256: e366163aa7325d14ca38ca72ca4672eeb4b7a7453573c47cfa90d0db60136b48 + md5: 3bf8f5c3fbab9e0cfffdf5914f021854 + sha256: f23b4e5d8f118d9d7916d8def04dab9a299d73879216da72dd7168c1c30ecb9e category: main optional: false - name: dask-core - version: 2023.12.0 + version: 2023.11.0 manager: conda platform: osx-arm64 dependencies: @@ -4148,10 +4148,10 @@ package: importlib_metadata: ">=4.13.0" fsspec: ">=2021.09.0" click: ">=8.1" - url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.12.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.11.0-pyhd8ed1ab_0.conda hash: - md5: 95eae0785aed72998493140dc0115382 - sha256: e366163aa7325d14ca38ca72ca4672eeb4b7a7453573c47cfa90d0db60136b48 + md5: 3bf8f5c3fbab9e0cfffdf5914f021854 + sha256: f23b4e5d8f118d9d7916d8def04dab9a299d73879216da72dd7168c1c30ecb9e category: main optional: false - name: dataclasses @@ -4528,8 +4528,8 @@ package: dependencies: sniffio: "" python: ">=3.8.0,<4.0.0" - httpcore: ">=0.17.3" cryptography: ">=2.6,<42.0" + httpcore: ">=0.17.3" idna: ">=2.1,<4.0" url: https://conda.anaconda.org/conda-forge/noarch/dnspython-2.4.2-pyhd8ed1ab_1.conda hash: @@ -4544,8 +4544,8 @@ package: dependencies: sniffio: "" python: ">=3.8.0,<4.0.0" - httpcore: ">=0.17.3" cryptography: ">=2.6,<42.0" + httpcore: ">=0.17.3" idna: ">=2.1,<4.0" url: https://conda.anaconda.org/conda-forge/noarch/dnspython-2.4.2-pyhd8ed1ab_1.conda hash: @@ -5104,7 +5104,7 @@ package: category: main optional: false - name: folium - version: 0.15.1 + version: 0.15.0 manager: conda platform: linux-64 dependencies: @@ -5113,45 +5113,42 @@ package: numpy: "" python: ">=3.7" requests: "" - xyzservices: "" - url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.0-pyhd8ed1ab_0.conda hash: - md5: 4fdfc338f6fb875b1078a7e20dbc99e2 - sha256: c0730ddfaf35e39ac92b7fd07315843e7948b2ce3361d164ec1b722dd0440c2b + md5: 25f5dbce4f946240dea7d2ee79d34254 + sha256: afe869f136fca1dbda8be0c342392fda99d951c4c4612f134a70efbf5449ef30 category: main optional: false - name: folium - version: 0.15.1 + version: 0.15.0 manager: conda platform: osx-64 dependencies: numpy: "" requests: "" - xyzservices: "" python: ">=3.7" jinja2: ">=2.9" branca: ">=0.7.0" - url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.0-pyhd8ed1ab_0.conda hash: - md5: 4fdfc338f6fb875b1078a7e20dbc99e2 - sha256: c0730ddfaf35e39ac92b7fd07315843e7948b2ce3361d164ec1b722dd0440c2b + md5: 25f5dbce4f946240dea7d2ee79d34254 + sha256: afe869f136fca1dbda8be0c342392fda99d951c4c4612f134a70efbf5449ef30 category: main optional: false - name: folium - version: 0.15.1 + version: 0.15.0 manager: conda platform: osx-arm64 dependencies: numpy: "" requests: "" - xyzservices: "" python: ">=3.7" jinja2: ">=2.9" branca: ">=0.7.0" - url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.0-pyhd8ed1ab_0.conda hash: - md5: 4fdfc338f6fb875b1078a7e20dbc99e2 - sha256: c0730ddfaf35e39ac92b7fd07315843e7948b2ce3361d164ec1b722dd0440c2b + md5: 25f5dbce4f946240dea7d2ee79d34254 + sha256: afe869f136fca1dbda8be0c342392fda99d951c4c4612f134a70efbf5449ef30 category: main optional: false - name: font-ttf-dejavu-sans-mono @@ -5412,7 +5409,7 @@ package: category: main optional: false - name: fonttools - version: 4.46.0 + version: 4.45.1 manager: conda platform: linux-64 dependencies: @@ -5421,14 +5418,14 @@ package: munkres: "" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.46.0-py311h459d7ec_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.45.1-py311h459d7ec_0.conda hash: - md5: a14114f70e23f7fd5ab9941fec45b095 - sha256: a40f8415d9ceaf5f217034814b984d13017e4dab577085a83a2d0cc39b9d7239 + md5: 5b24692ece82f89e5cb9a469d9619731 + sha256: 57d311f86568d46f33845ea8c7d1c9e449a1fa85e510baa17f09e2cae2283681 category: main optional: false - name: fonttools - version: 4.46.0 + version: 4.45.1 manager: conda platform: osx-64 dependencies: @@ -5436,14 +5433,14 @@ package: munkres: "" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/fonttools-4.46.0-py311he705e18_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/fonttools-4.45.1-py311he705e18_0.conda hash: - md5: c68a6370b0db24b87be1a4cd7a511545 - sha256: 05c4b4fe22ce74bd5145dacf261cec44bbadac82d1e65a0b3a03d2675330f1bb + md5: 2910a2886c556ce4085fd59d73ae96f2 + sha256: 5a60241d7585b33160c169ae59b9bd9445c89bfb4604b2d77e7a0db48c04ccc5 category: main optional: false - name: fonttools - version: 4.46.0 + version: 4.45.1 manager: conda platform: osx-arm64 dependencies: @@ -5451,10 +5448,10 @@ package: munkres: "" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/fonttools-4.46.0-py311h05b510d_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/fonttools-4.45.1-py311h05b510d_0.conda hash: - md5: 1bac60f34700b22c8e8364f32b502211 - sha256: 300d8cc1cc987ab913e3b24c38f8eaf679acff0e885747a3f71471fd92db3e33 + md5: 40c7471beb6af15161a202c0ddf04d82 + sha256: 7d8d2c8de468dc5a432e8d083f3b56eeec4380749bcfd09a44c81d42cacceece category: main optional: false - name: fqdn @@ -5738,39 +5735,39 @@ package: category: main optional: false - name: fsspec - version: 2023.12.0 + version: 2023.10.0 manager: conda platform: linux-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.0-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.10.0-pyhca7485f_0.conda hash: - md5: 036539452871d3b0906ff194ad808c9b - sha256: 72c84d372aa5d60eb31c53c108bacefb0c6fb854047441b543738e144f1fae65 + md5: 5b86cf1ceaaa9be2ec4627377e538db1 + sha256: 1bbdfadb93cc768252fd207dca406cde928f9a81ff985ea1760b6539c55923e6 category: main optional: false - name: fsspec - version: 2023.12.0 + version: 2023.10.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.0-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.10.0-pyhca7485f_0.conda hash: - md5: 036539452871d3b0906ff194ad808c9b - sha256: 72c84d372aa5d60eb31c53c108bacefb0c6fb854047441b543738e144f1fae65 + md5: 5b86cf1ceaaa9be2ec4627377e538db1 + sha256: 1bbdfadb93cc768252fd207dca406cde928f9a81ff985ea1760b6539c55923e6 category: main optional: false - name: fsspec - version: 2023.12.0 + version: 2023.10.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.0-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.10.0-pyhca7485f_0.conda hash: - md5: 036539452871d3b0906ff194ad808c9b - sha256: 72c84d372aa5d60eb31c53c108bacefb0c6fb854047441b543738e144f1fae65 + md5: 5b86cf1ceaaa9be2ec4627377e538db1 + sha256: 1bbdfadb93cc768252fd207dca406cde928f9a81ff985ea1760b6539c55923e6 category: main optional: false - name: furo @@ -5822,26 +5819,26 @@ package: category: main optional: false - name: gcsfs - version: 2023.12.0 + version: 2023.10.0 manager: conda platform: linux-64 dependencies: aiohttp: "" decorator: ">4.1.2" - fsspec: 2023.12.0 + fsspec: 2023.10.0 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.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.10.0-pyhd8ed1ab_0.conda hash: - md5: ad178e852250983982f3e2247635029d - sha256: 39dfbcb02360069206835f395cc0f169ead32005ff0c941a73526cdcfc18cd4b + md5: 500521931bdcc0f6d19c1c2e2ab4a5d9 + sha256: dd7559c5297359e475a125742e9cb30938579e93a17ce7537af64a04c98407a5 category: main optional: false - name: gcsfs - version: 2023.12.0 + version: 2023.10.0 manager: conda platform: osx-64 dependencies: @@ -5852,15 +5849,15 @@ package: google-auth: ">=1.2" decorator: ">4.1.2" google-cloud-storage: ">1.40" - fsspec: 2023.12.0 - url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.12.0-pyhd8ed1ab_0.conda + fsspec: 2023.10.0 + url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.10.0-pyhd8ed1ab_0.conda hash: - md5: ad178e852250983982f3e2247635029d - sha256: 39dfbcb02360069206835f395cc0f169ead32005ff0c941a73526cdcfc18cd4b + md5: 500521931bdcc0f6d19c1c2e2ab4a5d9 + sha256: dd7559c5297359e475a125742e9cb30938579e93a17ce7537af64a04c98407a5 category: main optional: false - name: gcsfs - version: 2023.12.0 + version: 2023.10.0 manager: conda platform: osx-arm64 dependencies: @@ -5871,71 +5868,71 @@ package: google-auth: ">=1.2" decorator: ">4.1.2" google-cloud-storage: ">1.40" - fsspec: 2023.12.0 - url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.12.0-pyhd8ed1ab_0.conda + fsspec: 2023.10.0 + url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.10.0-pyhd8ed1ab_0.conda hash: - md5: ad178e852250983982f3e2247635029d - sha256: 39dfbcb02360069206835f395cc0f169ead32005ff0c941a73526cdcfc18cd4b + md5: 500521931bdcc0f6d19c1c2e2ab4a5d9 + sha256: dd7559c5297359e475a125742e9cb30938579e93a17ce7537af64a04c98407a5 category: main optional: false - name: gdal - version: 3.8.1 + version: 3.8.0 manager: conda platform: linux-64 dependencies: hdf5: ">=1.14.2,<1.14.3.0a0" libgcc-ng: ">=12" - libgdal: 3.8.1 + libgdal: 3.8.0 libstdcxx-ng: ">=12" libxml2: ">=2.11.6,<2.12.0a0" numpy: ">=1.23.5,<2.0a0" - openssl: ">=3.2.0,<4.0a0" + openssl: ">=3.1.4,<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.0-py311h815a124_6.conda hash: - md5: 6e9577466e5f1d18bd659746a5d948b7 - sha256: 6f1de976174089589b1ff7a6dd0d627f107f051a15cb046cb4703c0fc18480e3 + md5: a20379b7539caea4fd3ba6628d862138 + sha256: 7aab0e96f76d15a35b78704d13523f234a47cd8c653d8085c1219a8d7d45ef22 category: main optional: false - name: gdal - version: 3.8.1 + version: 3.8.0 manager: conda platform: osx-64 dependencies: __osx: ">=10.9" hdf5: ">=1.14.2,<1.14.3.0a0" libcxx: ">=16.0.6" - libgdal: 3.8.1 + libgdal: 3.8.0 libxml2: ">=2.11.6,<2.12.0a0" numpy: ">=1.23.5,<2.0a0" - openssl: ">=3.2.0,<4.0a0" + openssl: ">=3.1.4,<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.0-py311h5646c56_6.conda hash: - md5: 040c7cfdae3033444b9f193f9ac7dda2 - sha256: dc12757089d571dc33a5be6428bb50374fcfe2839230d8bc2b6aecf019545e64 + md5: 1cb3c8b063c0aca152dd7d7045e8ec2e + sha256: b9428ade4519d84f5ef68174f403cac65ee8d44ba10992809ea54ac56508457b category: main optional: false - name: gdal - version: 3.8.1 + version: 3.8.0 manager: conda platform: osx-arm64 dependencies: __osx: ">=10.9" hdf5: ">=1.14.2,<1.14.3.0a0" libcxx: ">=16.0.6" - libgdal: 3.8.1 + libgdal: 3.8.0 libxml2: ">=2.11.6,<2.12.0a0" numpy: ">=1.23.5,<2.0a0" - openssl: ">=3.2.0,<4.0a0" + openssl: ">=3.1.4,<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.0-py311h32a4f3d_6.conda hash: - md5: 22050ed6dfba916d82f470c4e5c820e9 - sha256: f6f8555e164a37371dc729b9aa0773e60716218ed706cd621b3f5cbfbe2ea51e + md5: b266b8795152cc1dfc9296ac95cb60ad + sha256: f8d113f50e12756c4b6640a8f70b2bccc54cc2e1a29b11f5e3cb3e4671d259be category: main optional: false - name: gdk-pixbuf @@ -8295,78 +8292,78 @@ package: category: main optional: false - name: importlib-metadata - version: 7.0.0 + version: 6.8.0 manager: conda platform: linux-64 dependencies: python: ">=3.8" zipp: ">=0.5" - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-7.0.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.8.0-pyha770c72_0.conda hash: - md5: a941237cd06538837b25cd245fcd25d8 - sha256: 9731e82a00d36b182dc515e31723e711ac82890bb1ca86c6a17a4b471135564f + md5: 4e9f59a060c3be52bc4ddc46ee9b6946 + sha256: 2797ed927d65324309b6c630190d917b9f2111e0c217b721f80429aeb57f9fcf category: main optional: false - name: importlib-metadata - version: 7.0.0 + version: 6.8.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" zipp: ">=0.5" - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-7.0.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.8.0-pyha770c72_0.conda hash: - md5: a941237cd06538837b25cd245fcd25d8 - sha256: 9731e82a00d36b182dc515e31723e711ac82890bb1ca86c6a17a4b471135564f + md5: 4e9f59a060c3be52bc4ddc46ee9b6946 + sha256: 2797ed927d65324309b6c630190d917b9f2111e0c217b721f80429aeb57f9fcf category: main optional: false - name: importlib-metadata - version: 7.0.0 + version: 6.8.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" zipp: ">=0.5" - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-7.0.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.8.0-pyha770c72_0.conda hash: - md5: a941237cd06538837b25cd245fcd25d8 - sha256: 9731e82a00d36b182dc515e31723e711ac82890bb1ca86c6a17a4b471135564f + md5: 4e9f59a060c3be52bc4ddc46ee9b6946 + sha256: 2797ed927d65324309b6c630190d917b9f2111e0c217b721f80429aeb57f9fcf category: main optional: false - name: importlib_metadata - version: 7.0.0 + version: 6.8.0 manager: conda platform: linux-64 dependencies: - importlib-metadata: ">=7.0.0,<7.0.1.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-7.0.0-hd8ed1ab_0.conda + importlib-metadata: ">=6.8.0,<6.8.1.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.8.0-hd8ed1ab_0.conda hash: - md5: 12aff14f84c337be5e5636bf612f4140 - sha256: b9e8ed41df6c55222e3777f422e77a22a6a19ff779b2e65aa8dfdea792c1f7de + md5: b279b07ce18058034e5b3606ba103a8b + sha256: b96e01dc42d547d6d9ceb1c5b52a5232cc04e40153534350f702c3e0418a6b3f category: main optional: false - name: importlib_metadata - version: 7.0.0 + version: 6.8.0 manager: conda platform: osx-64 dependencies: - importlib-metadata: ">=7.0.0,<7.0.1.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-7.0.0-hd8ed1ab_0.conda + importlib-metadata: ">=6.8.0,<6.8.1.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.8.0-hd8ed1ab_0.conda hash: - md5: 12aff14f84c337be5e5636bf612f4140 - sha256: b9e8ed41df6c55222e3777f422e77a22a6a19ff779b2e65aa8dfdea792c1f7de + md5: b279b07ce18058034e5b3606ba103a8b + sha256: b96e01dc42d547d6d9ceb1c5b52a5232cc04e40153534350f702c3e0418a6b3f category: main optional: false - name: importlib_metadata - version: 7.0.0 + version: 6.8.0 manager: conda platform: osx-arm64 dependencies: - importlib-metadata: ">=7.0.0,<7.0.1.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-7.0.0-hd8ed1ab_0.conda + importlib-metadata: ">=6.8.0,<6.8.1.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.8.0-hd8ed1ab_0.conda hash: - md5: 12aff14f84c337be5e5636bf612f4140 - sha256: b9e8ed41df6c55222e3777f422e77a22a6a19ff779b2e65aa8dfdea792c1f7de + md5: b279b07ce18058034e5b3606ba103a8b + sha256: b96e01dc42d547d6d9ceb1c5b52a5232cc04e40153534350f702c3e0418a6b3f category: main optional: false - name: importlib_resources @@ -8533,16 +8530,16 @@ package: matplotlib-inline: "" pexpect: ">4.3" pickleshare: "" - prompt-toolkit: ">=3.0.41,<3.1.0" + 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.1-pyh31011fe_2.conda + url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_1.conda hash: - md5: 5e23d20fc6e33061c063220146579990 - sha256: c956b70ed41b7f61a780a7e584f03f68e7e5073c8c138960bfbc5e705d9124b1 + md5: ac2f9c2e10c2e90e8d135cef51f9753a + sha256: 67490e640faa372d663a5c5cd2d61f417cce22a019a4de82a9e5ddb1cf2ee181 category: main optional: false - name: ipython @@ -8562,11 +8559,11 @@ package: traitlets: ">=5" jedi: ">=0.16" pexpect: ">4.3" - prompt-toolkit: ">=3.0.41,<3.1.0" - url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_2.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: 5e23d20fc6e33061c063220146579990 - sha256: c956b70ed41b7f61a780a7e584f03f68e7e5073c8c138960bfbc5e705d9124b1 + md5: ac2f9c2e10c2e90e8d135cef51f9753a + sha256: 67490e640faa372d663a5c5cd2d61f417cce22a019a4de82a9e5ddb1cf2ee181 category: main optional: false - name: ipython @@ -8586,11 +8583,11 @@ package: traitlets: ">=5" jedi: ">=0.16" pexpect: ">4.3" - prompt-toolkit: ">=3.0.41,<3.1.0" - url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_2.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: 5e23d20fc6e33061c063220146579990 - sha256: c956b70ed41b7f61a780a7e584f03f68e7e5073c8c138960bfbc5e705d9124b1 + md5: ac2f9c2e10c2e90e8d135cef51f9753a + sha256: 67490e640faa372d663a5c5cd2d61f417cce22a019a4de82a9e5ddb1cf2ee181 category: main optional: false - name: ipywidgets @@ -9376,8 +9373,8 @@ package: dependencies: ipywidgets: "" notebook: "" - nbconvert: "" ipykernel: "" + nbconvert: "" qtconsole-base: "" jupyter_console: "" python: ">=3.6" @@ -9394,8 +9391,8 @@ package: dependencies: ipywidgets: "" notebook: "" - nbconvert: "" ipykernel: "" + nbconvert: "" qtconsole-base: "" jupyter_console: "" python: ">=3.6" @@ -9709,7 +9706,7 @@ package: category: main optional: false - name: jupyter_server - version: 2.11.2 + version: 2.11.1 manager: conda platform: linux-64 dependencies: @@ -9732,14 +9729,14 @@ package: tornado: ">=6.2.0" traitlets: ">=5.6.0" websocket-client: "" - url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.11.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.11.1-pyhd8ed1ab_0.conda hash: - md5: c831341804aecf5abcdbb348be301f92 - sha256: 9e56c09fa7f4b95aab30b51008416d041c53cfd94ef3a4abc339d1eabb015df2 + md5: 0699b715659c026f7f81c27d0e744205 + sha256: 605825c0e2d5af7935b37319b9a46ff39e081e7a0f4dc973f0dd583f41c69ce5 category: main optional: false - name: jupyter_server - version: 2.11.2 + version: 2.11.1 manager: conda platform: osx-64 dependencies: @@ -9762,14 +9759,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.11.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.11.1-pyhd8ed1ab_0.conda hash: - md5: c831341804aecf5abcdbb348be301f92 - sha256: 9e56c09fa7f4b95aab30b51008416d041c53cfd94ef3a4abc339d1eabb015df2 + md5: 0699b715659c026f7f81c27d0e744205 + sha256: 605825c0e2d5af7935b37319b9a46ff39e081e7a0f4dc973f0dd583f41c69ce5 category: main optional: false - name: jupyter_server - version: 2.11.2 + version: 2.11.1 manager: conda platform: osx-arm64 dependencies: @@ -9792,10 +9789,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.11.2-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.11.1-pyhd8ed1ab_0.conda hash: - md5: c831341804aecf5abcdbb348be301f92 - sha256: 9e56c09fa7f4b95aab30b51008416d041c53cfd94ef3a4abc339d1eabb015df2 + md5: 0699b715659c026f7f81c27d0e744205 + sha256: 605825c0e2d5af7935b37319b9a46ff39e081e7a0f4dc973f0dd583f41c69ce5 category: main optional: false - name: jupyter_server_terminals @@ -9874,8 +9871,8 @@ package: ipykernel: "" jupyter_core: "" python: ">=3.8" - tornado: ">=6.2.0" jinja2: ">=3.0.3" + tornado: ">=6.2.0" importlib_metadata: ">=4.8.3" jupyter_server: ">=2.4.0,<3" importlib_resources: ">=1.4" @@ -9900,8 +9897,8 @@ package: ipykernel: "" jupyter_core: "" python: ">=3.8" - tornado: ">=6.2.0" jinja2: ">=3.0.3" + tornado: ">=6.2.0" importlib_metadata: ">=4.8.3" jupyter_server: ">=2.4.0,<3" importlib_resources: ">=1.4" @@ -10276,43 +10273,43 @@ package: category: main optional: false - name: lcms2 - version: "2.16" + version: "2.15" manager: conda platform: linux-64 dependencies: libgcc-ng: ">=12" libjpeg-turbo: ">=3.0.0,<4.0a0" libtiff: ">=4.6.0,<4.7.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.16-hb7c19ff_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.15-hb7c19ff_3.conda hash: - md5: 51bb7010fc86f70eee639b4bb7a894f5 - sha256: 5c878d104b461b7ef922abe6320711c0d01772f4cd55de18b674f88547870041 + md5: e96637dd92c5f340215c753a5c9a22d7 + sha256: cc0b2ddab52b20698b26fe8622ebe37e0d462d8691a1f324e7b00f7d904765e3 category: main optional: false - name: lcms2 - version: "2.16" + version: "2.15" manager: conda platform: osx-64 dependencies: libjpeg-turbo: ">=3.0.0,<4.0a0" libtiff: ">=4.6.0,<4.7.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/lcms2-2.16-ha2f27b4_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/lcms2-2.15-hd6ba6f3_3.conda hash: - md5: 1442db8f03517834843666c422238c9b - sha256: 222ebc0a55544b9922f61e75015d02861e65b48f12113af41d48ba0814e14e4e + md5: 8059507d52f477fbd4b81841e085e25b + sha256: b2234f24e3b0030762430ec3414410119d1129804a95ef65af50ad36cabd9bd5 category: main optional: false - name: lcms2 - version: "2.16" + version: "2.15" manager: conda platform: osx-arm64 dependencies: libjpeg-turbo: ">=3.0.0,<4.0a0" libtiff: ">=4.6.0,<4.7.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/lcms2-2.16-ha0e7c42_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/lcms2-2.15-hf2736f0_3.conda hash: - md5: 66f6c134e76fe13cce8a9ea5814b5dd5 - sha256: 151e0c84feb7e0747fabcc85006b8973b22f5abbc3af76a9add0b0ef0320ebe4 + md5: bbaac531169fed3e09ae31aff80aa069 + sha256: 3d07ba04602617c3084b302c8a6fa30b2e4b20511180f45992b289c312298018 category: main optional: false - name: ld_impl_linux-64 @@ -11505,13 +11502,13 @@ package: category: dev optional: true - name: libgdal - version: 3.8.1 + version: 3.8.0 manager: conda platform: linux-64 dependencies: __glibc: ">=2.17,<3.0.a0" blosc: ">=1.21.5,<2.0a0" - cfitsio: ">=4.3.1,<4.3.2.0a0" + cfitsio: ">=4.3.0,<4.3.1.0a0" freexl: ">=2.0.0,<3.0a0" geos: ">=3.12.1,<3.12.2.0a0" geotiff: ">=1.7.1,<1.8.0a0" @@ -11534,7 +11531,7 @@ package: libpng: ">=1.6.39,<1.7.0a0" libpq: ">=16.1,<17.0a0" libspatialite: ">=5.1.0,<5.2.0a0" - libsqlite: ">=3.44.2,<4.0a0" + libsqlite: ">=3.44.1,<4.0a0" libstdcxx-ng: ">=12" libtiff: ">=4.6.0,<4.7.0a0" libuuid: ">=2.38.1,<3.0a0" @@ -11543,29 +11540,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.2.0,<4.0a0" + openssl: ">=3.1.4,<4.0a0" pcre2: ">=10.42,<10.43.0a0" - poppler: ">=23.12.0,<23.13.0a0" + poppler: ">=23.11.0,<23.12.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.1-hcae7082_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libgdal-3.8.0-he7dcfe9_6.conda hash: - md5: e96d24ccc597439cda2859fe948aac77 - sha256: 9d6a19f03ea1437e951ba5e09c12faf11aa47a375a76f80f9bab1d2c3aed4aa9 + md5: 16ff703a847430fa074c5d53916740c1 + sha256: 06ccb879fc2783c371f1b02d062c4e90dfe4d8c5e9f2f83213bbef0fe27a00b0 category: main optional: false - name: libgdal - version: 3.8.1 + version: 3.8.0 manager: conda platform: osx-64 dependencies: __osx: ">=10.9" blosc: ">=1.21.5,<2.0a0" - cfitsio: ">=4.3.1,<4.3.2.0a0" + cfitsio: ">=4.3.0,<4.3.1.0a0" freexl: ">=2.0.0,<3.0a0" geos: ">=3.12.1,<3.12.2.0a0" geotiff: ">=1.7.1,<1.8.0a0" @@ -11588,36 +11585,36 @@ package: libpng: ">=1.6.39,<1.7.0a0" libpq: ">=16.1,<17.0a0" libspatialite: ">=5.1.0,<5.2.0a0" - libsqlite: ">=3.44.2,<4.0a0" + libsqlite: ">=3.44.1,<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.2.0,<4.0a0" + openssl: ">=3.1.4,<4.0a0" pcre2: ">=10.42,<10.43.0a0" - poppler: ">=23.12.0,<23.13.0a0" + poppler: ">=23.11.0,<23.12.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.1-hb7f764b_1.conda + url: https://conda.anaconda.org/conda-forge/osx-64/libgdal-3.8.0-h5b0c7d5_6.conda hash: - md5: eee8b19233a243e229af4399af2c4a10 - sha256: efe25d85efe856c1db71e2a40ce9736e07cf5c06e53285248866a62a43363a0d + md5: 01e293a419480a02fc7775f6c6afa530 + sha256: fc602de0bb3d5b7c0493b25b1e4345018fd68f26c672c8abff621c492f67abf4 category: main optional: false - name: libgdal - version: 3.8.1 + version: 3.8.0 manager: conda platform: osx-arm64 dependencies: __osx: ">=10.9" blosc: ">=1.21.5,<2.0a0" - cfitsio: ">=4.3.1,<4.3.2.0a0" + cfitsio: ">=4.3.0,<4.3.1.0a0" freexl: ">=2.0.0,<3.0a0" geos: ">=3.12.1,<3.12.2.0a0" geotiff: ">=1.7.1,<1.8.0a0" @@ -11640,26 +11637,26 @@ package: libpng: ">=1.6.39,<1.7.0a0" libpq: ">=16.1,<17.0a0" libspatialite: ">=5.1.0,<5.2.0a0" - libsqlite: ">=3.44.2,<4.0a0" + libsqlite: ">=3.44.1,<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.2.0,<4.0a0" + openssl: ">=3.1.4,<4.0a0" pcre2: ">=10.42,<10.43.0a0" - poppler: ">=23.12.0,<23.13.0a0" + poppler: ">=23.11.0,<23.12.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.1-hac00559_1.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/libgdal-3.8.0-h76f3012_6.conda hash: - md5: a65e999f85ab35663d7e9753ca7eaa13 - sha256: 636ff5b1f95edc083dc7b3ba9f35a87fe18695349b1bd57ae72c54d00ef5034e + md5: c7efc96733da609c84411293fa3a8457 + sha256: 34d8f93a03a58396074dbbcc832a0c84bb6192d9e0ddf70992c4fa40349366c5 category: main optional: false - name: libgfortran @@ -12438,11 +12435,11 @@ package: krb5: ">=1.21.2,<1.22.0a0" libgcc-ng: ">=12" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.2.0,<4.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/libpq-16.1-hfc447b1_2.conda + openssl: ">=3.1.4,<3.2.0a0" + url: https://conda.anaconda.org/conda-forge/linux-64/libpq-16.1-hfc447b1_0.conda hash: - md5: 3cfa1ceef6936e656677ba59480106ce - sha256: 6ce23d046522c39cda5c25e47d303b39f8b31a2aac2c59ea3e41710a072ff0bf + md5: 2b7f1893cf40b4ccdc0230bcd94d5ed9 + sha256: 8c92a8cce329a83cc9e94b19d18200c661957c00cfb464f26237d24730864585 category: main optional: false - name: libpq @@ -12452,11 +12449,11 @@ package: dependencies: krb5: ">=1.21.2,<1.22.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.2.0,<4.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/libpq-16.1-h6dd4ff7_2.conda + openssl: ">=3.1.4,<3.2.0a0" + url: https://conda.anaconda.org/conda-forge/osx-64/libpq-16.1-h6dd4ff7_0.conda hash: - md5: 7aa484702ee6f49c7a728b578a544b27 - sha256: 13011b0b9b31771197155d3547dcdf2c5f8f8a91f86f2b4d45fbf8a4d6f53d0a + md5: 39de94ff4ccc306f3d24ef7aef13c689 + sha256: 1a51c9b3451eebf04ac1f7a7a58fec07c2e44d2298514a30f62b5b432a653c07 category: main optional: false - name: libpq @@ -12466,11 +12463,11 @@ package: dependencies: krb5: ">=1.21.2,<1.22.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.2.0,<4.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/libpq-16.1-hd435d45_2.conda + openssl: ">=3.1.4,<3.2.0a0" + url: https://conda.anaconda.org/conda-forge/osx-arm64/libpq-16.1-hd435d45_0.conda hash: - md5: b4d4402f19365ed54ad529e09bfa7cdb - sha256: 50e96d4014b59ef337a74322be4394e27e6be65c3c5356b98ee0be1f6f4086a1 + md5: 883bbf64780c91608f1a7df9203b79a5 + sha256: 1b5c86d5f247b3e154ae373dcebea6979368c4a0ee722d39ec33ee2fc8528c04 category: main optional: false - name: libprotobuf @@ -14420,49 +14417,49 @@ package: category: main optional: false - name: nbconvert - version: 7.12.0 + version: 7.11.0 manager: conda platform: linux-64 dependencies: - nbconvert-core: 7.12.0 - nbconvert-pandoc: 7.12.0 + nbconvert-core: 7.11.0 + nbconvert-pandoc: 7.11.0 python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.12.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.11.0-pyhd8ed1ab_0.conda hash: - md5: 364e28ab12477494e72839aaa588073d - sha256: 0137330ab16bddf1fcaf60c0501c6145705b775fd547823708ed84364c934b76 + md5: e492b36cbea1c83d1663fa73a8abff9b + sha256: 6af7048b30c0ce6746297548df981037802f713853a1e856aedd2f8164946d39 category: main optional: false - name: nbconvert - version: 7.12.0 + version: 7.11.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" - nbconvert-core: 7.12.0 - nbconvert-pandoc: 7.12.0 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.12.0-pyhd8ed1ab_0.conda + nbconvert-core: 7.11.0 + nbconvert-pandoc: 7.11.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.11.0-pyhd8ed1ab_0.conda hash: - md5: 364e28ab12477494e72839aaa588073d - sha256: 0137330ab16bddf1fcaf60c0501c6145705b775fd547823708ed84364c934b76 + md5: e492b36cbea1c83d1663fa73a8abff9b + sha256: 6af7048b30c0ce6746297548df981037802f713853a1e856aedd2f8164946d39 category: main optional: false - name: nbconvert - version: 7.12.0 + version: 7.11.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - nbconvert-core: 7.12.0 - nbconvert-pandoc: 7.12.0 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.12.0-pyhd8ed1ab_0.conda + nbconvert-core: 7.11.0 + nbconvert-pandoc: 7.11.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.11.0-pyhd8ed1ab_0.conda hash: - md5: 364e28ab12477494e72839aaa588073d - sha256: 0137330ab16bddf1fcaf60c0501c6145705b775fd547823708ed84364c934b76 + md5: e492b36cbea1c83d1663fa73a8abff9b + sha256: 6af7048b30c0ce6746297548df981037802f713853a1e856aedd2f8164946d39 category: main optional: false - name: nbconvert-core - version: 7.12.0 + version: 7.11.0 manager: conda platform: linux-64 dependencies: @@ -14483,14 +14480,14 @@ package: python: ">=3.8" tinycss2: "" traitlets: ">=5.0" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.12.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.11.0-pyhd8ed1ab_0.conda hash: - md5: 4d67c68fd0d130091ada039bc2d81b33 - sha256: 04c3ac88701d98d58139569e4899c3254bf99908179a898cc3dcadd8c0ef44b4 + md5: d59e0cb1ca993f8f910cfdf393232acf + sha256: 81732e083c4c85a52248e20ff0e40a14b0b49db9cc7ce414e8aa7d6f8980dad0 category: main optional: false - name: nbconvert-core - version: 7.12.0 + version: 7.11.0 manager: conda platform: osx-64 dependencies: @@ -14511,14 +14508,14 @@ package: pygments: ">=2.4.1" nbclient: ">=0.5.0" mistune: ">=2.0.3,<4" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.12.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.11.0-pyhd8ed1ab_0.conda hash: - md5: 4d67c68fd0d130091ada039bc2d81b33 - sha256: 04c3ac88701d98d58139569e4899c3254bf99908179a898cc3dcadd8c0ef44b4 + md5: d59e0cb1ca993f8f910cfdf393232acf + sha256: 81732e083c4c85a52248e20ff0e40a14b0b49db9cc7ce414e8aa7d6f8980dad0 category: main optional: false - name: nbconvert-core - version: 7.12.0 + version: 7.11.0 manager: conda platform: osx-arm64 dependencies: @@ -14539,52 +14536,52 @@ package: pygments: ">=2.4.1" nbclient: ">=0.5.0" mistune: ">=2.0.3,<4" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.12.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.11.0-pyhd8ed1ab_0.conda hash: - md5: 4d67c68fd0d130091ada039bc2d81b33 - sha256: 04c3ac88701d98d58139569e4899c3254bf99908179a898cc3dcadd8c0ef44b4 + md5: d59e0cb1ca993f8f910cfdf393232acf + sha256: 81732e083c4c85a52248e20ff0e40a14b0b49db9cc7ce414e8aa7d6f8980dad0 category: main optional: false - name: nbconvert-pandoc - version: 7.12.0 + version: 7.11.0 manager: conda platform: linux-64 dependencies: - nbconvert-core: 7.12.0 + nbconvert-core: 7.11.0 pandoc: "" python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.12.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.11.0-pyhd8ed1ab_0.conda hash: - md5: 460d7cac50322a39b61a833885a6a8d5 - sha256: ebf25caef387ec79f8d8f6771240d451ffaebcc2cdd127c0b152c6697d661d10 + md5: 51bd005efab7e5c5c2af2570327bd213 + sha256: 377d3c3f973b6885406ff6606d24c5e1fbd0d0fdc64c0dc17162f6daf35e08cf category: main optional: false - name: nbconvert-pandoc - version: 7.12.0 + version: 7.11.0 manager: conda platform: osx-64 dependencies: pandoc: "" python: ">=3.8" - nbconvert-core: 7.12.0 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.12.0-pyhd8ed1ab_0.conda + nbconvert-core: 7.11.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.11.0-pyhd8ed1ab_0.conda hash: - md5: 460d7cac50322a39b61a833885a6a8d5 - sha256: ebf25caef387ec79f8d8f6771240d451ffaebcc2cdd127c0b152c6697d661d10 + md5: 51bd005efab7e5c5c2af2570327bd213 + sha256: 377d3c3f973b6885406ff6606d24c5e1fbd0d0fdc64c0dc17162f6daf35e08cf category: main optional: false - name: nbconvert-pandoc - version: 7.12.0 + version: 7.11.0 manager: conda platform: osx-arm64 dependencies: pandoc: "" python: ">=3.8" - nbconvert-core: 7.12.0 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.12.0-pyhd8ed1ab_0.conda + nbconvert-core: 7.11.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.11.0-pyhd8ed1ab_0.conda hash: - md5: 460d7cac50322a39b61a833885a6a8d5 - sha256: ebf25caef387ec79f8d8f6771240d451ffaebcc2cdd127c0b152c6697d661d10 + md5: 51bd005efab7e5c5c2af2570327bd213 + sha256: 377d3c3f973b6885406ff6606d24c5e1fbd0d0fdc64c0dc17162f6daf35e08cf category: main optional: false - name: nbformat @@ -15316,40 +15313,40 @@ package: category: main optional: false - name: openssl - version: 3.2.0 + version: 3.1.4 manager: conda platform: linux-64 dependencies: ca-certificates: "" libgcc-ng: ">=12" - url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.2.0-hd590300_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.4-hd590300_0.conda hash: - md5: 603827b39ea2b835268adb8c821b8570 - sha256: 80efc6f429bd8e622d999652e5cba2ca56fcdb9c16a439d2ce9b4313116e4a87 + md5: 412ba6938c3e2abaca8b1129ea82e238 + sha256: d15b3e83ce66c6f6fbb4707f2f5c53337124c01fb03bfda1cf25c5b41123efc7 category: main optional: false - name: openssl - version: 3.2.0 + version: 3.1.4 manager: conda platform: osx-64 dependencies: ca-certificates: "" - url: https://conda.anaconda.org/conda-forge/osx-64/openssl-3.2.0-hd75f5a5_1.conda + url: https://conda.anaconda.org/conda-forge/osx-64/openssl-3.1.4-hd75f5a5_0.conda hash: - md5: 06cb561619487c88891839b9beb5244c - sha256: 99161bf349f5dc80322f2a2c188588d11efa662566e4e19f2ac0a36d9fa3de25 + md5: bc9201da6eb1e0df4107901df5371347 + sha256: 1c436103a8de0dc82c9c56974badaa1b8b8f8cd9f37c2766bd50cd9899720f6b category: main optional: false - name: openssl - version: 3.2.0 + version: 3.1.4 manager: conda platform: osx-arm64 dependencies: ca-certificates: "" - url: https://conda.anaconda.org/conda-forge/osx-arm64/openssl-3.2.0-h0d3ecfb_1.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/openssl-3.1.4-h0d3ecfb_0.conda hash: - md5: 47d16d26100f19ca495882882b7bc93b - sha256: a53e1c6c058b621fd1d13cca6f9cccd534d2b3f4b4ac789fe26f7902031d6c41 + md5: 5a89552fececf4cd99628318ccbb67a3 + sha256: 3c715b1d4940c7ad6065935db18924b85a54048dde066f963cfc250340639457 category: main optional: false - name: orc @@ -16340,39 +16337,42 @@ package: category: main optional: false - name: platformdirs - version: 4.1.0 + version: 4.0.0 manager: conda platform: linux-64 dependencies: - python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.1.0-pyhd8ed1ab_0.conda + python: ">=3.7" + typing_extensions: ">=4.7.1" + url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.0.0-pyhd8ed1ab_0.conda hash: - md5: 45a5065664da0d1dfa8f8cd2eaf05ab9 - sha256: 9e4ff17ce802159ed31344eb913eaa877688226765b77947b102b42255a53853 + md5: 6bb4ee32cd435deaeac72776c001e7ac + sha256: 67381d3f7cadca7df7699238e0dcce680ad20d7fd28804bab48611fecb084937 category: main optional: false - name: platformdirs - version: 4.1.0 + version: 4.0.0 manager: conda platform: osx-64 dependencies: - python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.1.0-pyhd8ed1ab_0.conda + python: ">=3.7" + typing_extensions: ">=4.7.1" + url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.0.0-pyhd8ed1ab_0.conda hash: - md5: 45a5065664da0d1dfa8f8cd2eaf05ab9 - sha256: 9e4ff17ce802159ed31344eb913eaa877688226765b77947b102b42255a53853 + md5: 6bb4ee32cd435deaeac72776c001e7ac + sha256: 67381d3f7cadca7df7699238e0dcce680ad20d7fd28804bab48611fecb084937 category: main optional: false - name: platformdirs - version: 4.1.0 + version: 4.0.0 manager: conda platform: osx-arm64 dependencies: - python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.1.0-pyhd8ed1ab_0.conda + python: ">=3.7" + typing_extensions: ">=4.7.1" + url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.0.0-pyhd8ed1ab_0.conda hash: - md5: 45a5065664da0d1dfa8f8cd2eaf05ab9 - sha256: 9e4ff17ce802159ed31344eb913eaa877688226765b77947b102b42255a53853 + md5: 6bb4ee32cd435deaeac72776c001e7ac + sha256: 67381d3f7cadca7df7699238e0dcce680ad20d7fd28804bab48611fecb084937 category: main optional: false - name: pluggy @@ -16412,7 +16412,7 @@ package: category: main optional: false - name: poppler - version: 23.12.0 + version: 23.11.0 manager: conda platform: linux-64 dependencies: @@ -16423,7 +16423,7 @@ package: lcms2: ">=2.15,<3.0a0" libcurl: ">=8.4.0,<9.0a0" libgcc-ng: ">=12" - libglib: ">=2.78.1,<3.0a0" + libglib: ">=2.78.0,<3.0a0" libiconv: ">=1.17,<2.0a0" libjpeg-turbo: ">=3.0.0,<4.0a0" libpng: ">=1.6.39,<1.7.0a0" @@ -16431,17 +16431,17 @@ package: libtiff: ">=4.6.0,<4.7.0a0" libzlib: ">=1.2.13,<1.3.0a0" nspr: ">=4.35,<5.0a0" - nss: ">=3.95,<4.0a0" + nss: ">=3.94,<4.0a0" openjpeg: ">=2.5.0,<3.0a0" poppler-data: "" - url: https://conda.anaconda.org/conda-forge/linux-64/poppler-23.12.0-h590f24d_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/poppler-23.11.0-h590f24d_0.conda hash: - md5: 480189ac126a8c6c61e14476c8ba7c9a - sha256: b313920277aca763b590dddf806c56b0aadcdff82f5ace39827cab4792ae4b20 + md5: 671439d8eca2084bb5a75561fff23a85 + sha256: 8050002e01be124efcb82e32e740676f5ed7dfe852f335408554e6dc3b060ad9 category: main optional: false - name: poppler - version: 23.12.0 + version: 23.11.0 manager: conda platform: osx-64 dependencies: @@ -16454,24 +16454,24 @@ package: lcms2: ">=2.15,<3.0a0" libcurl: ">=8.4.0,<9.0a0" libcxx: ">=16.0.6" - libglib: ">=2.78.1,<3.0a0" + libglib: ">=2.78.0,<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.95,<4.0a0" + nss: ">=3.94,<4.0a0" openjpeg: ">=2.5.0,<3.0a0" poppler-data: "" - url: https://conda.anaconda.org/conda-forge/osx-64/poppler-23.12.0-hdd5a5e8_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/poppler-23.11.0-hdd5a5e8_0.conda hash: - md5: e1cb9f8e9e21dfa600b08be85d905e5f - sha256: 1271e3c8163125fc1ff14833ddba3f2c6465df5b1d13db76912415bd5a39b492 + md5: 60ffe2d3a09ff99eb2601487d6ddaeea + sha256: fb6a53ddac3fa8c097b4a0b7d2f40219b13bfa3324147aaf6c5a14ee5fb27521 category: main optional: false - name: poppler - version: 23.12.0 + version: 23.11.0 manager: conda platform: osx-arm64 dependencies: @@ -16484,20 +16484,20 @@ package: lcms2: ">=2.15,<3.0a0" libcurl: ">=8.4.0,<9.0a0" libcxx: ">=16.0.6" - libglib: ">=2.78.1,<3.0a0" + libglib: ">=2.78.0,<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.95,<4.0a0" + nss: ">=3.94,<4.0a0" openjpeg: ">=2.5.0,<3.0a0" poppler-data: "" - url: https://conda.anaconda.org/conda-forge/osx-arm64/poppler-23.12.0-hcdd998b_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/poppler-23.11.0-hcdd998b_0.conda hash: - md5: e072f524004eee193e30d243d68c520f - sha256: 13ebaac3bf9b77e92e777d3ed245c2f0a8ac93985e334b0cd797a39f321ae5dd + md5: 19386a03a7c57a378953bafb4f598156 + sha256: a6677b507cbdb6202c872aa461b4bf8cfcbe5791721fe1f42615b89205d4a4a6 category: main optional: false - name: poppler-data @@ -16541,17 +16541,17 @@ package: krb5: ">=1.21.2,<1.22.0a0" libgcc-ng: ">=12" libpq: "16.1" - libxml2: ">=2.11.6,<2.12.0a0" + libxml2: ">=2.11.5,<2.12.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.2.0,<4.0a0" + openssl: ">=3.1.4,<4.0a0" readline: ">=8.2,<9.0a0" tzcode: "" tzdata: "" zlib: "" - url: https://conda.anaconda.org/conda-forge/linux-64/postgresql-16.1-h8972f4a_2.conda + url: https://conda.anaconda.org/conda-forge/linux-64/postgresql-16.1-h8972f4a_0.conda hash: - md5: a175fe7a349a7e4cda81f4d7ae2bc2b2 - sha256: b2c258a78effab00f8db53e5dd04a43baf309c9a3c164c0d6f52de836b3baea5 + md5: 1e9ab0760262044fa00814088667e451 + sha256: 74dfb5793a00a0a9e85296ce0944d8af0f71758574b7c8f9e7d5590250441e24 category: main optional: false - name: postgresql @@ -16561,17 +16561,17 @@ package: dependencies: krb5: ">=1.21.2,<1.22.0a0" libpq: "16.1" - libxml2: ">=2.11.6,<2.12.0a0" + libxml2: ">=2.11.5,<2.12.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.2.0,<4.0a0" + openssl: ">=3.1.4,<4.0a0" readline: ">=8.2,<9.0a0" tzcode: "" tzdata: "" zlib: "" - url: https://conda.anaconda.org/conda-forge/osx-64/postgresql-16.1-h413614c_2.conda + url: https://conda.anaconda.org/conda-forge/osx-64/postgresql-16.1-h413614c_0.conda hash: - md5: ad5e3602657162ddcab580d052df0bd4 - sha256: 47282bff8ca6c64f72276401e8bcfff625cadcdcbfd3804bb08d9dcbe7485907 + md5: b7322d27093606b939fb92fa33b92beb + sha256: 612393024639882d7515429e639c85fa3b712d114c5a6b3a4b3891b061e1bc89 category: main optional: false - name: postgresql @@ -16581,17 +16581,17 @@ package: dependencies: krb5: ">=1.21.2,<1.22.0a0" libpq: "16.1" - libxml2: ">=2.11.6,<2.12.0a0" + libxml2: ">=2.11.5,<2.12.0a0" libzlib: ">=1.2.13,<1.3.0a0" - openssl: ">=3.2.0,<4.0a0" + openssl: ">=3.1.4,<4.0a0" readline: ">=8.2,<9.0a0" tzcode: "" tzdata: "" zlib: "" - url: https://conda.anaconda.org/conda-forge/osx-arm64/postgresql-16.1-hc6ab77f_2.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/postgresql-16.1-hc6ab77f_0.conda hash: - md5: a2562d92a27e19371e2655fe48e6952f - sha256: a896c5ab8930a4d9f980471b64d6eb254a22c46565ebb777d99e235c8c0fb7f9 + md5: 37398d1ad2fbeaa7733711b845da863e + sha256: 441f5ad3fac42e7daf9c246ad0dc0962c7f0b4c9ac1044038d3a053d339320bf category: main optional: false - name: pre-commit @@ -21167,45 +21167,45 @@ package: category: main optional: false - name: starlette - version: 0.33.0 + version: 0.32.0.post1 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.33.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/starlette-0.32.0.post1-pyhd8ed1ab_0.conda hash: - md5: 55027cf7f50803f0f5ece8b661eff47b - sha256: 3923f4c3e31d8c3a9c574779585137ff834a6108558a8956ef93022d4fcb37a8 + md5: 9aa6d56db739eee2ff473becbe178fd1 + sha256: 9692b83467670b473dc71137376f735249ef2ee6eeefce9068b0dec94810c24c category: dev optional: true - name: starlette - version: 0.33.0 + version: 0.32.0.post1 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.33.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/starlette-0.32.0.post1-pyhd8ed1ab_0.conda hash: - md5: 55027cf7f50803f0f5ece8b661eff47b - sha256: 3923f4c3e31d8c3a9c574779585137ff834a6108558a8956ef93022d4fcb37a8 + md5: 9aa6d56db739eee2ff473becbe178fd1 + sha256: 9692b83467670b473dc71137376f735249ef2ee6eeefce9068b0dec94810c24c category: dev optional: true - name: starlette - version: 0.33.0 + version: 0.32.0.post1 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.33.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/starlette-0.32.0.post1-pyhd8ed1ab_0.conda hash: - md5: 55027cf7f50803f0f5ece8b661eff47b - sha256: 3923f4c3e31d8c3a9c574779585137ff834a6108558a8956ef93022d4fcb37a8 + md5: 9aa6d56db739eee2ff473becbe178fd1 + sha256: 9692b83467670b473dc71137376f735249ef2ee6eeefce9068b0dec94810c24c category: dev optional: true - name: stevedore @@ -22876,7 +22876,7 @@ package: category: main optional: false - name: virtualenv - version: 20.25.0 + version: 20.24.7 manager: conda platform: linux-64 dependencies: @@ -22884,14 +22884,14 @@ package: filelock: <4,>=3.12.2 platformdirs: <5,>=3.9.1 python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.25.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.24.7-pyhd8ed1ab_0.conda hash: - md5: c119653cba436d8183c27bf6d190e587 - sha256: 50827c3721a9dbf973b568709d4381add2a6552fa562f26a385c5edc16a534af + md5: db990278c2c00b268eed778de44f6057 + sha256: ad661ae59c64bd73c25dfadb00c601659f4d9cafbf428e36a690075e52bac96a category: main optional: false - name: virtualenv - version: 20.25.0 + version: 20.24.7 manager: conda platform: osx-64 dependencies: @@ -22899,14 +22899,14 @@ package: distlib: <1,>=0.3.7 filelock: <4,>=3.12.2 platformdirs: <5,>=3.9.1 - url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.25.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.24.7-pyhd8ed1ab_0.conda hash: - md5: c119653cba436d8183c27bf6d190e587 - sha256: 50827c3721a9dbf973b568709d4381add2a6552fa562f26a385c5edc16a534af + md5: db990278c2c00b268eed778de44f6057 + sha256: ad661ae59c64bd73c25dfadb00c601659f4d9cafbf428e36a690075e52bac96a category: main optional: false - name: virtualenv - version: 20.25.0 + version: 20.24.7 manager: conda platform: osx-arm64 dependencies: @@ -22914,10 +22914,10 @@ package: distlib: <1,>=0.3.7 filelock: <4,>=3.12.2 platformdirs: <5,>=3.9.1 - url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.25.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.24.7-pyhd8ed1ab_0.conda hash: - md5: c119653cba436d8183c27bf6d190e587 - sha256: 50827c3721a9dbf973b568709d4381add2a6552fa562f26a385c5edc16a534af + md5: db990278c2c00b268eed778de44f6057 + sha256: ad661ae59c64bd73c25dfadb00c601659f4d9cafbf428e36a690075e52bac96a category: main optional: false - name: watchdog @@ -23114,39 +23114,39 @@ package: category: main optional: false - name: websocket-client - version: 1.7.0 + version: 1.6.4 manager: conda platform: linux-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.7.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.6.4-pyhd8ed1ab_0.conda hash: - md5: 50ad31e07d706aae88b14a4ac9c73f23 - sha256: d9b537d5b7c5aa7a02a4ce4c6b755e458bd8083b67752a73c92d113ccec6c10f + md5: bdb77b28cf16deac0eef431a068320e8 + sha256: df45b89862edcd7cd5180ec7b8c0c0ca9fb4d3f7d49ddafccdc76afcf50d8da6 category: main optional: false - name: websocket-client - version: 1.7.0 + version: 1.6.4 manager: conda platform: osx-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.7.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.6.4-pyhd8ed1ab_0.conda hash: - md5: 50ad31e07d706aae88b14a4ac9c73f23 - sha256: d9b537d5b7c5aa7a02a4ce4c6b755e458bd8083b67752a73c92d113ccec6c10f + md5: bdb77b28cf16deac0eef431a068320e8 + sha256: df45b89862edcd7cd5180ec7b8c0c0ca9fb4d3f7d49ddafccdc76afcf50d8da6 category: main optional: false - name: websocket-client - version: 1.7.0 + version: 1.6.4 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.7.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.6.4-pyhd8ed1ab_0.conda hash: - md5: 50ad31e07d706aae88b14a4ac9c73f23 - sha256: d9b537d5b7c5aa7a02a4ce4c6b755e458bd8083b67752a73c92d113ccec6c10f + md5: bdb77b28cf16deac0eef431a068320e8 + sha256: df45b89862edcd7cd5180ec7b8c0c0ca9fb4d3f7d49ddafccdc76afcf50d8da6 category: main optional: false - name: websockets diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index af75e5e3dc..12d78b1972 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -70,7 +70,7 @@ dependencies: - lz4-c=1.9.4=hf0c8a7f_0 - ncurses=6.4=h93d8f39_2 - nspr=4.35=hea0b92c_0 - - openssl=3.2.0=hd75f5a5_1 + - openssl=3.1.4=hd75f5a5_0 - pandoc=3.1.3=h9d075a6_0 - pcre2=10.42=h0ad2156_0 - pixman=0.42.2=he965462_0 @@ -114,7 +114,7 @@ dependencies: - gdk-pixbuf=2.42.10=hbb5a27d_4 - gts=0.7.6=h53e17e3_4 - krb5=1.21.2=hb884880_0 - - lcms2=2.16=ha2f27b4_0 + - lcms2=2.15=hd6ba6f3_3 - libopenblas=0.3.25=openmp_hfef2a42_0 - libthrift=0.19.0=h064b379_1 - libwebp=1.3.2=h44782d1_1 @@ -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.9=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - debugpy=1.8.0=py311hdf8f085_1 - decorator=5.1.1=pyhd8ed1ab_0 @@ -167,7 +167,7 @@ dependencies: - executing=2.0.1=pyhd8ed1ab_0 - filelock=3.13.1=pyhd8ed1ab_0 - frozenlist=1.4.0=py311h2725bcf_1 - - fsspec=2023.12.0=pyhca7485f_0 + - fsspec=2023.10.0=pyhca7485f_0 - google-cloud-sdk=455.0.0=py311h6eed73b_0 - greenlet=3.0.1=py311hd39e593_0 - hpack=4.0.0=pyh9f0ad1d_0 @@ -190,7 +190,7 @@ dependencies: - libcurl=8.4.0=h726d00d_0 - libgd=2.3.3=h0dceb68_9 - libgrpc=1.59.2=ha7f534c_0 - - libpq=16.1=h6dd4ff7_2 + - libpq=16.1=h6dd4ff7_0 - llvmlite=0.41.1=py311hb5c2e0a_0 - locket=1.0.0=pyhd8ed1ab_0 - lxml=4.9.3=py311h19a211c_1 @@ -217,7 +217,6 @@ dependencies: - pillow=10.1.0=py311hea5c87a_0 - pkginfo=1.9.6=pyhd8ed1ab_0 - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_1 - - platformdirs=4.1.0=pyhd8ed1ab_0 - pluggy=1.3.0=pyhd8ed1ab_0 - prometheus_client=0.19.0=pyhd8ed1ab_0 - psutil=5.9.5=py311h2725bcf_1 @@ -280,7 +279,7 @@ dependencies: - wcwidth=0.2.12=pyhd8ed1ab_0 - webcolors=1.13=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_2 - - websocket-client=1.7.0=pyhd8ed1ab_0 + - websocket-client=1.6.4=pyhd8ed1ab_0 - websockets=10.4=py311h5547dcb_1 - wheel=0.42.0=pyhd8ed1ab_0 - widgetsnbextension=4.0.9=pyhd8ed1ab_0 @@ -301,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.1=h60fb419_0 + - cfitsio=4.3.0=h66f91ea_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 @@ -311,7 +310,7 @@ dependencies: - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311h2725bcf_0 - curl=8.4.0=h726d00d_0 - - fonttools=4.46.0=py311he705e18_0 + - fonttools=4.45.1=py311he705e18_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 - grpcio=1.59.2=py311hfd95bfa_0 @@ -321,7 +320,7 @@ dependencies: - hdf5=1.14.2=nompi_hedada53_100 - html5lib=1.1=pyh9f0ad1d_0 - hypothesis=6.91.0=pyha770c72_0 - - importlib-metadata=7.0.0=pyha770c72_0 + - importlib-metadata=6.8.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 - janus=1.0.0=pyhd8ed1ab_0 @@ -330,7 +329,6 @@ dependencies: - jinja2=3.1.2=pyhd8ed1ab_1 - joblib=1.3.2=pyhd8ed1ab_0 - jsonlines=4.0.0=pyhd8ed1ab_0 - - jupyter_core=5.5.0=py311h6eed73b_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - libcblas=3.9.0=20_osx64_openblas @@ -346,8 +344,9 @@ dependencies: - pexpect=4.8.0=pyh1a96a4e_2 - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - - poppler=23.12.0=hdd5a5e8_0 - - postgresql=16.1=h413614c_2 + - platformdirs=4.0.0=pyhd8ed1ab_0 + - poppler=23.11.0=hdd5a5e8_0 + - postgresql=16.1=h413614c_0 - proj=9.3.0=h23b96cc_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h021eaf5_0 @@ -372,7 +371,6 @@ dependencies: - typing_inspect=0.9.0=pyhd8ed1ab_0 - universal_pathlib=0.1.4=pyhd8ed1ab_0 - urllib3=1.26.18=pyhd8ed1ab_0 - - virtualenv=20.25.0=pyhd8ed1ab_0 - watchdog=3.0.0=py311h5ef12f2_1 - xerces-c=3.2.4=h6314983_3 - yarl=1.9.3=py311he705e18_0 @@ -383,10 +381,10 @@ 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.6=pyhd8ed1ab_0 + - botocore=1.33.5=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - - cryptography=41.0.7=py311h48c7838_1 + - cryptography=41.0.5=py311hd51016d_0 - fqdn=1.5.1=pyhd8ed1ab_0 - geotiff=1.7.1=h889ec99_14 - gitpython=3.1.40=pyhd8ed1ab_0 @@ -396,8 +394,9 @@ dependencies: - graphql-relay=3.2.0=pyhd8ed1ab_0 - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - httpcore=1.0.2=pyhd8ed1ab_0 - - importlib_metadata=7.0.0=hd8ed1ab_0 + - importlib_metadata=6.8.0=hd8ed1ab_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 - libnetcdf=4.9.2=nompi_h6a32802_112 @@ -422,23 +421,24 @@ dependencies: - rich=13.7.0=pyhd8ed1ab_0 - sqlalchemy=2.0.23=py311he705e18_0 - stack_data=0.6.2=pyhd8ed1ab_0 - - starlette=0.33.0=pyhd8ed1ab_0 + - starlette=0.32.0.post1=pyhd8ed1ab_0 - tiledb=2.16.3=hd3a41d5_3 - ukkonen=1.0.1=py311h5fe6e05_4 - 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 - - alembic=1.13.0=pyhd8ed1ab_0 - - arelle-release=2.18.0=pyhd8ed1ab_0 + - alembic=1.12.1=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 - cachecontrol=0.13.1=pyhd8ed1ab_0 - contourpy=1.2.0=py311h7bea37d_0 - - dask-core=2023.12.0=pyhd8ed1ab_0 + - dask-core=2023.11.0=pyhd8ed1ab_0 - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - - folium=0.15.1=pyhd8ed1ab_0 + - folium=0.15.0=pyhd8ed1ab_0 - google-resumable-media=2.6.0=pyhd8ed1ab_0 - graphene=3.3=pyhd8ed1ab_0 - grpcio-status=1.59.2=pyhd8ed1ab_0 @@ -446,12 +446,12 @@ dependencies: - h3-py=3.7.6=py311hdf8f085_1 - httpx=0.25.2=pyhd8ed1ab_0 - identify=2.5.32=pyhd8ed1ab_0 - - ipython=8.18.1=pyh31011fe_2 + - 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 - keyring=24.3.0=py311h6eed73b_0 - - libgdal=3.8.1=hb7f764b_1 + - libgdal=3.8.0=h5b0c7d5_6 - librsvg=2.56.3=hec3db73_0 - numba=0.58.1=py311h32f2313_0 - numexpr=2.8.7=py311h1eadf79_4 @@ -471,14 +471,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.6=pyhd8ed1ab_0 + - boto3=1.33.5=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - - dagster=1.5.10=pyhd8ed1ab_0 + - dagster=1.5.9=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.0=py311h5646c56_6 - geopandas-base=0.14.1=pyha770c72_0 - google-auth=2.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 @@ -497,8 +497,8 @@ dependencies: - timezonefinder=6.2.0=py311he705e18_2 - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.10=pyhd8ed1ab_0 - - dagster-postgres=0.21.10=pyhd8ed1ab_0 + - dagster-graphql=1.5.9=pyhd8ed1ab_0 + - dagster-postgres=0.21.9=pyhd8ed1ab_1 - fiona=1.9.5=py311h809632c_1 - google-api-core=2.14.0=pyhd8ed1ab_0 - google-auth-oauthlib=1.1.0=pyhd8ed1ab_0 @@ -514,23 +514,23 @@ 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.9=pyhd8ed1ab_0 - geopandas=0.14.1=pyhd8ed1ab_0 - google-cloud-core=2.3.3=pyhd8ed1ab_0 - libarrow-dataset=14.0.1=hc222712_3_cpu - libarrow-flight-sql=14.0.1=h2cc6c1c_3_cpu - - nbconvert-core=7.12.0=pyhd8ed1ab_0 + - nbconvert-core=7.11.0=pyhd8ed1ab_0 - tableschema=1.19.3=pyh9f0ad1d_0 - datapackage=1.15.2=pyh44b312d_0 - google-cloud-storage=2.13.0=pyhca7485f_0 - - jupyter_server=2.11.2=pyhd8ed1ab_0 + - jupyter_server=2.11.1=pyhd8ed1ab_0 - libarrow-substrait=14.0.1=h2cc6c1c_3_cpu - - nbconvert-pandoc=7.12.0=pyhd8ed1ab_0 - - gcsfs=2023.12.0=pyhd8ed1ab_0 + - nbconvert-pandoc=7.11.0=pyhd8ed1ab_0 + - gcsfs=2023.10.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.12.0=pyhd8ed1ab_0 + - nbconvert=7.11.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - pyarrow=14.0.1=py311h98a0319_3_cpu - jupyterlab=4.0.9=pyhd8ed1ab_0 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 992644fc0d..4cd3f6d3c9 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -71,7 +71,7 @@ dependencies: - lz4-c=1.9.4=hb7217d7_0 - ncurses=6.4=h463b476_2 - nspr=4.35=hb7217d7_0 - - openssl=3.2.0=h0d3ecfb_1 + - openssl=3.1.4=h0d3ecfb_0 - pcre2=10.42=h26f9a81_0 - pixman=0.42.2=h13dd4ca_0 - snappy=1.1.10=h17c5cce_0 @@ -114,7 +114,7 @@ dependencies: - gdk-pixbuf=2.42.10=h15fa40c_4 - gts=0.7.6=he42f4ea_4 - krb5=1.21.2=h92f50d5_0 - - lcms2=2.16=ha0e7c42_0 + - lcms2=2.15=hf2736f0_3 - libopenblas=0.3.25=openmp_h6c19121_0 - libthrift=0.19.0=h026a170_1 - libwebp=1.3.2=hf30222e_1 @@ -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.9=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - debugpy=1.8.0=py311ha891d26_1 - decorator=5.1.1=pyhd8ed1ab_0 @@ -167,7 +167,7 @@ dependencies: - executing=2.0.1=pyhd8ed1ab_0 - filelock=3.13.1=pyhd8ed1ab_0 - frozenlist=1.4.0=py311heffc1b2_1 - - fsspec=2023.12.0=pyhca7485f_0 + - fsspec=2023.10.0=pyhca7485f_0 - google-cloud-sdk=455.0.0=py311h267d04e_0 - greenlet=3.0.1=py311hbaf5611_0 - hpack=4.0.0=pyh9f0ad1d_0 @@ -190,7 +190,7 @@ dependencies: - libcurl=8.4.0=h2d989ff_0 - libgd=2.3.3=hfdf3952_9 - libgrpc=1.59.2=hbcf6334_0 - - libpq=16.1=hd435d45_2 + - libpq=16.1=hd435d45_0 - llvmlite=0.41.1=py311hf5d242d_0 - locket=1.0.0=pyhd8ed1ab_0 - lxml=4.9.3=py311hbafe683_1 @@ -217,7 +217,6 @@ dependencies: - pillow=10.1.0=py311hb9c5795_0 - pkginfo=1.9.6=pyhd8ed1ab_0 - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_1 - - platformdirs=4.1.0=pyhd8ed1ab_0 - pluggy=1.3.0=pyhd8ed1ab_0 - prometheus_client=0.19.0=pyhd8ed1ab_0 - psutil=5.9.5=py311heffc1b2_1 @@ -280,7 +279,7 @@ dependencies: - wcwidth=0.2.12=pyhd8ed1ab_0 - webcolors=1.13=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_2 - - websocket-client=1.7.0=pyhd8ed1ab_0 + - websocket-client=1.6.4=pyhd8ed1ab_0 - websockets=10.4=py311he2be06e_1 - wheel=0.42.0=pyhd8ed1ab_0 - widgetsnbextension=4.0.9=pyhd8ed1ab_0 @@ -301,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.1=h808cd33_0 + - cfitsio=4.3.0=hca87796_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 @@ -311,7 +310,7 @@ dependencies: - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311heffc1b2_0 - curl=8.4.0=h2d989ff_0 - - fonttools=4.46.0=py311h05b510d_0 + - fonttools=4.45.1=py311h05b510d_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 - grpcio=1.59.2=py311h79dd126_0 @@ -321,7 +320,7 @@ dependencies: - hdf5=1.14.2=nompi_h3aba7b3_100 - html5lib=1.1=pyh9f0ad1d_0 - hypothesis=6.91.0=pyha770c72_0 - - importlib-metadata=7.0.0=pyha770c72_0 + - importlib-metadata=6.8.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 - janus=1.0.0=pyhd8ed1ab_0 @@ -330,7 +329,6 @@ dependencies: - jinja2=3.1.2=pyhd8ed1ab_1 - joblib=1.3.2=pyhd8ed1ab_0 - jsonlines=4.0.0=pyhd8ed1ab_0 - - jupyter_core=5.5.0=py311h267d04e_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - libcblas=3.9.0=20_osxarm64_openblas @@ -346,8 +344,9 @@ dependencies: - pexpect=4.8.0=pyh1a96a4e_2 - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - - poppler=23.12.0=hcdd998b_0 - - postgresql=16.1=hc6ab77f_2 + - platformdirs=4.0.0=pyhd8ed1ab_0 + - poppler=23.11.0=hcdd998b_0 + - postgresql=16.1=hc6ab77f_0 - proj=9.3.0=h52fb9d0_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h4d1eceb_0 @@ -372,7 +371,6 @@ dependencies: - typing_inspect=0.9.0=pyhd8ed1ab_0 - universal_pathlib=0.1.4=pyhd8ed1ab_0 - urllib3=1.26.18=pyhd8ed1ab_0 - - virtualenv=20.25.0=pyhd8ed1ab_0 - watchdog=3.0.0=py311heffc1b2_1 - xerces-c=3.2.4=hd886eac_3 - yarl=1.9.3=py311h05b510d_0 @@ -383,10 +381,10 @@ 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.6=pyhd8ed1ab_0 + - botocore=1.33.5=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - - cryptography=41.0.7=py311h08c85a6_1 + - cryptography=41.0.5=py311h71175c2_0 - fqdn=1.5.1=pyhd8ed1ab_0 - geotiff=1.7.1=h71398c0_14 - gitpython=3.1.40=pyhd8ed1ab_0 @@ -396,8 +394,9 @@ dependencies: - graphql-relay=3.2.0=pyhd8ed1ab_0 - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - httpcore=1.0.2=pyhd8ed1ab_0 - - importlib_metadata=7.0.0=hd8ed1ab_0 + - importlib_metadata=6.8.0=hd8ed1ab_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 - libnetcdf=4.9.2=nompi_hb2fb864_112 @@ -422,23 +421,24 @@ dependencies: - rich=13.7.0=pyhd8ed1ab_0 - sqlalchemy=2.0.23=py311h05b510d_0 - stack_data=0.6.2=pyhd8ed1ab_0 - - starlette=0.33.0=pyhd8ed1ab_0 + - starlette=0.32.0.post1=pyhd8ed1ab_0 - tiledb=2.16.3=he15c4da_3 - ukkonen=1.0.1=py311he4fd1f5_4 - 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 - - alembic=1.13.0=pyhd8ed1ab_0 - - arelle-release=2.18.0=pyhd8ed1ab_0 + - alembic=1.12.1=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 - cachecontrol=0.13.1=pyhd8ed1ab_0 - contourpy=1.2.0=py311hd03642b_0 - - dask-core=2023.12.0=pyhd8ed1ab_0 + - dask-core=2023.11.0=pyhd8ed1ab_0 - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - - folium=0.15.1=pyhd8ed1ab_0 + - folium=0.15.0=pyhd8ed1ab_0 - google-resumable-media=2.6.0=pyhd8ed1ab_0 - graphene=3.3=pyhd8ed1ab_0 - grpcio-status=1.59.2=pyhd8ed1ab_0 @@ -446,12 +446,12 @@ dependencies: - h3-py=3.7.6=py311ha891d26_1 - httpx=0.25.2=pyhd8ed1ab_0 - identify=2.5.32=pyhd8ed1ab_0 - - ipython=8.18.1=pyh31011fe_2 + - 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 - keyring=24.3.0=py311h267d04e_0 - - libgdal=3.8.1=hac00559_1 + - libgdal=3.8.0=h76f3012_6 - librsvg=2.56.3=h0db3404_0 - numba=0.58.1=py311h9ec4793_0 - numexpr=2.8.7=py311h6e08293_4 @@ -471,14 +471,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.6=pyhd8ed1ab_0 + - boto3=1.33.5=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - - dagster=1.5.10=pyhd8ed1ab_0 + - dagster=1.5.9=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.0=py311h32a4f3d_6 - geopandas-base=0.14.1=pyha770c72_0 - google-auth=2.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 @@ -497,8 +497,8 @@ dependencies: - timezonefinder=6.2.0=py311h05b510d_2 - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.10=pyhd8ed1ab_0 - - dagster-postgres=0.21.10=pyhd8ed1ab_0 + - dagster-graphql=1.5.9=pyhd8ed1ab_0 + - dagster-postgres=0.21.9=pyhd8ed1ab_1 - fiona=1.9.5=py311h4760b73_1 - google-api-core=2.14.0=pyhd8ed1ab_0 - google-auth-oauthlib=1.1.0=pyhd8ed1ab_0 @@ -514,23 +514,23 @@ 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.9=pyhd8ed1ab_0 - geopandas=0.14.1=pyhd8ed1ab_0 - google-cloud-core=2.3.3=pyhd8ed1ab_0 - libarrow-dataset=14.0.1=had9dd58_3_cpu - libarrow-flight-sql=14.0.1=h660fe36_3_cpu - - nbconvert-core=7.12.0=pyhd8ed1ab_0 + - nbconvert-core=7.11.0=pyhd8ed1ab_0 - tableschema=1.19.3=pyh9f0ad1d_0 - datapackage=1.15.2=pyh44b312d_0 - google-cloud-storage=2.13.0=pyhca7485f_0 - - jupyter_server=2.11.2=pyhd8ed1ab_0 + - jupyter_server=2.11.1=pyhd8ed1ab_0 - libarrow-substrait=14.0.1=h594d712_3_cpu - - nbconvert-pandoc=7.12.0=pyhd8ed1ab_0 - - gcsfs=2023.12.0=pyhd8ed1ab_0 + - nbconvert-pandoc=7.11.0=pyhd8ed1ab_0 + - gcsfs=2023.10.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.12.0=pyhd8ed1ab_0 + - nbconvert=7.11.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - pyarrow=14.0.1=py311h637fcfe_3_cpu - jupyterlab=4.0.9=pyhd8ed1ab_0 From 7eec80ea001a8386e70bff88a260fe49af2229ad Mon Sep 17 00:00:00 2001 From: bendnorman Date: Mon, 4 Dec 2023 16:30:41 -0900 Subject: [PATCH 42/47] Checkout env files from dev and remove apt-get installs [no ci] --- docker/Dockerfile | 26 +- environments/conda-linux-64.lock.yml | 54 +- environments/conda-lock.yml | 767 +++++++++++++------------- environments/conda-osx-64.lock.yml | 54 +- environments/conda-osx-arm64.lock.yml | 54 +- 5 files changed, 479 insertions(+), 476 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9247f98c78..361f821203 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,10 +7,10 @@ SHELL [ "/bin/bash", "-exo", "pipefail", "-c" ] # Install some linux packages # awscli requires unzip, less, groff and mandoc # hadolint ignore=DL3008 -RUN apt-get update && \ - apt-get install --no-install-recommends -y git jq unzip less groff mandoc && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* +# RUN apt-get update && \ +# apt-get install --no-install-recommends -y git jq unzip less groff mandoc && \ +# apt-get clean && \ +# rm -rf /var/lib/apt/lists/* # Configure gsutil authentication # hadolint ignore=DL3059 @@ -53,16 +53,16 @@ RUN --mount=type=bind,source=.git,target=${PUDL_REPO}/.git \ ${CONDA_RUN} pudl_setup -# Install awscli2 -# Change back to root because the install script needs access to /usr/local/aws-cli -USER root -RUN ${CONDA_RUN} bash -c 'curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && unzip awscliv2.zip && ./aws/install' -USER $MAMBA_USER +# # Install awscli2 +# # Change back to root because the install script needs access to /usr/local/aws-cli +# USER root +# RUN ${CONDA_RUN} bash -c 'curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && unzip awscliv2.zip && ./aws/install' +# USER $MAMBA_USER -# Install flyctl -# hadolint ignore=DL3059 -RUN ${CONDA_RUN} bash -c 'curl -L https://fly.io/install.sh | sh' -ENV PATH="${CONTAINER_HOME}/.fly/bin:$PATH" +# # Install flyctl +# # hadolint ignore=DL3059 +# RUN ${CONDA_RUN} bash -c 'curl -L https://fly.io/install.sh | sh' +# ENV PATH="${CONTAINER_HOME}/.fly/bin:$PATH" # Run the unit tests: diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index 3d6da6f452..b45e606241 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -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 @@ -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 @@ -178,7 +178,7 @@ dependencies: - fontconfig=2.14.2=h14ed4e7_0 - freexl=2.0.0=h743c826_0 - frozenlist=1.4.0=py311h459d7ec_1 - - fsspec=2023.10.0=pyhca7485f_0 + - fsspec=2023.12.0=pyhca7485f_0 - gdk-pixbuf=2.42.10=h829c605_4 - google-cloud-sdk=455.0.0=py311h38be061_0 - greenlet=3.0.1=py311hb755f60_0 @@ -200,11 +200,11 @@ dependencies: - jsonpointer=2.4=py311h38be061_3 - jupyterlab_widgets=3.0.9=pyhd8ed1ab_0 - kiwisolver=1.4.5=py311h9547e67_1 - - lcms2=2.15=hb7c19ff_3 + - lcms2=2.16=hb7c19ff_0 - libblas=3.9.0=20_linux64_openblas - libcurl=8.4.0=hca28451_0 - libgrpc=1.59.2=hd6c4280_0 - - libpq=16.1=hfc447b1_0 + - libpq=16.1=hfc447b1_2 - libwebp=1.3.2=h658648e_1 - llvmlite=0.41.1=py311ha6695c7_0 - locket=1.0.0=pyhd8ed1ab_0 @@ -296,7 +296,7 @@ dependencies: - wcwidth=0.2.12=pyhd8ed1ab_0 - webcolors=1.13=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_2 - - websocket-client=1.6.4=pyhd8ed1ab_0 + - websocket-client=1.7.0=pyhd8ed1ab_0 - websockets=10.4=py311hd4cff14_1 - wheel=0.42.0=pyhd8ed1ab_0 - widgetsnbextension=4.0.9=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 @@ -331,7 +331,7 @@ dependencies: - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311h459d7ec_0 - curl=8.4.0=hca28451_0 - - fonttools=4.45.1=py311h459d7ec_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 @@ -340,7 +340,7 @@ dependencies: - hdf5=1.14.2=nompi_h4f84152_100 - html5lib=1.1=pyh9f0ad1d_0 - hypothesis=6.91.0=pyha770c72_0 - - importlib-metadata=6.8.0=pyha770c72_0 + - importlib-metadata=7.0.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 - janus=1.0.0=pyhd8ed1ab_0 @@ -367,7 +367,7 @@ dependencies: - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - platformdirs=4.0.0=pyhd8ed1ab_0 - - postgresql=16.1=h8972f4a_0 + - postgresql=16.1=h8972f4a_2 - proj=9.3.0=h1d62c97_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h46cbc50_0 @@ -401,10 +401,10 @@ 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.5=pyhd8ed1ab_0 + - botocore=1.33.6=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - - cryptography=41.0.5=py311h63ff55d_0 + - cryptography=41.0.7=py311hcb13ee4_1 - fqdn=1.5.1=pyhd8ed1ab_0 - geotiff=1.7.1=hf074850_14 - gitpython=3.1.40=pyhd8ed1ab_0 @@ -415,7 +415,7 @@ dependencies: - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - harfbuzz=8.3.0=h3d44ed6_0 - httpcore=1.0.2=pyhd8ed1ab_0 - - importlib_metadata=6.8.0=hd8ed1ab_0 + - importlib_metadata=7.0.0=hd8ed1ab_0 - jsonschema-specifications=2023.11.2=pyhd8ed1ab_0 - jupyter_core=5.5.0=py311h38be061_0 - jupyter_server_terminals=0.4.4=pyhd8ed1ab_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.7=pyhd8ed1ab_1 - pybtex=0.24.0=pyhd8ed1ab_2 @@ -441,24 +441,24 @@ 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.post1=py311h38be061_0 - - virtualenv=20.24.7=pyhd8ed1ab_0 + - virtualenv=20.25.0=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h46250e7_0 - aiohttp=3.8.6=py311h459d7ec_1 - - alembic=1.12.1=pyhd8ed1ab_0 + - alembic=1.13.0=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 - cachecontrol=0.13.1=pyhd8ed1ab_0 - contourpy=1.2.0=py311h9547e67_0 - - dask-core=2023.11.0=pyhd8ed1ab_0 + - dask-core=2023.12.0=pyhd8ed1ab_0 - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - - folium=0.15.0=pyhd8ed1ab_0 + - folium=0.15.1=pyhd8ed1ab_0 - google-resumable-media=2.6.0=pyhd8ed1ab_0 - graphene=3.3=pyhd8ed1ab_0 - grpcio-status=1.59.2=pyhd8ed1ab_0 @@ -469,7 +469,7 @@ 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 @@ -490,14 +490,14 @@ 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.5=pyhd8ed1ab_0 + - boto3=1.33.6=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 + - gdal=3.8.1=py311h815a124_1 - geopandas-base=0.14.1=pyha770c72_0 - google-auth=2.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 @@ -517,8 +517,8 @@ dependencies: - timezonefinder=6.2.0=py311h459d7ec_2 - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.9=pyhd8ed1ab_0 - - dagster-postgres=0.21.9=pyhd8ed1ab_1 + - 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 @@ -547,7 +547,7 @@ dependencies: - 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 + - gcsfs=2023.12.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 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 148e867498..f3a4470731 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -266,7 +266,7 @@ package: category: main optional: false - name: alembic - version: 1.12.1 + version: 1.13.0 manager: conda platform: linux-64 dependencies: @@ -276,14 +276,14 @@ package: python: ">=3.7" sqlalchemy: ">=1.3.0" typing-extensions: ">=4" - url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.12.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.13.0-pyhd8ed1ab_0.conda hash: - md5: 15de9992b4096a2a6656ca202fde6e4c - sha256: 24019b1af4777e32843b230dd7a9bf7082943eb21bba03379ceed0bda50facf9 + md5: 7f0372c1cfa41891787ddf267334c0c7 + sha256: d6dd010632bc5272fe7e51646651c5fb9ae9b7663113b94aa585d6bcb43834b0 category: main optional: false - name: alembic - version: 1.12.1 + version: 1.13.0 manager: conda platform: osx-64 dependencies: @@ -293,14 +293,14 @@ package: python: ">=3.7" sqlalchemy: ">=1.3.0" typing-extensions: ">=4" - url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.12.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.13.0-pyhd8ed1ab_0.conda hash: - md5: 15de9992b4096a2a6656ca202fde6e4c - sha256: 24019b1af4777e32843b230dd7a9bf7082943eb21bba03379ceed0bda50facf9 + md5: 7f0372c1cfa41891787ddf267334c0c7 + sha256: d6dd010632bc5272fe7e51646651c5fb9ae9b7663113b94aa585d6bcb43834b0 category: main optional: false - name: alembic - version: 1.12.1 + version: 1.13.0 manager: conda platform: osx-arm64 dependencies: @@ -310,10 +310,10 @@ package: python: ">=3.7" sqlalchemy: ">=1.3.0" typing-extensions: ">=4" - url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.12.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/alembic-1.13.0-pyhd8ed1ab_0.conda hash: - md5: 15de9992b4096a2a6656ca202fde6e4c - sha256: 24019b1af4777e32843b230dd7a9bf7082943eb21bba03379ceed0bda50facf9 + md5: 7f0372c1cfa41891787ddf267334c0c7 + sha256: d6dd010632bc5272fe7e51646651c5fb9ae9b7663113b94aa585d6bcb43834b0 category: main optional: false - name: aniso8601 @@ -1914,52 +1914,52 @@ package: category: main optional: false - name: boto3 - version: 1.33.5 + version: 1.33.6 manager: conda platform: linux-64 dependencies: - botocore: ">=1.33.5,<1.34.0" + botocore: ">=1.33.6,<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.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.6-pyhd8ed1ab_0.conda hash: - md5: 7485d3ee00269cd33baa2ad64a0923ee - sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 + md5: fff8f43d8786f4e2a0ab4ed431f8c511 + sha256: 7fad398c6730cb751de3495b8204a7cd133aeecdd684273bc3359f31e1c01eca category: main optional: false - name: boto3 - version: 1.33.5 + version: 1.33.6 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.5,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.5-pyhd8ed1ab_0.conda + botocore: ">=1.33.6,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.6-pyhd8ed1ab_0.conda hash: - md5: 7485d3ee00269cd33baa2ad64a0923ee - sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 + md5: fff8f43d8786f4e2a0ab4ed431f8c511 + sha256: 7fad398c6730cb751de3495b8204a7cd133aeecdd684273bc3359f31e1c01eca category: main optional: false - name: boto3 - version: 1.33.5 + version: 1.33.6 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.5,<1.34.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.5-pyhd8ed1ab_0.conda + botocore: ">=1.33.6,<1.34.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.33.6-pyhd8ed1ab_0.conda hash: - md5: 7485d3ee00269cd33baa2ad64a0923ee - sha256: babecba07e296dc4cd26580427508e7734c522d1488a7f94a1f13204de3ca856 + md5: fff8f43d8786f4e2a0ab4ed431f8c511 + sha256: 7fad398c6730cb751de3495b8204a7cd133aeecdd684273bc3359f31e1c01eca category: main optional: false - name: botocore - version: 1.33.5 + version: 1.33.6 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.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.6-pyhd8ed1ab_0.conda hash: - md5: 352c39ba5cd9ea01996358f0748e102e - sha256: 56566ea8f3a48c24190c1dcf50681c0a84b26821c335c21b5c3c5d238e4bdb14 + md5: e1c7565a0bfba34c3be07a3ad882356f + sha256: 06549a55df5711e0306395e8187f03c46f25337fb7e9ab6c014cf26a76ca9cef category: main optional: false - name: botocore - version: 1.33.5 + version: 1.33.6 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.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.6-pyhd8ed1ab_0.conda hash: - md5: 352c39ba5cd9ea01996358f0748e102e - sha256: 56566ea8f3a48c24190c1dcf50681c0a84b26821c335c21b5c3c5d238e4bdb14 + md5: e1c7565a0bfba34c3be07a3ad882356f + sha256: 06549a55df5711e0306395e8187f03c46f25337fb7e9ab6c014cf26a76ca9cef category: main optional: false - name: botocore - version: 1.33.5 + version: 1.33.6 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.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.6-pyhd8ed1ab_0.conda hash: - md5: 352c39ba5cd9ea01996358f0748e102e - sha256: 56566ea8f3a48c24190c1dcf50681c0a84b26821c335c21b5c3c5d238e4bdb14 + md5: e1c7565a0bfba34c3be07a3ad882356f + sha256: 06549a55df5711e0306395e8187f03c46f25337fb7e9ab6c014cf26a76ca9cef 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 @@ -3658,7 +3658,7 @@ package: category: main optional: false - name: cryptography - version: 41.0.5 + version: 41.0.7 manager: conda platform: linux-64 dependencies: @@ -3667,14 +3667,14 @@ package: openssl: ">=3.1.4,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-41.0.5-py311h63ff55d_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/cryptography-41.0.7-py311hcb13ee4_1.conda hash: - md5: 22584e5c97ed8f1a6b63a0ff43dba827 - sha256: 236ed2218fb857fecaa11fc7fee23574f683b3d03576f8f26f628b7fd2ced5fa + md5: ca6e04ac7262ecaec846e483d6fdc6c8 + sha256: 0959d015727ae5f55f385556a0a19b9f6036752ea05f78a99cb534803e325cab category: main optional: false - name: cryptography - version: 41.0.5 + version: 41.0.7 manager: conda platform: osx-64 dependencies: @@ -3682,14 +3682,14 @@ package: openssl: ">=3.1.4,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/cryptography-41.0.5-py311hd51016d_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/cryptography-41.0.7-py311h48c7838_1.conda hash: - md5: 99f1edef251a9fe4edf620b527ee70ea - sha256: 26ee22b99771f0d338eca6299cbe866f695c544d855d5eab82539497b0a24fc1 + md5: 65293feff96135571de02c047ecbd5a2 + sha256: f4c5e683386acf06cfa85805d264c9cd540361ec6e86740cb03312e560aa706a category: main optional: false - name: cryptography - version: 41.0.5 + version: 41.0.7 manager: conda platform: osx-arm64 dependencies: @@ -3697,10 +3697,10 @@ package: openssl: ">=3.1.4,<4.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/cryptography-41.0.5-py311h71175c2_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/cryptography-41.0.7-py311h08c85a6_1.conda hash: - md5: adc55f424334b834098d50e57efe0789 - sha256: 00c9b389b51b6e951a1f639aa04dceca9e329e144275c79b4f6baacd3fb90345 + md5: 729546a91873db64ab8e675008845fb5 + sha256: 9d51ba743069d19aae08361a7b051ca1f281fb3b3ccb162e96c2503cf5a7d365 category: main optional: false - name: curl @@ -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_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.10-pyhd8ed1ab_0.conda hash: - md5: 8c1a941fe77b920b1c7933a7a0c6bf2e - sha256: 0e947f376d6878bd8e505932277e84c373da492a38d2c4ef9d96fc25f5327845 + 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_1.conda + dagster: 1.5.10.* + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.10-pyhd8ed1ab_0.conda hash: - md5: 8c1a941fe77b920b1c7933a7a0c6bf2e - sha256: 0e947f376d6878bd8e505932277e84c373da492a38d2c4ef9d96fc25f5327845 + 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_1.conda + dagster: 1.5.10.* + url: https://conda.anaconda.org/conda-forge/noarch/dagster-postgres-0.21.10-pyhd8ed1ab_0.conda hash: - md5: 8c1a941fe77b920b1c7933a7a0c6bf2e - sha256: 0e947f376d6878bd8e505932277e84c373da492a38d2c4ef9d96fc25f5327845 + 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,16 +4086,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: dask-core - version: 2023.11.0 + version: 2023.12.0 manager: conda platform: linux-64 dependencies: @@ -4108,14 +4108,14 @@ package: python: ">=3.9" pyyaml: ">=5.3.1" toolz: ">=0.10.0" - url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.12.0-pyhd8ed1ab_0.conda hash: - md5: 3bf8f5c3fbab9e0cfffdf5914f021854 - sha256: f23b4e5d8f118d9d7916d8def04dab9a299d73879216da72dd7168c1c30ecb9e + md5: 95eae0785aed72998493140dc0115382 + sha256: e366163aa7325d14ca38ca72ca4672eeb4b7a7453573c47cfa90d0db60136b48 category: main optional: false - name: dask-core - version: 2023.11.0 + version: 2023.12.0 manager: conda platform: osx-64 dependencies: @@ -4128,14 +4128,14 @@ package: importlib_metadata: ">=4.13.0" fsspec: ">=2021.09.0" click: ">=8.1" - url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.12.0-pyhd8ed1ab_0.conda hash: - md5: 3bf8f5c3fbab9e0cfffdf5914f021854 - sha256: f23b4e5d8f118d9d7916d8def04dab9a299d73879216da72dd7168c1c30ecb9e + md5: 95eae0785aed72998493140dc0115382 + sha256: e366163aa7325d14ca38ca72ca4672eeb4b7a7453573c47cfa90d0db60136b48 category: main optional: false - name: dask-core - version: 2023.11.0 + version: 2023.12.0 manager: conda platform: osx-arm64 dependencies: @@ -4148,10 +4148,10 @@ package: importlib_metadata: ">=4.13.0" fsspec: ">=2021.09.0" click: ">=8.1" - url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.12.0-pyhd8ed1ab_0.conda hash: - md5: 3bf8f5c3fbab9e0cfffdf5914f021854 - sha256: f23b4e5d8f118d9d7916d8def04dab9a299d73879216da72dd7168c1c30ecb9e + md5: 95eae0785aed72998493140dc0115382 + sha256: e366163aa7325d14ca38ca72ca4672eeb4b7a7453573c47cfa90d0db60136b48 category: main optional: false - name: dataclasses @@ -4528,8 +4528,8 @@ package: dependencies: sniffio: "" python: ">=3.8.0,<4.0.0" - cryptography: ">=2.6,<42.0" httpcore: ">=0.17.3" + cryptography: ">=2.6,<42.0" idna: ">=2.1,<4.0" url: https://conda.anaconda.org/conda-forge/noarch/dnspython-2.4.2-pyhd8ed1ab_1.conda hash: @@ -4544,8 +4544,8 @@ package: dependencies: sniffio: "" python: ">=3.8.0,<4.0.0" - cryptography: ">=2.6,<42.0" httpcore: ">=0.17.3" + cryptography: ">=2.6,<42.0" idna: ">=2.1,<4.0" url: https://conda.anaconda.org/conda-forge/noarch/dnspython-2.4.2-pyhd8ed1ab_1.conda hash: @@ -5104,7 +5104,7 @@ package: category: main optional: false - name: folium - version: 0.15.0 + version: 0.15.1 manager: conda platform: linux-64 dependencies: @@ -5113,42 +5113,45 @@ package: numpy: "" python: ">=3.7" requests: "" - url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.0-pyhd8ed1ab_0.conda + xyzservices: "" + url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.1-pyhd8ed1ab_0.conda hash: - md5: 25f5dbce4f946240dea7d2ee79d34254 - sha256: afe869f136fca1dbda8be0c342392fda99d951c4c4612f134a70efbf5449ef30 + md5: 4fdfc338f6fb875b1078a7e20dbc99e2 + sha256: c0730ddfaf35e39ac92b7fd07315843e7948b2ce3361d164ec1b722dd0440c2b category: main optional: false - name: folium - version: 0.15.0 + version: 0.15.1 manager: conda platform: osx-64 dependencies: numpy: "" requests: "" + xyzservices: "" python: ">=3.7" jinja2: ">=2.9" branca: ">=0.7.0" - url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.1-pyhd8ed1ab_0.conda hash: - md5: 25f5dbce4f946240dea7d2ee79d34254 - sha256: afe869f136fca1dbda8be0c342392fda99d951c4c4612f134a70efbf5449ef30 + md5: 4fdfc338f6fb875b1078a7e20dbc99e2 + sha256: c0730ddfaf35e39ac92b7fd07315843e7948b2ce3361d164ec1b722dd0440c2b category: main optional: false - name: folium - version: 0.15.0 + version: 0.15.1 manager: conda platform: osx-arm64 dependencies: numpy: "" requests: "" + xyzservices: "" python: ">=3.7" jinja2: ">=2.9" branca: ">=0.7.0" - url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/folium-0.15.1-pyhd8ed1ab_0.conda hash: - md5: 25f5dbce4f946240dea7d2ee79d34254 - sha256: afe869f136fca1dbda8be0c342392fda99d951c4c4612f134a70efbf5449ef30 + md5: 4fdfc338f6fb875b1078a7e20dbc99e2 + sha256: c0730ddfaf35e39ac92b7fd07315843e7948b2ce3361d164ec1b722dd0440c2b category: main optional: false - name: font-ttf-dejavu-sans-mono @@ -5409,7 +5412,7 @@ package: category: main optional: false - name: fonttools - version: 4.45.1 + version: 4.46.0 manager: conda platform: linux-64 dependencies: @@ -5418,14 +5421,14 @@ package: munkres: "" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.45.1-py311h459d7ec_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.46.0-py311h459d7ec_0.conda hash: - md5: 5b24692ece82f89e5cb9a469d9619731 - sha256: 57d311f86568d46f33845ea8c7d1c9e449a1fa85e510baa17f09e2cae2283681 + md5: a14114f70e23f7fd5ab9941fec45b095 + sha256: a40f8415d9ceaf5f217034814b984d13017e4dab577085a83a2d0cc39b9d7239 category: main optional: false - name: fonttools - version: 4.45.1 + version: 4.46.0 manager: conda platform: osx-64 dependencies: @@ -5433,14 +5436,14 @@ package: munkres: "" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/fonttools-4.45.1-py311he705e18_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/fonttools-4.46.0-py311he705e18_0.conda hash: - md5: 2910a2886c556ce4085fd59d73ae96f2 - sha256: 5a60241d7585b33160c169ae59b9bd9445c89bfb4604b2d77e7a0db48c04ccc5 + md5: c68a6370b0db24b87be1a4cd7a511545 + sha256: 05c4b4fe22ce74bd5145dacf261cec44bbadac82d1e65a0b3a03d2675330f1bb category: main optional: false - name: fonttools - version: 4.45.1 + version: 4.46.0 manager: conda platform: osx-arm64 dependencies: @@ -5448,10 +5451,10 @@ package: munkres: "" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/fonttools-4.45.1-py311h05b510d_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/fonttools-4.46.0-py311h05b510d_0.conda hash: - md5: 40c7471beb6af15161a202c0ddf04d82 - sha256: 7d8d2c8de468dc5a432e8d083f3b56eeec4380749bcfd09a44c81d42cacceece + md5: 1bac60f34700b22c8e8364f32b502211 + sha256: 300d8cc1cc987ab913e3b24c38f8eaf679acff0e885747a3f71471fd92db3e33 category: main optional: false - name: fqdn @@ -5735,39 +5738,39 @@ package: category: main optional: false - name: fsspec - version: 2023.10.0 + version: 2023.12.0 manager: conda platform: linux-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.10.0-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.0-pyhca7485f_0.conda hash: - md5: 5b86cf1ceaaa9be2ec4627377e538db1 - sha256: 1bbdfadb93cc768252fd207dca406cde928f9a81ff985ea1760b6539c55923e6 + md5: 036539452871d3b0906ff194ad808c9b + sha256: 72c84d372aa5d60eb31c53c108bacefb0c6fb854047441b543738e144f1fae65 category: main optional: false - name: fsspec - version: 2023.10.0 + version: 2023.12.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.10.0-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.0-pyhca7485f_0.conda hash: - md5: 5b86cf1ceaaa9be2ec4627377e538db1 - sha256: 1bbdfadb93cc768252fd207dca406cde928f9a81ff985ea1760b6539c55923e6 + md5: 036539452871d3b0906ff194ad808c9b + sha256: 72c84d372aa5d60eb31c53c108bacefb0c6fb854047441b543738e144f1fae65 category: main optional: false - name: fsspec - version: 2023.10.0 + version: 2023.12.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.10.0-pyhca7485f_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.12.0-pyhca7485f_0.conda hash: - md5: 5b86cf1ceaaa9be2ec4627377e538db1 - sha256: 1bbdfadb93cc768252fd207dca406cde928f9a81ff985ea1760b6539c55923e6 + md5: 036539452871d3b0906ff194ad808c9b + sha256: 72c84d372aa5d60eb31c53c108bacefb0c6fb854047441b543738e144f1fae65 category: main optional: false - name: furo @@ -5819,26 +5822,26 @@ package: category: main optional: false - name: gcsfs - version: 2023.10.0 + version: 2023.12.0 manager: conda platform: linux-64 dependencies: aiohttp: "" decorator: ">4.1.2" - fsspec: 2023.10.0 + fsspec: 2023.12.0 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.10.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.12.0-pyhd8ed1ab_0.conda hash: - md5: 500521931bdcc0f6d19c1c2e2ab4a5d9 - sha256: dd7559c5297359e475a125742e9cb30938579e93a17ce7537af64a04c98407a5 + md5: ad178e852250983982f3e2247635029d + sha256: 39dfbcb02360069206835f395cc0f169ead32005ff0c941a73526cdcfc18cd4b category: main optional: false - name: gcsfs - version: 2023.10.0 + version: 2023.12.0 manager: conda platform: osx-64 dependencies: @@ -5849,15 +5852,15 @@ package: google-auth: ">=1.2" decorator: ">4.1.2" google-cloud-storage: ">1.40" - fsspec: 2023.10.0 - url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.10.0-pyhd8ed1ab_0.conda + fsspec: 2023.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.12.0-pyhd8ed1ab_0.conda hash: - md5: 500521931bdcc0f6d19c1c2e2ab4a5d9 - sha256: dd7559c5297359e475a125742e9cb30938579e93a17ce7537af64a04c98407a5 + md5: ad178e852250983982f3e2247635029d + sha256: 39dfbcb02360069206835f395cc0f169ead32005ff0c941a73526cdcfc18cd4b category: main optional: false - name: gcsfs - version: 2023.10.0 + version: 2023.12.0 manager: conda platform: osx-arm64 dependencies: @@ -5868,71 +5871,71 @@ package: google-auth: ">=1.2" decorator: ">4.1.2" google-cloud-storage: ">1.40" - fsspec: 2023.10.0 - url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.10.0-pyhd8ed1ab_0.conda + fsspec: 2023.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/gcsfs-2023.12.0-pyhd8ed1ab_0.conda hash: - md5: 500521931bdcc0f6d19c1c2e2ab4a5d9 - sha256: dd7559c5297359e475a125742e9cb30938579e93a17ce7537af64a04c98407a5 + md5: ad178e852250983982f3e2247635029d + sha256: 39dfbcb02360069206835f395cc0f169ead32005ff0c941a73526cdcfc18cd4b 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.3.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.3.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.3.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 @@ -8292,78 +8295,78 @@ package: category: main optional: false - name: importlib-metadata - version: 6.8.0 + version: 7.0.0 manager: conda platform: linux-64 dependencies: python: ">=3.8" zipp: ">=0.5" - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.8.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-7.0.0-pyha770c72_0.conda hash: - md5: 4e9f59a060c3be52bc4ddc46ee9b6946 - sha256: 2797ed927d65324309b6c630190d917b9f2111e0c217b721f80429aeb57f9fcf + md5: a941237cd06538837b25cd245fcd25d8 + sha256: 9731e82a00d36b182dc515e31723e711ac82890bb1ca86c6a17a4b471135564f category: main optional: false - name: importlib-metadata - version: 6.8.0 + version: 7.0.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" zipp: ">=0.5" - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.8.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-7.0.0-pyha770c72_0.conda hash: - md5: 4e9f59a060c3be52bc4ddc46ee9b6946 - sha256: 2797ed927d65324309b6c630190d917b9f2111e0c217b721f80429aeb57f9fcf + md5: a941237cd06538837b25cd245fcd25d8 + sha256: 9731e82a00d36b182dc515e31723e711ac82890bb1ca86c6a17a4b471135564f category: main optional: false - name: importlib-metadata - version: 6.8.0 + version: 7.0.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" zipp: ">=0.5" - url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.8.0-pyha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-7.0.0-pyha770c72_0.conda hash: - md5: 4e9f59a060c3be52bc4ddc46ee9b6946 - sha256: 2797ed927d65324309b6c630190d917b9f2111e0c217b721f80429aeb57f9fcf + md5: a941237cd06538837b25cd245fcd25d8 + sha256: 9731e82a00d36b182dc515e31723e711ac82890bb1ca86c6a17a4b471135564f category: main optional: false - name: importlib_metadata - version: 6.8.0 + version: 7.0.0 manager: conda platform: linux-64 dependencies: - importlib-metadata: ">=6.8.0,<6.8.1.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.8.0-hd8ed1ab_0.conda + importlib-metadata: ">=7.0.0,<7.0.1.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-7.0.0-hd8ed1ab_0.conda hash: - md5: b279b07ce18058034e5b3606ba103a8b - sha256: b96e01dc42d547d6d9ceb1c5b52a5232cc04e40153534350f702c3e0418a6b3f + md5: 12aff14f84c337be5e5636bf612f4140 + sha256: b9e8ed41df6c55222e3777f422e77a22a6a19ff779b2e65aa8dfdea792c1f7de category: main optional: false - name: importlib_metadata - version: 6.8.0 + version: 7.0.0 manager: conda platform: osx-64 dependencies: - importlib-metadata: ">=6.8.0,<6.8.1.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.8.0-hd8ed1ab_0.conda + importlib-metadata: ">=7.0.0,<7.0.1.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-7.0.0-hd8ed1ab_0.conda hash: - md5: b279b07ce18058034e5b3606ba103a8b - sha256: b96e01dc42d547d6d9ceb1c5b52a5232cc04e40153534350f702c3e0418a6b3f + md5: 12aff14f84c337be5e5636bf612f4140 + sha256: b9e8ed41df6c55222e3777f422e77a22a6a19ff779b2e65aa8dfdea792c1f7de category: main optional: false - name: importlib_metadata - version: 6.8.0 + version: 7.0.0 manager: conda platform: osx-arm64 dependencies: - importlib-metadata: ">=6.8.0,<6.8.1.0a0" - url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.8.0-hd8ed1ab_0.conda + importlib-metadata: ">=7.0.0,<7.0.1.0a0" + url: https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-7.0.0-hd8ed1ab_0.conda hash: - md5: b279b07ce18058034e5b3606ba103a8b - sha256: b96e01dc42d547d6d9ceb1c5b52a5232cc04e40153534350f702c3e0418a6b3f + md5: 12aff14f84c337be5e5636bf612f4140 + sha256: b9e8ed41df6c55222e3777f422e77a22a6a19ff779b2e65aa8dfdea792c1f7de category: main optional: false - name: importlib_resources @@ -10273,43 +10276,43 @@ package: category: main optional: false - name: lcms2 - version: "2.15" + version: "2.16" manager: conda platform: linux-64 dependencies: libgcc-ng: ">=12" libjpeg-turbo: ">=3.0.0,<4.0a0" libtiff: ">=4.6.0,<4.7.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.15-hb7c19ff_3.conda + url: https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.16-hb7c19ff_0.conda hash: - md5: e96637dd92c5f340215c753a5c9a22d7 - sha256: cc0b2ddab52b20698b26fe8622ebe37e0d462d8691a1f324e7b00f7d904765e3 + md5: 51bb7010fc86f70eee639b4bb7a894f5 + sha256: 5c878d104b461b7ef922abe6320711c0d01772f4cd55de18b674f88547870041 category: main optional: false - name: lcms2 - version: "2.15" + version: "2.16" manager: conda platform: osx-64 dependencies: libjpeg-turbo: ">=3.0.0,<4.0a0" libtiff: ">=4.6.0,<4.7.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/lcms2-2.15-hd6ba6f3_3.conda + url: https://conda.anaconda.org/conda-forge/osx-64/lcms2-2.16-ha2f27b4_0.conda hash: - md5: 8059507d52f477fbd4b81841e085e25b - sha256: b2234f24e3b0030762430ec3414410119d1129804a95ef65af50ad36cabd9bd5 + md5: 1442db8f03517834843666c422238c9b + sha256: 222ebc0a55544b9922f61e75015d02861e65b48f12113af41d48ba0814e14e4e category: main optional: false - name: lcms2 - version: "2.15" + version: "2.16" manager: conda platform: osx-arm64 dependencies: libjpeg-turbo: ">=3.0.0,<4.0a0" libtiff: ">=4.6.0,<4.7.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/lcms2-2.15-hf2736f0_3.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/lcms2-2.16-ha0e7c42_0.conda hash: - md5: bbaac531169fed3e09ae31aff80aa069 - sha256: 3d07ba04602617c3084b302c8a6fa30b2e4b20511180f45992b289c312298018 + md5: 66f6c134e76fe13cce8a9ea5814b5dd5 + sha256: 151e0c84feb7e0747fabcc85006b8973b22f5abbc3af76a9add0b0ef0320ebe4 category: main optional: false - name: ld_impl_linux-64 @@ -11502,13 +11505,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" @@ -11531,7 +11534,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" @@ -11540,29 +11543,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" @@ -11585,36 +11588,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" @@ -11637,26 +11640,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 @@ -12435,11 +12438,11 @@ package: 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-hfc447b1_2.conda hash: - md5: 2b7f1893cf40b4ccdc0230bcd94d5ed9 - sha256: 8c92a8cce329a83cc9e94b19d18200c661957c00cfb464f26237d24730864585 + md5: 3cfa1ceef6936e656677ba59480106ce + sha256: 6ce23d046522c39cda5c25e47d303b39f8b31a2aac2c59ea3e41710a072ff0bf category: main optional: false - name: libpq @@ -12449,11 +12452,11 @@ package: 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-h6dd4ff7_2.conda hash: - md5: 39de94ff4ccc306f3d24ef7aef13c689 - sha256: 1a51c9b3451eebf04ac1f7a7a58fec07c2e44d2298514a30f62b5b432a653c07 + md5: 7aa484702ee6f49c7a728b578a544b27 + sha256: 13011b0b9b31771197155d3547dcdf2c5f8f8a91f86f2b4d45fbf8a4d6f53d0a category: main optional: false - name: libpq @@ -12463,11 +12466,11 @@ package: 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-hd435d45_2.conda hash: - md5: 883bbf64780c91608f1a7df9203b79a5 - sha256: 1b5c86d5f247b3e154ae373dcebea6979368c4a0ee722d39ec33ee2fc8528c04 + md5: b4d4402f19365ed54ad529e09bfa7cdb + sha256: 50e96d4014b59ef337a74322be4394e27e6be65c3c5356b98ee0be1f6f4086a1 category: main optional: false - name: libprotobuf @@ -15313,40 +15316,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 @@ -16412,7 +16415,7 @@ package: category: main optional: false - name: poppler - version: 23.11.0 + version: 23.12.0 manager: conda platform: linux-64 dependencies: @@ -16423,7 +16426,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" @@ -16431,17 +16434,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: @@ -16454,24 +16457,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: @@ -16484,20 +16487,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 @@ -16541,17 +16544,17 @@ 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_2.conda hash: - md5: 1e9ab0760262044fa00814088667e451 - sha256: 74dfb5793a00a0a9e85296ce0944d8af0f71758574b7c8f9e7d5590250441e24 + md5: a175fe7a349a7e4cda81f4d7ae2bc2b2 + sha256: b2c258a78effab00f8db53e5dd04a43baf309c9a3c164c0d6f52de836b3baea5 category: main optional: false - name: postgresql @@ -16561,17 +16564,17 @@ 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_2.conda hash: - md5: b7322d27093606b939fb92fa33b92beb - sha256: 612393024639882d7515429e639c85fa3b712d114c5a6b3a4b3891b061e1bc89 + md5: ad5e3602657162ddcab580d052df0bd4 + sha256: 47282bff8ca6c64f72276401e8bcfff625cadcdcbfd3804bb08d9dcbe7485907 category: main optional: false - name: postgresql @@ -16581,17 +16584,17 @@ 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_2.conda hash: - md5: 37398d1ad2fbeaa7733711b845da863e - sha256: 441f5ad3fac42e7daf9c246ad0dc0962c7f0b4c9ac1044038d3a053d339320bf + md5: a2562d92a27e19371e2655fe48e6952f + sha256: a896c5ab8930a4d9f980471b64d6eb254a22c46565ebb777d99e235c8c0fb7f9 category: main optional: false - name: pre-commit @@ -21167,45 +21170,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 @@ -22876,7 +22879,7 @@ package: category: main optional: false - name: virtualenv - version: 20.24.7 + version: 20.25.0 manager: conda platform: linux-64 dependencies: @@ -22884,14 +22887,14 @@ package: filelock: <4,>=3.12.2 platformdirs: <5,>=3.9.1 python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.24.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.25.0-pyhd8ed1ab_0.conda hash: - md5: db990278c2c00b268eed778de44f6057 - sha256: ad661ae59c64bd73c25dfadb00c601659f4d9cafbf428e36a690075e52bac96a + md5: c119653cba436d8183c27bf6d190e587 + sha256: 50827c3721a9dbf973b568709d4381add2a6552fa562f26a385c5edc16a534af category: main optional: false - name: virtualenv - version: 20.24.7 + version: 20.25.0 manager: conda platform: osx-64 dependencies: @@ -22899,14 +22902,14 @@ package: distlib: <1,>=0.3.7 filelock: <4,>=3.12.2 platformdirs: <5,>=3.9.1 - url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.24.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.25.0-pyhd8ed1ab_0.conda hash: - md5: db990278c2c00b268eed778de44f6057 - sha256: ad661ae59c64bd73c25dfadb00c601659f4d9cafbf428e36a690075e52bac96a + md5: c119653cba436d8183c27bf6d190e587 + sha256: 50827c3721a9dbf973b568709d4381add2a6552fa562f26a385c5edc16a534af category: main optional: false - name: virtualenv - version: 20.24.7 + version: 20.25.0 manager: conda platform: osx-arm64 dependencies: @@ -22914,10 +22917,10 @@ package: distlib: <1,>=0.3.7 filelock: <4,>=3.12.2 platformdirs: <5,>=3.9.1 - url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.24.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.25.0-pyhd8ed1ab_0.conda hash: - md5: db990278c2c00b268eed778de44f6057 - sha256: ad661ae59c64bd73c25dfadb00c601659f4d9cafbf428e36a690075e52bac96a + md5: c119653cba436d8183c27bf6d190e587 + sha256: 50827c3721a9dbf973b568709d4381add2a6552fa562f26a385c5edc16a534af category: main optional: false - name: watchdog @@ -23114,39 +23117,39 @@ package: category: main optional: false - name: websocket-client - version: 1.6.4 + version: 1.7.0 manager: conda platform: linux-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.6.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.7.0-pyhd8ed1ab_0.conda hash: - md5: bdb77b28cf16deac0eef431a068320e8 - sha256: df45b89862edcd7cd5180ec7b8c0c0ca9fb4d3f7d49ddafccdc76afcf50d8da6 + md5: 50ad31e07d706aae88b14a4ac9c73f23 + sha256: d9b537d5b7c5aa7a02a4ce4c6b755e458bd8083b67752a73c92d113ccec6c10f category: main optional: false - name: websocket-client - version: 1.6.4 + version: 1.7.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.6.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.7.0-pyhd8ed1ab_0.conda hash: - md5: bdb77b28cf16deac0eef431a068320e8 - sha256: df45b89862edcd7cd5180ec7b8c0c0ca9fb4d3f7d49ddafccdc76afcf50d8da6 + md5: 50ad31e07d706aae88b14a4ac9c73f23 + sha256: d9b537d5b7c5aa7a02a4ce4c6b755e458bd8083b67752a73c92d113ccec6c10f category: main optional: false - name: websocket-client - version: 1.6.4 + version: 1.7.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.6.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/websocket-client-1.7.0-pyhd8ed1ab_0.conda hash: - md5: bdb77b28cf16deac0eef431a068320e8 - sha256: df45b89862edcd7cd5180ec7b8c0c0ca9fb4d3f7d49ddafccdc76afcf50d8da6 + md5: 50ad31e07d706aae88b14a4ac9c73f23 + sha256: d9b537d5b7c5aa7a02a4ce4c6b755e458bd8083b67752a73c92d113ccec6c10f category: main optional: false - name: websockets diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index 12d78b1972..da2a4d0732 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -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 @@ -114,7 +114,7 @@ dependencies: - gdk-pixbuf=2.42.10=hbb5a27d_4 - gts=0.7.6=h53e17e3_4 - krb5=1.21.2=hb884880_0 - - lcms2=2.15=hd6ba6f3_3 + - lcms2=2.16=ha2f27b4_0 - libopenblas=0.3.25=openmp_hfef2a42_0 - libthrift=0.19.0=h064b379_1 - libwebp=1.3.2=h44782d1_1 @@ -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 @@ -167,7 +167,7 @@ dependencies: - executing=2.0.1=pyhd8ed1ab_0 - filelock=3.13.1=pyhd8ed1ab_0 - frozenlist=1.4.0=py311h2725bcf_1 - - fsspec=2023.10.0=pyhca7485f_0 + - fsspec=2023.12.0=pyhca7485f_0 - google-cloud-sdk=455.0.0=py311h6eed73b_0 - greenlet=3.0.1=py311hd39e593_0 - hpack=4.0.0=pyh9f0ad1d_0 @@ -190,7 +190,7 @@ dependencies: - libcurl=8.4.0=h726d00d_0 - libgd=2.3.3=h0dceb68_9 - libgrpc=1.59.2=ha7f534c_0 - - libpq=16.1=h6dd4ff7_0 + - libpq=16.1=h6dd4ff7_2 - llvmlite=0.41.1=py311hb5c2e0a_0 - locket=1.0.0=pyhd8ed1ab_0 - lxml=4.9.3=py311h19a211c_1 @@ -279,7 +279,7 @@ dependencies: - wcwidth=0.2.12=pyhd8ed1ab_0 - webcolors=1.13=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_2 - - websocket-client=1.6.4=pyhd8ed1ab_0 + - websocket-client=1.7.0=pyhd8ed1ab_0 - websockets=10.4=py311h5547dcb_1 - wheel=0.42.0=pyhd8ed1ab_0 - widgetsnbextension=4.0.9=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 @@ -310,7 +310,7 @@ dependencies: - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311h2725bcf_0 - curl=8.4.0=h726d00d_0 - - fonttools=4.45.1=py311he705e18_0 + - fonttools=4.46.0=py311he705e18_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 - grpcio=1.59.2=py311hfd95bfa_0 @@ -320,7 +320,7 @@ dependencies: - hdf5=1.14.2=nompi_hedada53_100 - html5lib=1.1=pyh9f0ad1d_0 - hypothesis=6.91.0=pyha770c72_0 - - importlib-metadata=6.8.0=pyha770c72_0 + - importlib-metadata=7.0.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 - janus=1.0.0=pyhd8ed1ab_0 @@ -345,8 +345,8 @@ dependencies: - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - platformdirs=4.0.0=pyhd8ed1ab_0 - - poppler=23.11.0=hdd5a5e8_0 - - postgresql=16.1=h413614c_0 + - poppler=23.12.0=hdd5a5e8_0 + - postgresql=16.1=h413614c_2 - proj=9.3.0=h23b96cc_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h021eaf5_0 @@ -381,10 +381,10 @@ 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.5=pyhd8ed1ab_0 + - botocore=1.33.6=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - - cryptography=41.0.5=py311hd51016d_0 + - cryptography=41.0.7=py311h48c7838_1 - fqdn=1.5.1=pyhd8ed1ab_0 - geotiff=1.7.1=h889ec99_14 - gitpython=3.1.40=pyhd8ed1ab_0 @@ -394,7 +394,7 @@ dependencies: - graphql-relay=3.2.0=pyhd8ed1ab_0 - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - httpcore=1.0.2=pyhd8ed1ab_0 - - importlib_metadata=6.8.0=hd8ed1ab_0 + - importlib_metadata=7.0.0=hd8ed1ab_0 - jsonschema-specifications=2023.11.2=pyhd8ed1ab_0 - jupyter_core=5.5.0=py311h6eed73b_0 - jupyter_server_terminals=0.4.4=pyhd8ed1ab_1 @@ -421,24 +421,24 @@ 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.post1=py311h6eed73b_0 - - virtualenv=20.24.7=pyhd8ed1ab_0 + - virtualenv=20.25.0=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h5e0f0e4_0 - aiohttp=3.8.6=py311he705e18_1 - - alembic=1.12.1=pyhd8ed1ab_0 + - alembic=1.13.0=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 - cachecontrol=0.13.1=pyhd8ed1ab_0 - contourpy=1.2.0=py311h7bea37d_0 - - dask-core=2023.11.0=pyhd8ed1ab_0 + - dask-core=2023.12.0=pyhd8ed1ab_0 - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - - folium=0.15.0=pyhd8ed1ab_0 + - folium=0.15.1=pyhd8ed1ab_0 - google-resumable-media=2.6.0=pyhd8ed1ab_0 - graphene=3.3=pyhd8ed1ab_0 - grpcio-status=1.59.2=pyhd8ed1ab_0 @@ -451,7 +451,7 @@ 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 @@ -471,14 +471,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.5=pyhd8ed1ab_0 + - boto3=1.33.6=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 + - gdal=3.8.1=py311h5646c56_1 - geopandas-base=0.14.1=pyha770c72_0 - google-auth=2.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 @@ -497,8 +497,8 @@ dependencies: - timezonefinder=6.2.0=py311he705e18_2 - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.9=pyhd8ed1ab_0 - - dagster-postgres=0.21.9=pyhd8ed1ab_1 + - 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 @@ -526,7 +526,7 @@ dependencies: - 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 + - gcsfs=2023.12.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 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 4cd3f6d3c9..631841e00f 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -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 @@ -114,7 +114,7 @@ dependencies: - gdk-pixbuf=2.42.10=h15fa40c_4 - gts=0.7.6=he42f4ea_4 - krb5=1.21.2=h92f50d5_0 - - lcms2=2.15=hf2736f0_3 + - lcms2=2.16=ha0e7c42_0 - libopenblas=0.3.25=openmp_h6c19121_0 - libthrift=0.19.0=h026a170_1 - libwebp=1.3.2=hf30222e_1 @@ -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 @@ -167,7 +167,7 @@ dependencies: - executing=2.0.1=pyhd8ed1ab_0 - filelock=3.13.1=pyhd8ed1ab_0 - frozenlist=1.4.0=py311heffc1b2_1 - - fsspec=2023.10.0=pyhca7485f_0 + - fsspec=2023.12.0=pyhca7485f_0 - google-cloud-sdk=455.0.0=py311h267d04e_0 - greenlet=3.0.1=py311hbaf5611_0 - hpack=4.0.0=pyh9f0ad1d_0 @@ -190,7 +190,7 @@ dependencies: - libcurl=8.4.0=h2d989ff_0 - libgd=2.3.3=hfdf3952_9 - libgrpc=1.59.2=hbcf6334_0 - - libpq=16.1=hd435d45_0 + - libpq=16.1=hd435d45_2 - llvmlite=0.41.1=py311hf5d242d_0 - locket=1.0.0=pyhd8ed1ab_0 - lxml=4.9.3=py311hbafe683_1 @@ -279,7 +279,7 @@ dependencies: - wcwidth=0.2.12=pyhd8ed1ab_0 - webcolors=1.13=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_2 - - websocket-client=1.6.4=pyhd8ed1ab_0 + - websocket-client=1.7.0=pyhd8ed1ab_0 - websockets=10.4=py311he2be06e_1 - wheel=0.42.0=pyhd8ed1ab_0 - widgetsnbextension=4.0.9=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 @@ -310,7 +310,7 @@ dependencies: - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311heffc1b2_0 - curl=8.4.0=h2d989ff_0 - - fonttools=4.45.1=py311h05b510d_0 + - fonttools=4.46.0=py311h05b510d_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 - grpcio=1.59.2=py311h79dd126_0 @@ -320,7 +320,7 @@ dependencies: - hdf5=1.14.2=nompi_h3aba7b3_100 - html5lib=1.1=pyh9f0ad1d_0 - hypothesis=6.91.0=pyha770c72_0 - - importlib-metadata=6.8.0=pyha770c72_0 + - importlib-metadata=7.0.0=pyha770c72_0 - importlib_resources=6.1.1=pyhd8ed1ab_0 - isodate=0.6.1=pyhd8ed1ab_0 - janus=1.0.0=pyhd8ed1ab_0 @@ -345,8 +345,8 @@ dependencies: - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - platformdirs=4.0.0=pyhd8ed1ab_0 - - poppler=23.11.0=hcdd998b_0 - - postgresql=16.1=hc6ab77f_0 + - poppler=23.12.0=hcdd998b_0 + - postgresql=16.1=hc6ab77f_2 - proj=9.3.0=h52fb9d0_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h4d1eceb_0 @@ -381,10 +381,10 @@ 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.5=pyhd8ed1ab_0 + - botocore=1.33.6=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - - cryptography=41.0.5=py311h71175c2_0 + - cryptography=41.0.7=py311h08c85a6_1 - fqdn=1.5.1=pyhd8ed1ab_0 - geotiff=1.7.1=h71398c0_14 - gitpython=3.1.40=pyhd8ed1ab_0 @@ -394,7 +394,7 @@ dependencies: - graphql-relay=3.2.0=pyhd8ed1ab_0 - grpcio-health-checking=1.59.2=pyhd8ed1ab_0 - httpcore=1.0.2=pyhd8ed1ab_0 - - importlib_metadata=6.8.0=hd8ed1ab_0 + - importlib_metadata=7.0.0=hd8ed1ab_0 - jsonschema-specifications=2023.11.2=pyhd8ed1ab_0 - jupyter_core=5.5.0=py311h267d04e_0 - jupyter_server_terminals=0.4.4=pyhd8ed1ab_1 @@ -421,24 +421,24 @@ 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.post1=py311h267d04e_0 - - virtualenv=20.24.7=pyhd8ed1ab_0 + - virtualenv=20.25.0=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h94f323b_0 - aiohttp=3.8.6=py311h05b510d_1 - - alembic=1.12.1=pyhd8ed1ab_0 + - alembic=1.13.0=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 - cachecontrol=0.13.1=pyhd8ed1ab_0 - contourpy=1.2.0=py311hd03642b_0 - - dask-core=2023.11.0=pyhd8ed1ab_0 + - dask-core=2023.12.0=pyhd8ed1ab_0 - dnspython=2.4.2=pyhd8ed1ab_1 - ensureconda=1.4.3=pyhd8ed1ab_0 - - folium=0.15.0=pyhd8ed1ab_0 + - folium=0.15.1=pyhd8ed1ab_0 - google-resumable-media=2.6.0=pyhd8ed1ab_0 - graphene=3.3=pyhd8ed1ab_0 - grpcio-status=1.59.2=pyhd8ed1ab_0 @@ -451,7 +451,7 @@ 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 @@ -471,14 +471,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.5=pyhd8ed1ab_0 + - boto3=1.33.6=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 + - gdal=3.8.1=py311h32a4f3d_1 - geopandas-base=0.14.1=pyha770c72_0 - google-auth=2.24.0=pyhca7485f_0 - gql-with-requests=3.4.1=pyhd8ed1ab_0 @@ -497,8 +497,8 @@ dependencies: - timezonefinder=6.2.0=py311h05b510d_2 - catalystcoop.ferc_xbrl_extractor=1.3.1=pyhd8ed1ab_0 - conda-lock=2.5.1=pyhd8ed1ab_0 - - dagster-graphql=1.5.9=pyhd8ed1ab_0 - - dagster-postgres=0.21.9=pyhd8ed1ab_1 + - 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 @@ -526,7 +526,7 @@ dependencies: - 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 + - gcsfs=2023.12.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 From 65d1816417831ebc48ccb9eedadd805ddbaebe00 Mon Sep 17 00:00:00 2001 From: bendnorman Date: Mon, 4 Dec 2023 17:03:53 -0900 Subject: [PATCH 43/47] Add apt-get installs back and update python log level [no ci] --- docker/Dockerfile | 26 +++++++++++++------------- docker/gcp_pudl_etl.sh | 1 + 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 361f821203..9247f98c78 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,10 +7,10 @@ SHELL [ "/bin/bash", "-exo", "pipefail", "-c" ] # Install some linux packages # awscli requires unzip, less, groff and mandoc # hadolint ignore=DL3008 -# RUN apt-get update && \ -# apt-get install --no-install-recommends -y git jq unzip less groff mandoc && \ -# apt-get clean && \ -# rm -rf /var/lib/apt/lists/* +RUN apt-get update && \ + apt-get install --no-install-recommends -y git jq unzip less groff mandoc && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* # Configure gsutil authentication # hadolint ignore=DL3059 @@ -53,16 +53,16 @@ RUN --mount=type=bind,source=.git,target=${PUDL_REPO}/.git \ ${CONDA_RUN} pudl_setup -# # Install awscli2 -# # Change back to root because the install script needs access to /usr/local/aws-cli -# USER root -# RUN ${CONDA_RUN} bash -c 'curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && unzip awscliv2.zip && ./aws/install' -# USER $MAMBA_USER +# Install awscli2 +# Change back to root because the install script needs access to /usr/local/aws-cli +USER root +RUN ${CONDA_RUN} bash -c 'curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && unzip awscliv2.zip && ./aws/install' +USER $MAMBA_USER -# # Install flyctl -# # hadolint ignore=DL3059 -# RUN ${CONDA_RUN} bash -c 'curl -L https://fly.io/install.sh | sh' -# ENV PATH="${CONTAINER_HOME}/.fly/bin:$PATH" +# Install flyctl +# hadolint ignore=DL3059 +RUN ${CONDA_RUN} bash -c 'curl -L https://fly.io/install.sh | sh' +ENV PATH="${CONTAINER_HOME}/.fly/bin:$PATH" # Run the unit tests: diff --git a/docker/gcp_pudl_etl.sh b/docker/gcp_pudl_etl.sh index 0544a1b53a..47471b8af7 100644 --- a/docker/gcp_pudl_etl.sh +++ b/docker/gcp_pudl_etl.sh @@ -22,6 +22,7 @@ function authenticate_gcp() { } function run_pudl_etl() { + export PYTHONVERBOSE=1 send_slack_msg ":large_yellow_circle: Deployment started for $ACTION_SHA-$GITHUB_REF :floppy_disk:" authenticate_gcp && \ alembic upgrade head && \ From 6125ea9484db1e19399e0e98b1a5ec69d6ae4231 Mon Sep 17 00:00:00 2001 From: bendnorman Date: Mon, 4 Dec 2023 17:31:06 -0900 Subject: [PATCH 44/47] Restrict dagster-postgres version [no ci] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7a970bd38b..7197a778cd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,7 @@ dependencies = [ "conda-lock>=2.5.1", "coverage>=7", "dagster>=1.5.6", - "dagster-postgres>=0.21.6,<1", # Update when dagster-postgres graduates to 1.x + "dagster-postgres>=0.21.6,<0.21.10", # Update when dagster-postgres graduates to 1.x "dask>=2023", "datapackage>=1.15,<2", # Transition datastore to use frictionless. "datasette>=0.64", From 68cc9a7e913467879012146b2960243c4018e48d Mon Sep 17 00:00:00 2001 From: bendnorman Date: Mon, 4 Dec 2023 17:50:42 -0900 Subject: [PATCH 45/47] Revert debugging changes --- docker/gcp_pudl_etl.sh | 1 - pyproject.toml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/gcp_pudl_etl.sh b/docker/gcp_pudl_etl.sh index 47471b8af7..0544a1b53a 100644 --- a/docker/gcp_pudl_etl.sh +++ b/docker/gcp_pudl_etl.sh @@ -22,7 +22,6 @@ function authenticate_gcp() { } function run_pudl_etl() { - export PYTHONVERBOSE=1 send_slack_msg ":large_yellow_circle: Deployment started for $ACTION_SHA-$GITHUB_REF :floppy_disk:" authenticate_gcp && \ alembic upgrade head && \ diff --git a/pyproject.toml b/pyproject.toml index 7197a778cd..7a970bd38b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,7 @@ dependencies = [ "conda-lock>=2.5.1", "coverage>=7", "dagster>=1.5.6", - "dagster-postgres>=0.21.6,<0.21.10", # Update when dagster-postgres graduates to 1.x + "dagster-postgres>=0.21.6,<1", # Update when dagster-postgres graduates to 1.x "dask>=2023", "datapackage>=1.15,<2", # Transition datastore to use frictionless. "datasette>=0.64", From 984c64bb2a661f2c58c84b3da891db226ed6e2c1 Mon Sep 17 00:00:00 2001 From: bendnorman Date: Tue, 5 Dec 2023 02:54:31 +0000 Subject: [PATCH 46/47] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 24 +-- environments/conda-lock.yml | 287 +++++++++++++------------- environments/conda-osx-64.lock.yml | 22 +- environments/conda-osx-arm64.lock.yml | 24 +-- 4 files changed, 177 insertions(+), 180 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index b45e606241..8606834613 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -232,6 +232,7 @@ dependencies: - pickleshare=0.7.5=py_1003 - pkginfo=1.9.6=pyhd8ed1ab_0 - 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 - prometheus_client=0.19.0=pyhd8ed1ab_0 @@ -262,7 +263,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.6=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 @@ -349,6 +350,7 @@ dependencies: - jinja2=3.1.2=pyhd8ed1ab_1 - joblib=1.3.2=pyhd8ed1ab_0 - jsonlines=4.0.0=pyhd8ed1ab_0 + - jupyter_core=5.5.0=py311h38be061_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - libcblas=3.9.0=20_linux64_openblas @@ -366,12 +368,11 @@ dependencies: - pillow=10.1.0=py311ha6c5da5_0 - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - - platformdirs=4.0.0=pyhd8ed1ab_0 - postgresql=16.1=h8972f4a_2 - proj=9.3.0=h1d62c97_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h46cbc50_0 - - psycopg2=2.9.7=py311h03dec38_1 + - psycopg2=2.9.9=py311h03dec38_0 - pyasn1-modules=0.3.0=pyhd8ed1ab_0 - pyproject_hooks=1.0.0=pyhd8ed1ab_0 - pytest=7.4.3=pyhd8ed1ab_0 @@ -391,6 +392,7 @@ dependencies: - typing_inspect=0.9.0=pyhd8ed1ab_0 - universal_pathlib=0.1.4=pyhd8ed1ab_0 - urllib3=1.26.18=pyhd8ed1ab_0 + - virtualenv=20.25.0=pyhd8ed1ab_0 - watchdog=3.0.0=py311h38be061_1 - xerces-c=3.2.4=hac6953d_3 - yarl=1.9.3=py311h459d7ec_0 @@ -417,7 +419,6 @@ dependencies: - httpcore=1.0.2=pyhd8ed1ab_0 - importlib_metadata=7.0.0=hd8ed1ab_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 - libnetcdf=4.9.2=nompi_h80fb2b6_112 @@ -428,7 +429,7 @@ dependencies: - pendulum=2.1.2=py311h459d7ec_6 - poppler=23.12.0=h590f24d_0 - 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=py311h46250e7_0 - pyproj=3.6.1=py311h1facc83_4 @@ -445,11 +446,10 @@ dependencies: - tiledb=2.16.3=h8c794c1_3 - ukkonen=1.0.1=py311h9547e67_4 - uvicorn=0.24.0.post1=py311h38be061_0 - - virtualenv=20.25.0=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h46250e7_0 - aiohttp=3.8.6=py311h459d7ec_1 - alembic=1.13.0=pyhd8ed1ab_0 - - arelle-release=2.17.7=pyhd8ed1ab_0 + - arelle-release=2.18.0=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - aws-crt-cpp=0.24.7=h97e63c7_6 - bottleneck=1.3.7=py311h1f0f07a_1 @@ -465,7 +465,7 @@ dependencies: - h3-py=3.7.6=py311hb755f60_1 - httpx=0.25.2=pyhd8ed1ab_0 - identify=2.5.32=pyhd8ed1ab_0 - - ipython=8.18.1=pyh31011fe_1 + - ipython=8.18.1=pyh31011fe_2 - isoduration=20.11.0=pyhd8ed1ab_0 - jsonschema=4.20.0=pyhd8ed1ab_0 - jupyter_client=8.6.0=pyhd8ed1ab_0 @@ -538,21 +538,21 @@ dependencies: - libarrow-flight=14.0.1=h120cb0d_3_cpu - libarrow-gandiva=14.0.1=hacb8726_3_cpu - libparquet=14.0.1=h352af49_3_cpu - - nbconvert-core=7.11.0=pyhd8ed1ab_0 + - nbconvert-core=7.12.0=pyhd8ed1ab_0 - 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 - - jupyter_server=2.11.1=pyhd8ed1ab_0 + - jupyter_server=2.11.2=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 + - nbconvert-pandoc=7.12.0=pyhd8ed1ab_0 - gcsfs=2023.12.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 - - nbconvert=7.11.0=pyhd8ed1ab_0 + - nbconvert=7.12.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - jupyterlab=4.0.9=pyhd8ed1ab_0 - pyarrow=14.0.1=py311h39c9aba_3_cpu diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index f3a4470731..3ff955db32 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.7 + version: 2.18.0 manager: conda platform: linux-64 dependencies: @@ -549,50 +549,50 @@ package: python: ">=3.8" python-dateutil: 2.* regex: "" - url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.17.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.18.0-pyhd8ed1ab_0.conda hash: - md5: b42bbf2e318b6bbbd9de2d81ecf8ed50 - sha256: 3094446e601ad9160677c2bb5b75b9946c81b679bebf42bf52c126e71d76fb43 + md5: cf492dd79a1d1d1ef2af299da2a604ca + sha256: f3fa253f2a26faa56348acc2a76eaf55778f871b995af429c9636d9159a4b483 category: main optional: false - name: arelle-release - version: 2.17.7 + version: 2.18.0 manager: conda platform: osx-64 dependencies: certifi: "" regex: "" python: ">=3.8" - numpy: 1.* python-dateutil: 2.* + numpy: 1.* isodate: 0.* lxml: 4.* openpyxl: 3.* pyparsing: 3.* - url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.17.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.18.0-pyhd8ed1ab_0.conda hash: - md5: b42bbf2e318b6bbbd9de2d81ecf8ed50 - sha256: 3094446e601ad9160677c2bb5b75b9946c81b679bebf42bf52c126e71d76fb43 + md5: cf492dd79a1d1d1ef2af299da2a604ca + sha256: f3fa253f2a26faa56348acc2a76eaf55778f871b995af429c9636d9159a4b483 category: main optional: false - name: arelle-release - version: 2.17.7 + version: 2.18.0 manager: conda platform: osx-arm64 dependencies: certifi: "" regex: "" python: ">=3.8" - numpy: 1.* python-dateutil: 2.* + numpy: 1.* isodate: 0.* lxml: 4.* openpyxl: 3.* pyparsing: 3.* - url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.17.7-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/arelle-release-2.18.0-pyhd8ed1ab_0.conda hash: - md5: b42bbf2e318b6bbbd9de2d81ecf8ed50 - sha256: 3094446e601ad9160677c2bb5b75b9946c81b679bebf42bf52c126e71d76fb43 + md5: cf492dd79a1d1d1ef2af299da2a604ca + sha256: f3fa253f2a26faa56348acc2a76eaf55778f871b995af429c9636d9159a4b483 category: main optional: false - name: argon2-cffi @@ -8533,16 +8533,16 @@ package: matplotlib-inline: "" pexpect: ">4.3" pickleshare: "" - prompt-toolkit: ">=3.0.30,<3.1.0,!=3.0.37" + prompt-toolkit: ">=3.0.41,<3.1.0" pygments: ">=2.4.0" python: ">=3.9" stack_data: "" traitlets: ">=5" typing_extensions: "" - url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_2.conda hash: - md5: ac2f9c2e10c2e90e8d135cef51f9753a - sha256: 67490e640faa372d663a5c5cd2d61f417cce22a019a4de82a9e5ddb1cf2ee181 + md5: 5e23d20fc6e33061c063220146579990 + sha256: c956b70ed41b7f61a780a7e584f03f68e7e5073c8c138960bfbc5e705d9124b1 category: main optional: false - name: ipython @@ -8562,11 +8562,11 @@ package: 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.1-pyh31011fe_1.conda + prompt-toolkit: ">=3.0.41,<3.1.0" + url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_2.conda hash: - md5: ac2f9c2e10c2e90e8d135cef51f9753a - sha256: 67490e640faa372d663a5c5cd2d61f417cce22a019a4de82a9e5ddb1cf2ee181 + md5: 5e23d20fc6e33061c063220146579990 + sha256: c956b70ed41b7f61a780a7e584f03f68e7e5073c8c138960bfbc5e705d9124b1 category: main optional: false - name: ipython @@ -8586,11 +8586,11 @@ package: 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.1-pyh31011fe_1.conda + prompt-toolkit: ">=3.0.41,<3.1.0" + url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_2.conda hash: - md5: ac2f9c2e10c2e90e8d135cef51f9753a - sha256: 67490e640faa372d663a5c5cd2d61f417cce22a019a4de82a9e5ddb1cf2ee181 + md5: 5e23d20fc6e33061c063220146579990 + sha256: c956b70ed41b7f61a780a7e584f03f68e7e5073c8c138960bfbc5e705d9124b1 category: main optional: false - name: ipywidgets @@ -9376,8 +9376,8 @@ package: dependencies: ipywidgets: "" notebook: "" - ipykernel: "" nbconvert: "" + ipykernel: "" qtconsole-base: "" jupyter_console: "" python: ">=3.6" @@ -9394,8 +9394,8 @@ package: dependencies: ipywidgets: "" notebook: "" - ipykernel: "" nbconvert: "" + ipykernel: "" qtconsole-base: "" jupyter_console: "" python: ">=3.6" @@ -9709,7 +9709,7 @@ package: category: main optional: false - name: jupyter_server - version: 2.11.1 + version: 2.11.2 manager: conda platform: linux-64 dependencies: @@ -9732,14 +9732,14 @@ package: tornado: ">=6.2.0" traitlets: ">=5.6.0" websocket-client: "" - url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.11.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.11.2-pyhd8ed1ab_0.conda hash: - md5: 0699b715659c026f7f81c27d0e744205 - sha256: 605825c0e2d5af7935b37319b9a46ff39e081e7a0f4dc973f0dd583f41c69ce5 + md5: c831341804aecf5abcdbb348be301f92 + sha256: 9e56c09fa7f4b95aab30b51008416d041c53cfd94ef3a4abc339d1eabb015df2 category: main optional: false - name: jupyter_server - version: 2.11.1 + version: 2.11.2 manager: conda platform: osx-64 dependencies: @@ -9762,14 +9762,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.11.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.11.2-pyhd8ed1ab_0.conda hash: - md5: 0699b715659c026f7f81c27d0e744205 - sha256: 605825c0e2d5af7935b37319b9a46ff39e081e7a0f4dc973f0dd583f41c69ce5 + md5: c831341804aecf5abcdbb348be301f92 + sha256: 9e56c09fa7f4b95aab30b51008416d041c53cfd94ef3a4abc339d1eabb015df2 category: main optional: false - name: jupyter_server - version: 2.11.1 + version: 2.11.2 manager: conda platform: osx-arm64 dependencies: @@ -9792,10 +9792,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.11.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyter_server-2.11.2-pyhd8ed1ab_0.conda hash: - md5: 0699b715659c026f7f81c27d0e744205 - sha256: 605825c0e2d5af7935b37319b9a46ff39e081e7a0f4dc973f0dd583f41c69ce5 + md5: c831341804aecf5abcdbb348be301f92 + sha256: 9e56c09fa7f4b95aab30b51008416d041c53cfd94ef3a4abc339d1eabb015df2 category: main optional: false - name: jupyter_server_terminals @@ -9874,8 +9874,8 @@ package: ipykernel: "" jupyter_core: "" python: ">=3.8" - jinja2: ">=3.0.3" tornado: ">=6.2.0" + jinja2: ">=3.0.3" importlib_metadata: ">=4.8.3" jupyter_server: ">=2.4.0,<3" importlib_resources: ">=1.4" @@ -9900,8 +9900,8 @@ package: ipykernel: "" jupyter_core: "" python: ">=3.8" - jinja2: ">=3.0.3" tornado: ">=6.2.0" + jinja2: ">=3.0.3" importlib_metadata: ">=4.8.3" jupyter_server: ">=2.4.0,<3" importlib_resources: ">=1.4" @@ -14420,49 +14420,49 @@ package: category: main optional: false - name: nbconvert - version: 7.11.0 + version: 7.12.0 manager: conda platform: linux-64 dependencies: - nbconvert-core: 7.11.0 - nbconvert-pandoc: 7.11.0 + nbconvert-core: 7.12.0 + nbconvert-pandoc: 7.12.0 python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.12.0-pyhd8ed1ab_0.conda hash: - md5: e492b36cbea1c83d1663fa73a8abff9b - sha256: 6af7048b30c0ce6746297548df981037802f713853a1e856aedd2f8164946d39 + md5: 364e28ab12477494e72839aaa588073d + sha256: 0137330ab16bddf1fcaf60c0501c6145705b775fd547823708ed84364c934b76 category: main optional: false - name: nbconvert - version: 7.11.0 + version: 7.12.0 manager: conda platform: osx-64 dependencies: python: ">=3.8" - nbconvert-core: 7.11.0 - nbconvert-pandoc: 7.11.0 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.11.0-pyhd8ed1ab_0.conda + nbconvert-core: 7.12.0 + nbconvert-pandoc: 7.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.12.0-pyhd8ed1ab_0.conda hash: - md5: e492b36cbea1c83d1663fa73a8abff9b - sha256: 6af7048b30c0ce6746297548df981037802f713853a1e856aedd2f8164946d39 + md5: 364e28ab12477494e72839aaa588073d + sha256: 0137330ab16bddf1fcaf60c0501c6145705b775fd547823708ed84364c934b76 category: main optional: false - name: nbconvert - version: 7.11.0 + version: 7.12.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - nbconvert-core: 7.11.0 - nbconvert-pandoc: 7.11.0 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.11.0-pyhd8ed1ab_0.conda + nbconvert-core: 7.12.0 + nbconvert-pandoc: 7.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.12.0-pyhd8ed1ab_0.conda hash: - md5: e492b36cbea1c83d1663fa73a8abff9b - sha256: 6af7048b30c0ce6746297548df981037802f713853a1e856aedd2f8164946d39 + md5: 364e28ab12477494e72839aaa588073d + sha256: 0137330ab16bddf1fcaf60c0501c6145705b775fd547823708ed84364c934b76 category: main optional: false - name: nbconvert-core - version: 7.11.0 + version: 7.12.0 manager: conda platform: linux-64 dependencies: @@ -14483,14 +14483,14 @@ package: python: ">=3.8" tinycss2: "" traitlets: ">=5.0" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.12.0-pyhd8ed1ab_0.conda hash: - md5: d59e0cb1ca993f8f910cfdf393232acf - sha256: 81732e083c4c85a52248e20ff0e40a14b0b49db9cc7ce414e8aa7d6f8980dad0 + md5: 4d67c68fd0d130091ada039bc2d81b33 + sha256: 04c3ac88701d98d58139569e4899c3254bf99908179a898cc3dcadd8c0ef44b4 category: main optional: false - name: nbconvert-core - version: 7.11.0 + version: 7.12.0 manager: conda platform: osx-64 dependencies: @@ -14511,14 +14511,14 @@ package: pygments: ">=2.4.1" nbclient: ">=0.5.0" mistune: ">=2.0.3,<4" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.12.0-pyhd8ed1ab_0.conda hash: - md5: d59e0cb1ca993f8f910cfdf393232acf - sha256: 81732e083c4c85a52248e20ff0e40a14b0b49db9cc7ce414e8aa7d6f8980dad0 + md5: 4d67c68fd0d130091ada039bc2d81b33 + sha256: 04c3ac88701d98d58139569e4899c3254bf99908179a898cc3dcadd8c0ef44b4 category: main optional: false - name: nbconvert-core - version: 7.11.0 + version: 7.12.0 manager: conda platform: osx-arm64 dependencies: @@ -14539,52 +14539,52 @@ package: pygments: ">=2.4.1" nbclient: ">=0.5.0" mistune: ">=2.0.3,<4" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.12.0-pyhd8ed1ab_0.conda hash: - md5: d59e0cb1ca993f8f910cfdf393232acf - sha256: 81732e083c4c85a52248e20ff0e40a14b0b49db9cc7ce414e8aa7d6f8980dad0 + md5: 4d67c68fd0d130091ada039bc2d81b33 + sha256: 04c3ac88701d98d58139569e4899c3254bf99908179a898cc3dcadd8c0ef44b4 category: main optional: false - name: nbconvert-pandoc - version: 7.11.0 + version: 7.12.0 manager: conda platform: linux-64 dependencies: - nbconvert-core: 7.11.0 + nbconvert-core: 7.12.0 pandoc: "" python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.11.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.12.0-pyhd8ed1ab_0.conda hash: - md5: 51bd005efab7e5c5c2af2570327bd213 - sha256: 377d3c3f973b6885406ff6606d24c5e1fbd0d0fdc64c0dc17162f6daf35e08cf + md5: 460d7cac50322a39b61a833885a6a8d5 + sha256: ebf25caef387ec79f8d8f6771240d451ffaebcc2cdd127c0b152c6697d661d10 category: main optional: false - name: nbconvert-pandoc - version: 7.11.0 + version: 7.12.0 manager: conda platform: osx-64 dependencies: pandoc: "" python: ">=3.8" - nbconvert-core: 7.11.0 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.11.0-pyhd8ed1ab_0.conda + nbconvert-core: 7.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.12.0-pyhd8ed1ab_0.conda hash: - md5: 51bd005efab7e5c5c2af2570327bd213 - sha256: 377d3c3f973b6885406ff6606d24c5e1fbd0d0fdc64c0dc17162f6daf35e08cf + md5: 460d7cac50322a39b61a833885a6a8d5 + sha256: ebf25caef387ec79f8d8f6771240d451ffaebcc2cdd127c0b152c6697d661d10 category: main optional: false - name: nbconvert-pandoc - version: 7.11.0 + version: 7.12.0 manager: conda platform: osx-arm64 dependencies: pandoc: "" python: ">=3.8" - nbconvert-core: 7.11.0 - url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.11.0-pyhd8ed1ab_0.conda + nbconvert-core: 7.12.0 + url: https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.12.0-pyhd8ed1ab_0.conda hash: - md5: 51bd005efab7e5c5c2af2570327bd213 - sha256: 377d3c3f973b6885406ff6606d24c5e1fbd0d0fdc64c0dc17162f6daf35e08cf + md5: 460d7cac50322a39b61a833885a6a8d5 + sha256: ebf25caef387ec79f8d8f6771240d451ffaebcc2cdd127c0b152c6697d661d10 category: main optional: false - name: nbformat @@ -16340,42 +16340,39 @@ package: category: main optional: false - name: platformdirs - version: 4.0.0 + version: 4.1.0 manager: conda platform: linux-64 dependencies: - python: ">=3.7" - typing_extensions: ">=4.7.1" - url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.0.0-pyhd8ed1ab_0.conda + python: ">=3.8" + url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.1.0-pyhd8ed1ab_0.conda hash: - md5: 6bb4ee32cd435deaeac72776c001e7ac - sha256: 67381d3f7cadca7df7699238e0dcce680ad20d7fd28804bab48611fecb084937 + md5: 45a5065664da0d1dfa8f8cd2eaf05ab9 + sha256: 9e4ff17ce802159ed31344eb913eaa877688226765b77947b102b42255a53853 category: main optional: false - name: platformdirs - version: 4.0.0 + version: 4.1.0 manager: conda platform: osx-64 dependencies: - python: ">=3.7" - typing_extensions: ">=4.7.1" - url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.0.0-pyhd8ed1ab_0.conda + python: ">=3.8" + url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.1.0-pyhd8ed1ab_0.conda hash: - md5: 6bb4ee32cd435deaeac72776c001e7ac - sha256: 67381d3f7cadca7df7699238e0dcce680ad20d7fd28804bab48611fecb084937 + md5: 45a5065664da0d1dfa8f8cd2eaf05ab9 + sha256: 9e4ff17ce802159ed31344eb913eaa877688226765b77947b102b42255a53853 category: main optional: false - name: platformdirs - version: 4.0.0 + version: 4.1.0 manager: conda platform: osx-arm64 dependencies: - python: ">=3.7" - typing_extensions: ">=4.7.1" - url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.0.0-pyhd8ed1ab_0.conda + python: ">=3.8" + url: https://conda.anaconda.org/conda-forge/noarch/platformdirs-4.1.0-pyhd8ed1ab_0.conda hash: - md5: 6bb4ee32cd435deaeac72776c001e7ac - sha256: 67381d3f7cadca7df7699238e0dcce680ad20d7fd28804bab48611fecb084937 + md5: 45a5065664da0d1dfa8f8cd2eaf05ab9 + sha256: 9e4ff17ce802159ed31344eb913eaa877688226765b77947b102b42255a53853 category: main optional: false - name: pluggy @@ -16938,87 +16935,87 @@ package: category: main optional: false - name: psycopg2 - version: 2.9.7 + version: 2.9.9 manager: conda platform: linux-64 dependencies: libgcc-ng: ">=12" - libpq: ">=16.0,<17.0a0" + libpq: ">=16.1,<17.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/psycopg2-2.9.7-py311h03dec38_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/psycopg2-2.9.9-py311h03dec38_0.conda hash: - md5: 894f0e7a734b1f1182f87081f1ddffa3 - sha256: 047fe0687432b83762d4d77a31cd01572044a231f945f83e10f2cd3c2b44077d + md5: 3cc2decd316838bce14d73818e0bf7a4 + sha256: 4e78d9fe1799d028d9a2da3636a3a68a531aeca5d2c679d4fc78627a426b11cb 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 - version: 2.9.7 + version: 2.9.9 manager: conda platform: linux-64 dependencies: - psycopg2: ">=2.9.7,<2.9.8.0a0" + psycopg2: ">=2.9.9,<2.9.10.0a0" python: ">=3.6" - url: https://conda.anaconda.org/conda-forge/noarch/psycopg2-binary-2.9.7-pyhd8ed1ab_1.conda + 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-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 @@ -19809,7 +19806,7 @@ package: category: main optional: false - name: ruff - version: 0.1.6 + version: 0.1.7 manager: conda platform: linux-64 dependencies: @@ -19817,10 +19814,10 @@ 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.6-py311h7145743_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/ruff-0.1.7-py311h7145743_0.conda hash: - md5: aff8387edd5157da054c4b46cc38ffdc - sha256: dd8f7a3e2e7bc65fb6c2c32aae79ebc8623c6b87cbdbc8d2651be9ccd63e29d0 + md5: 7e4329efd6a902a64470bfbe21a83e21 + sha256: c82eb1b904671ab0eb3212f18aa7af14e51b66a8e893d18a3089d29a334e1e0d category: main optional: false - name: ruff @@ -19839,7 +19836,7 @@ package: category: main optional: false - name: ruff - version: 0.1.6 + version: 0.1.7 manager: conda platform: osx-arm64 dependencies: @@ -19847,10 +19844,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/ruff-0.1.6-py311h6fc163c_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/ruff-0.1.7-py311h6fc163c_0.conda hash: - md5: c9ff47502a21c1d072e8da209d9efba3 - sha256: 8bde8b2d66f34a242ea6759df3c21f3321d17a8cdb4d421ae489f97f42452920 + md5: 86298e47df0a6b448df8632df3d1f4a9 + sha256: 37d5b2a72c3a5114d43d49a250dffd81d1b064d673e5faf3932c6bf56f2e7c76 category: main optional: false - name: s2n diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index da2a4d0732..695ecd8ef3 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -217,6 +217,7 @@ dependencies: - pillow=10.1.0=py311hea5c87a_0 - pkginfo=1.9.6=pyhd8ed1ab_0 - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_1 + - platformdirs=4.1.0=pyhd8ed1ab_0 - pluggy=1.3.0=pyhd8ed1ab_0 - prometheus_client=0.19.0=pyhd8ed1ab_0 - psutil=5.9.5=py311h2725bcf_1 @@ -329,6 +330,7 @@ dependencies: - jinja2=3.1.2=pyhd8ed1ab_1 - joblib=1.3.2=pyhd8ed1ab_0 - jsonlines=4.0.0=pyhd8ed1ab_0 + - jupyter_core=5.5.0=py311h6eed73b_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - libcblas=3.9.0=20_osx64_openblas @@ -344,13 +346,12 @@ dependencies: - pexpect=4.8.0=pyh1a96a4e_2 - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - - platformdirs=4.0.0=pyhd8ed1ab_0 - poppler=23.12.0=hdd5a5e8_0 - postgresql=16.1=h413614c_2 - 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 - pyproject_hooks=1.0.0=pyhd8ed1ab_0 @@ -371,6 +372,7 @@ dependencies: - typing_inspect=0.9.0=pyhd8ed1ab_0 - universal_pathlib=0.1.4=pyhd8ed1ab_0 - urllib3=1.26.18=pyhd8ed1ab_0 + - virtualenv=20.25.0=pyhd8ed1ab_0 - watchdog=3.0.0=py311h5ef12f2_1 - xerces-c=3.2.4=h6314983_3 - yarl=1.9.3=py311he705e18_0 @@ -396,7 +398,6 @@ dependencies: - httpcore=1.0.2=pyhd8ed1ab_0 - importlib_metadata=7.0.0=hd8ed1ab_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 - libnetcdf=4.9.2=nompi_h6a32802_112 @@ -407,7 +408,7 @@ 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 @@ -425,11 +426,10 @@ dependencies: - tiledb=2.16.3=hd3a41d5_3 - ukkonen=1.0.1=py311h5fe6e05_4 - uvicorn=0.24.0.post1=py311h6eed73b_0 - - virtualenv=20.25.0=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h5e0f0e4_0 - aiohttp=3.8.6=py311he705e18_1 - alembic=1.13.0=pyhd8ed1ab_0 - - arelle-release=2.17.7=pyhd8ed1ab_0 + - arelle-release=2.18.0=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - aws-sdk-cpp=1.11.182=h28d282b_7 - bottleneck=1.3.7=py311h4a70a88_1 @@ -446,7 +446,7 @@ dependencies: - h3-py=3.7.6=py311hdf8f085_1 - httpx=0.25.2=pyhd8ed1ab_0 - identify=2.5.32=pyhd8ed1ab_0 - - ipython=8.18.1=pyh31011fe_1 + - ipython=8.18.1=pyh31011fe_2 - isoduration=20.11.0=pyhd8ed1ab_0 - jsonschema=4.20.0=pyhd8ed1ab_0 - jupyter_client=8.6.0=pyhd8ed1ab_0 @@ -519,18 +519,18 @@ dependencies: - google-cloud-core=2.3.3=pyhd8ed1ab_0 - libarrow-dataset=14.0.1=hc222712_3_cpu - libarrow-flight-sql=14.0.1=h2cc6c1c_3_cpu - - nbconvert-core=7.11.0=pyhd8ed1ab_0 + - 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 - - jupyter_server=2.11.1=pyhd8ed1ab_0 + - jupyter_server=2.11.2=pyhd8ed1ab_0 - libarrow-substrait=14.0.1=h2cc6c1c_3_cpu - - nbconvert-pandoc=7.11.0=pyhd8ed1ab_0 + - nbconvert-pandoc=7.12.0=pyhd8ed1ab_0 - gcsfs=2023.12.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 + - nbconvert=7.12.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - pyarrow=14.0.1=py311h98a0319_3_cpu - jupyterlab=4.0.9=pyhd8ed1ab_0 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 631841e00f..f15a8e25b7 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -217,6 +217,7 @@ dependencies: - pillow=10.1.0=py311hb9c5795_0 - pkginfo=1.9.6=pyhd8ed1ab_0 - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_1 + - platformdirs=4.1.0=pyhd8ed1ab_0 - pluggy=1.3.0=pyhd8ed1ab_0 - prometheus_client=0.19.0=pyhd8ed1ab_0 - psutil=5.9.5=py311heffc1b2_1 @@ -246,7 +247,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.6=py311h6fc163c_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 @@ -329,6 +330,7 @@ dependencies: - jinja2=3.1.2=pyhd8ed1ab_1 - joblib=1.3.2=pyhd8ed1ab_0 - jsonlines=4.0.0=pyhd8ed1ab_0 + - jupyter_core=5.5.0=py311h267d04e_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - libcblas=3.9.0=20_osxarm64_openblas @@ -344,13 +346,12 @@ dependencies: - pexpect=4.8.0=pyh1a96a4e_2 - pint=0.22=pyhd8ed1ab_1 - pip=23.3.1=pyhd8ed1ab_0 - - platformdirs=4.0.0=pyhd8ed1ab_0 - poppler=23.12.0=hcdd998b_0 - postgresql=16.1=hc6ab77f_2 - 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 - pyproject_hooks=1.0.0=pyhd8ed1ab_0 @@ -371,6 +372,7 @@ dependencies: - typing_inspect=0.9.0=pyhd8ed1ab_0 - universal_pathlib=0.1.4=pyhd8ed1ab_0 - urllib3=1.26.18=pyhd8ed1ab_0 + - virtualenv=20.25.0=pyhd8ed1ab_0 - watchdog=3.0.0=py311heffc1b2_1 - xerces-c=3.2.4=hd886eac_3 - yarl=1.9.3=py311h05b510d_0 @@ -396,7 +398,6 @@ dependencies: - httpcore=1.0.2=pyhd8ed1ab_0 - importlib_metadata=7.0.0=hd8ed1ab_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 - libnetcdf=4.9.2=nompi_hb2fb864_112 @@ -407,7 +408,7 @@ 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 @@ -425,11 +426,10 @@ dependencies: - tiledb=2.16.3=he15c4da_3 - ukkonen=1.0.1=py311he4fd1f5_4 - uvicorn=0.24.0.post1=py311h267d04e_0 - - virtualenv=20.25.0=pyhd8ed1ab_0 - watchfiles=0.21.0=py311h94f323b_0 - aiohttp=3.8.6=py311h05b510d_1 - alembic=1.13.0=pyhd8ed1ab_0 - - arelle-release=2.17.7=pyhd8ed1ab_0 + - arelle-release=2.18.0=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - aws-sdk-cpp=1.11.182=h31542fa_7 - bottleneck=1.3.7=py311hb49d859_1 @@ -446,7 +446,7 @@ dependencies: - h3-py=3.7.6=py311ha891d26_1 - httpx=0.25.2=pyhd8ed1ab_0 - identify=2.5.32=pyhd8ed1ab_0 - - ipython=8.18.1=pyh31011fe_1 + - ipython=8.18.1=pyh31011fe_2 - isoduration=20.11.0=pyhd8ed1ab_0 - jsonschema=4.20.0=pyhd8ed1ab_0 - jupyter_client=8.6.0=pyhd8ed1ab_0 @@ -519,18 +519,18 @@ dependencies: - google-cloud-core=2.3.3=pyhd8ed1ab_0 - libarrow-dataset=14.0.1=had9dd58_3_cpu - libarrow-flight-sql=14.0.1=h660fe36_3_cpu - - nbconvert-core=7.11.0=pyhd8ed1ab_0 + - 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 - - jupyter_server=2.11.1=pyhd8ed1ab_0 + - jupyter_server=2.11.2=pyhd8ed1ab_0 - libarrow-substrait=14.0.1=h594d712_3_cpu - - nbconvert-pandoc=7.11.0=pyhd8ed1ab_0 + - nbconvert-pandoc=7.12.0=pyhd8ed1ab_0 - gcsfs=2023.12.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 + - nbconvert=7.12.0=pyhd8ed1ab_0 - notebook-shim=0.2.3=pyhd8ed1ab_0 - pyarrow=14.0.1=py311h637fcfe_3_cpu - jupyterlab=4.0.9=pyhd8ed1ab_0 From 3452bae66017aed715d11515a70b297e45ef3d24 Mon Sep 17 00:00:00 2001 From: zaneselvans Date: Tue, 5 Dec 2023 17:16:31 +0000 Subject: [PATCH 47/47] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 10 +- environments/conda-lock.yml | 140 +++++++++++++------------- environments/conda-osx-64.lock.yml | 10 +- environments/conda-osx-arm64.lock.yml | 10 +- 4 files changed, 87 insertions(+), 83 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index b7aa194d5b..6024660317 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -256,14 +256,14 @@ dependencies: - pywin32-on-windows=0.1.0=pyh1179c8e_3 - pyxlsb=1.0.10=pyhd8ed1ab_0 - pyyaml=6.0.1=py311h459d7ec_1 - - pyzmq=25.1.1=py311h34ded2d_2 + - pyzmq=25.1.2=py311h34ded2d_0 - regex=2023.10.3=py311h459d7ec_0 - rfc3986=2.0.0=pyhd8ed1ab_0 - rfc3986-validator=0.1.1=pyh9f0ad1d_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 + - ruff=0.1.7=py311h7145743_0 - send2trash=1.8.2=pyh41d4057_0 - setuptools=68.2.2=pyhd8ed1ab_0 - shellingham=1.5.4=pyhd8ed1ab_0 @@ -372,7 +372,7 @@ dependencies: - proj=9.3.0=h1d62c97_2 - prompt-toolkit=3.0.41=pyha770c72_0 - protobuf=4.24.4=py311h46cbc50_0 - - psycopg2=2.9.7=py311h03dec38_1 + - psycopg2=2.9.9=py311h03dec38_0 - pyasn1-modules=0.3.0=pyhd8ed1ab_0 - pyproject_hooks=1.0.0=pyhd8ed1ab_0 - pytest=7.4.3=pyhd8ed1ab_0 @@ -403,7 +403,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.6=pyhd8ed1ab_0 + - botocore=1.33.7=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.7=py311hcb13ee4_1 @@ -429,7 +429,7 @@ dependencies: - pendulum=2.1.2=py311h459d7ec_6 - poppler=23.12.0=h590f24d_0 - 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=py311h46250e7_0 - pyproj=3.6.1=py311h1facc83_4 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index a2ff56733e..6124d63cd0 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.6 + version: 1.33.7 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.6-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.7-pyhd8ed1ab_0.conda hash: - md5: e1c7565a0bfba34c3be07a3ad882356f - sha256: 06549a55df5711e0306395e8187f03c46f25337fb7e9ab6c014cf26a76ca9cef + md5: a37114efb8799b3c885bb845ffe40b85 + sha256: 6fc3a3d9212db34e20a7496f8737b4c3e506caf37c1b0afa0a3dabb3c450109f category: main optional: false - name: botocore - version: 1.33.6 + version: 1.33.7 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.6-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.7-pyhd8ed1ab_0.conda hash: - md5: e1c7565a0bfba34c3be07a3ad882356f - sha256: 06549a55df5711e0306395e8187f03c46f25337fb7e9ab6c014cf26a76ca9cef + md5: a37114efb8799b3c885bb845ffe40b85 + sha256: 6fc3a3d9212db34e20a7496f8737b4c3e506caf37c1b0afa0a3dabb3c450109f category: main optional: false - name: botocore - version: 1.33.6 + version: 1.33.7 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.6-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.33.7-pyhd8ed1ab_0.conda hash: - md5: e1c7565a0bfba34c3be07a3ad882356f - sha256: 06549a55df5711e0306395e8187f03c46f25337fb7e9ab6c014cf26a76ca9cef + md5: a37114efb8799b3c885bb845ffe40b85 + sha256: 6fc3a3d9212db34e20a7496f8737b4c3e506caf37c1b0afa0a3dabb3c450109f category: main optional: false - name: bottleneck @@ -16935,87 +16935,87 @@ package: category: main optional: false - name: psycopg2 - version: 2.9.7 + version: 2.9.9 manager: conda platform: linux-64 dependencies: libgcc-ng: ">=12" - libpq: ">=16.0,<17.0a0" + libpq: ">=16.1,<17.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/psycopg2-2.9.7-py311h03dec38_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/psycopg2-2.9.9-py311h03dec38_0.conda hash: - md5: 894f0e7a734b1f1182f87081f1ddffa3 - sha256: 047fe0687432b83762d4d77a31cd01572044a231f945f83e10f2cd3c2b44077d + md5: 3cc2decd316838bce14d73818e0bf7a4 + sha256: 4e78d9fe1799d028d9a2da3636a3a68a531aeca5d2c679d4fc78627a426b11cb 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 - version: 2.9.7 + version: 2.9.9 manager: conda platform: linux-64 dependencies: - psycopg2: ">=2.9.7,<2.9.8.0a0" + psycopg2: ">=2.9.9,<2.9.10.0a0" python: ">=3.6" - url: https://conda.anaconda.org/conda-forge/noarch/psycopg2-binary-2.9.7-pyhd8ed1ab_1.conda + 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-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 @@ -18810,7 +18810,7 @@ package: category: main optional: false - name: pyzmq - version: 25.1.1 + version: 25.1.2 manager: conda platform: linux-64 dependencies: @@ -18820,40 +18820,44 @@ package: python: ">=3.11,<3.12.0a0" python_abi: 3.11.* zeromq: ">=4.3.5,<4.4.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/pyzmq-25.1.1-py311h34ded2d_2.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pyzmq-25.1.2-py311h34ded2d_0.conda hash: - md5: ea365280db99687905b4d76cf6a3568c - sha256: a5ed6592f32b0caf3883a2f863e8a6258845310d4eebeab2eaf1c5abed04d6b8 + md5: 819aa640a0493d4b52faf938e94d129e + sha256: 54ccdde1370d8a373e516b84bd7fe4af394f8c6f3778eb050de82f04ffb86160 category: main optional: false - name: pyzmq - version: 25.1.1 + version: 25.1.2 manager: conda platform: osx-64 dependencies: + __osx: ">=10.9" + libcxx: ">=16.0.6" libsodium: ">=1.0.18,<1.0.19.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* zeromq: ">=4.3.5,<4.4.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/pyzmq-25.1.1-py311he3804a1_2.conda + url: https://conda.anaconda.org/conda-forge/osx-64/pyzmq-25.1.2-py311h889d6d6_0.conda hash: - md5: 9b1ea037c51fcdb06bd2d95804270860 - sha256: 7a9af16e04752c50675ca99ab06888aaf8305efb5d292f62f7268ad911c967f4 + md5: 241fde77a74bd223562662af26f4828b + sha256: a8cb598edd68b3d2ca88cd2cdbc60c9180a392c393dd58aaf25e9897697d28d3 category: main optional: false - name: pyzmq - version: 25.1.1 + version: 25.1.2 manager: conda platform: osx-arm64 dependencies: + __osx: ">=10.9" + libcxx: ">=16.0.6" libsodium: ">=1.0.18,<1.0.19.0a0" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* zeromq: ">=4.3.5,<4.4.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/pyzmq-25.1.1-py311he9c0408_2.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/pyzmq-25.1.2-py311h6727e71_0.conda hash: - md5: 51b7458a36011c4982261478fcc62026 - sha256: 03b78fe912c02547b284bc3404194bb4c1d9a2680e4b46f45c131a0d13d10b48 + md5: c0ab7687c09ec2c12d4110c2d5ba7050 + sha256: 684dc254a778600fb4ce31d6e3a82f18bf3a2779d71b06d237e76357dda8be9e category: main optional: false - name: qtconsole-base @@ -19806,7 +19810,7 @@ package: category: main optional: false - name: ruff - version: 0.1.6 + version: 0.1.7 manager: conda platform: linux-64 dependencies: @@ -19814,14 +19818,14 @@ 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.6-py311h7145743_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/ruff-0.1.7-py311h7145743_0.conda hash: - md5: aff8387edd5157da054c4b46cc38ffdc - sha256: dd8f7a3e2e7bc65fb6c2c32aae79ebc8623c6b87cbdbc8d2651be9ccd63e29d0 + md5: 7e4329efd6a902a64470bfbe21a83e21 + sha256: c82eb1b904671ab0eb3212f18aa7af14e51b66a8e893d18a3089d29a334e1e0d category: main optional: false - name: ruff - version: 0.1.6 + version: 0.1.7 manager: conda platform: osx-64 dependencies: @@ -19829,14 +19833,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/ruff-0.1.6-py311hec6fdf1_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/ruff-0.1.7-py311hec6fdf1_0.conda hash: - md5: f0fa30260ad0ac05ef120b758c68d7ba - sha256: 2587bd6a04c6a1178b63438de97c091bcfca15f9bb5ea0d6a1f109a66187e33e + md5: d21a7d577aa62ce3a2b1eb124da50446 + sha256: 8aac6c5324504cd6b453be725b0ba8cca478468fb5c328cec79301b552477dc7 category: main optional: false - name: ruff - version: 0.1.6 + version: 0.1.7 manager: conda platform: osx-arm64 dependencies: @@ -19844,10 +19848,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/ruff-0.1.6-py311h6fc163c_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/ruff-0.1.7-py311h6fc163c_0.conda hash: - md5: c9ff47502a21c1d072e8da209d9efba3 - sha256: 8bde8b2d66f34a242ea6759df3c21f3321d17a8cdb4d421ae489f97f42452920 + md5: 86298e47df0a6b448df8632df3d1f4a9 + sha256: 37d5b2a72c3a5114d43d49a250dffd81d1b064d673e5faf3932c6bf56f2e7c76 category: main optional: false - name: s2n diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index 50cfc5d72d..40a519d401 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -240,14 +240,14 @@ dependencies: - pywin32-on-windows=0.1.0=pyh1179c8e_3 - pyxlsb=1.0.10=pyhd8ed1ab_0 - pyyaml=6.0.1=py311h2725bcf_1 - - pyzmq=25.1.1=py311he3804a1_2 + - pyzmq=25.1.2=py311h889d6d6_0 - regex=2023.10.3=py311h2725bcf_0 - rfc3986=2.0.0=pyhd8ed1ab_0 - rfc3986-validator=0.1.1=pyh9f0ad1d_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 + - ruff=0.1.7=py311hec6fdf1_0 - setuptools=68.2.2=pyhd8ed1ab_0 - shellingham=1.5.4=pyhd8ed1ab_0 - simpleeval=0.9.13=pyhd8ed1ab_1 @@ -351,7 +351,7 @@ dependencies: - 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 - pyproject_hooks=1.0.0=pyhd8ed1ab_0 @@ -383,7 +383,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.6=pyhd8ed1ab_0 + - botocore=1.33.7=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.7=py311h48c7838_1 @@ -408,7 +408,7 @@ 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 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index c253a2ca9c..57b4d6b79e 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -240,14 +240,14 @@ dependencies: - pywin32-on-windows=0.1.0=pyh1179c8e_3 - pyxlsb=1.0.10=pyhd8ed1ab_0 - pyyaml=6.0.1=py311heffc1b2_1 - - pyzmq=25.1.1=py311he9c0408_2 + - pyzmq=25.1.2=py311h6727e71_0 - regex=2023.10.3=py311heffc1b2_0 - rfc3986=2.0.0=pyhd8ed1ab_0 - rfc3986-validator=0.1.1=pyh9f0ad1d_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 + - ruff=0.1.7=py311h6fc163c_0 - setuptools=68.2.2=pyhd8ed1ab_0 - shellingham=1.5.4=pyhd8ed1ab_0 - simpleeval=0.9.13=pyhd8ed1ab_1 @@ -351,7 +351,7 @@ dependencies: - 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 - pyproject_hooks=1.0.0=pyhd8ed1ab_0 @@ -383,7 +383,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.6=pyhd8ed1ab_0 + - botocore=1.33.7=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.7=py311h08c85a6_1 @@ -408,7 +408,7 @@ 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