From 4e0c235d6f9cf37c0271bfe709851e2752dce99c Mon Sep 17 00:00:00 2001 From: Zane Selvans Date: Tue, 21 Nov 2023 16:58:56 -0600 Subject: [PATCH 1/3] Updates docs on ruff, git config, pudl-dev environment. --- docs/conf.py | 6 +++- docs/dev/dev_setup.rst | 67 +++++++++++++++++------------------------- 2 files changed, 32 insertions(+), 41 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 4b63dd1eb1..78edc44dd7 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -80,15 +80,19 @@ # we need to define these package to URL mappings: intersphinx_mapping = { "arrow": ("https://arrow.apache.org/docs/", None), + "dagster": ("https://docs.dagster.io/", None), "dask": ("https://docs.dask.org/en/latest/", None), + "datasette": ("https://docs.datasette.io/en/stable/", None), "geopandas": ("https://geopandas.org/en/stable/", None), + "hypothesis": ("https://hypothesis.readthedocs.io/en/latest/", None), "networkx": ("https://networkx.org/documentation/stable/", None), "numpy": ("https://numpy.org/doc/stable/", None), "pandas": ("https://pandas.pydata.org/pandas-docs/stable", None), + "pandera": ("https://pandera.readthedocs.io/en/stable/", None), + "pydantic": ("https://docs.pydantic.dev/latest/", None), "pytest": ("https://docs.pytest.org/en/latest/", None), "python": ("https://docs.python.org/3", None), "scipy": ("https://docs.scipy.org/doc/scipy/", None), - "setuptools": ("https://setuptools.pypa.io/en/latest/", None), "sklearn": ("https://scikit-learn.org/stable", None), "sqlalchemy": ("https://docs.sqlalchemy.org/en/latest/", None), } diff --git a/docs/dev/dev_setup.rst b/docs/dev/dev_setup.rst index 4e9caf339b..5700c7e967 100644 --- a/docs/dev/dev_setup.rst +++ b/docs/dev/dev_setup.rst @@ -65,6 +65,14 @@ from your fork to your local computer where you'll be editing the code or docs. will download the whole history of the project, including the most recent version, and put it in a local directory where you can make changes. +Note that we use a special merge method for our environment lockfiles, which you need +to explicitly enable locally in your git configuration for the PUDL repository with this +command. You only need to run it once, from within the cloned repo: + +.. code-block:: console + + $ git config --local merge.ours.driver true + ------------------------------------------------------------------------------- Create the PUDL Dev Environment ------------------------------------------------------------------------------- @@ -79,40 +87,24 @@ listed in the project's ``pyproject.toml`` file. The conda lockfile is updated automatically by a GitHub Action workflow that runs once a week, or any time ``pyproject.toml`` is changed. -Use ``conda-lock`` to create a new ``pudl-dev`` environment and activate it: - -.. code-block:: console - - $ mamba activate base - $ conda-lock install --name pudl-dev --mamba --dev environments/conda-lock.yml - $ mamba deactivate - $ mamba activate pudl-dev - -Now we need to install the PUDL package defined by the repository into the ``pudl-dev`` -conda environment. We use ``pip`` since this is just a local package, and since all of -the required packages should have already been satisfied by the locked conda -environment, we tell ``pip`` not to try and install any dependencies. - -.. code-block:: console - - $ pip install --no-cache-dir --no-deps --editable . - -------------------------------------------------------------------------------- -Automating tasks with Make -------------------------------------------------------------------------------- -We use the GNU build tool ``make`` to remember and automate some repetitive tasks in the +We use a ``Makefile`` to remember and automate some common shared tasks in the PUDL repository, including creating and updating the ``pudl-dev`` conda environment. If -you are on a Unix-based platform (Linux or MacOS) it should already be installed. -Typically, rather than running the commands in the section above, you'll want to use -the predefined ``make`` commands. If you'd like to learn more about how Makefiles work, -check out `this excellent Makefile tutorial `__ +you are on a Unix-based platform (Linux or MacOS) the ``make`` command should already be +installed. You'll typically want to use the predefined ``make`` commands rather than +running the individual commands they wrap. If you'd like to learn more about how +Makefiles work, check out `this excellent Makefile tutorial +`__ -To create the ``pudl-dev`` environment and install the local PUDL package, run: +To create the ``pudl-dev`` environment and install the local PUDL package using +``make``, run: .. code-block:: console $ make install-pudl +If you want to see all the bundled commands we've defined, open up the ``Makefile``. +There's also some additional information in the :doc:`testing` documentation. + ------------------------------------------------------------------------------- Updating the PUDL Development Environment ------------------------------------------------------------------------------- @@ -130,9 +122,8 @@ creating it the first time: $ make install-pudl If you happen to be changing the dependencies listed in ``pyproject.toml`` and you want -to re-create the conda lockfile from scratch, resolving for any newly updated -dependencies, and then create a fresh ``pudl-dev`` environment using the new lockfile, -you can use: +to re-create the conda lockfile from scratch to include any newly defined dependencies, +and then create a fresh ``pudl-dev`` environment using the new lockfile, you can do: .. code-block:: console @@ -202,34 +193,30 @@ The scripts that run are configured in the ``.pre-commit-config.yaml`` file. * `Real Python Code Quality Tools and Best Practices `__ gives a good overview of available linters and static code analysis tools. -Code and Docs Linters -^^^^^^^^^^^^^^^^^^^^^ +Linting and Formatting +^^^^^^^^^^^^^^^^^^^^^^ * `ruff `__ is a popular, fast Python `linting `__ and autofix framework, with a large selection of rules that can be configured (often mirroring plugins originally developed for ``flake8``). We use it to check the formatting and syntax of the code and to ensure that we're all using modern python syntax, type hinting, etc. +* We also use `ruff to format our code `__. It + serves as a much faster drop-in replacement for longtime crowd favorite `black + `__ * `doc8 `__ , lints our documentation files, which are written in the reStructuredText format and built by `Sphinx `__. This is the de-facto standard for Python documentation. The ``doc8`` tool checks for syntax errors and other formatting issues in the documentation source files under the ``docs/`` directory. -Automatic Formatting -^^^^^^^^^^^^^^^^^^^^ -We are using the the `black `__ code formatter -and style. It's automatically applied by oure pre-commit hooks, and can probably be -integrated directly into your code editor. - Linting Within Your Editor ^^^^^^^^^^^^^^^^^^^^^^^^^^ If you are using an editor designed for Python development many of these code linting and formatting tools can be run automatically in the background while you write code or documentation. Popular editors that work with the above tools include: -* `Visual Studio Code `__, from Microsoft (free, but - controlled by the hegemon). +* `Visual Studio Code `__, from Microsoft (free, but...) * `NeoVim `__, (free and open source; for diehard Unix lovers) * `PyCharm `__ (paid). * `Sublime Text `__ (paid). From 7c3fc6463cdb3d2006d89c216a00e717d5f165fe Mon Sep 17 00:00:00 2001 From: zaneselvans Date: Wed, 22 Nov 2023 09:02:51 +0000 Subject: [PATCH 2/3] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 10 +- environments/conda-lock.yml | 126 +++++++++++++------------- environments/conda-osx-64.lock.yml | 10 +- environments/conda-osx-arm64.lock.yml | 10 +- 4 files changed, 78 insertions(+), 78 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index 47b4662f79..679da8427b 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -241,7 +241,7 @@ dependencies: - pure_eval=0.2.2=pyhd8ed1ab_0 - pyasn1=0.5.0=pyhd8ed1ab_0 - pycparser=2.21=pyhd8ed1ab_0 - - pygments=2.17.1=pyhd8ed1ab_0 + - pygments=2.17.2=pyhd8ed1ab_0 - pyjwt=2.8.0=pyhd8ed1ab_0 - pylev=1.4.0=pyhd8ed1ab_0 - pyparsing=3.1.1=pyhd8ed1ab_0 @@ -294,7 +294,7 @@ dependencies: - uri-template=1.3.0=pyhd8ed1ab_0 - uvloop=0.19.0=py311h460e60f_0 - validators=0.22.0=pyhd8ed1ab_0 - - wcwidth=0.2.11=pyhd8ed1ab_0 + - wcwidth=0.2.12=pyhd8ed1ab_0 - webcolors=1.13=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_2 - websocket-client=1.6.4=pyhd8ed1ab_0 @@ -399,7 +399,7 @@ dependencies: - arrow=1.3.0=pyhd8ed1ab_0 - async-timeout=4.0.3=pyhd8ed1ab_0 - aws-c-s3=0.3.24=hdb3bed3_1 - - botocore=1.32.4=pyhd8ed1ab_0 + - botocore=1.32.5=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.5=py311h63ff55d_0 @@ -433,7 +433,7 @@ dependencies: - pytest-console-scripts=1.4.1=pyhd8ed1ab_0 - pytest-cov=4.1.0=pyhd8ed1ab_0 - pytest-mock=3.12.0=pyhd8ed1ab_0 - - pytest-xdist=3.4.0=pyhd8ed1ab_0 + - pytest-xdist=3.5.0=pyhd8ed1ab_0 - python-build=1.0.3=pyhd8ed1ab_0 - requests=2.31.0=pyhd8ed1ab_0 - rich=13.7.0=pyhd8ed1ab_0 @@ -487,7 +487,7 @@ dependencies: - uvicorn-standard=0.24.0=h38be061_0 - virtualenv=20.24.6=pyhd8ed1ab_0 - aws-sdk-cpp=1.11.182=h8beafcf_7 - - boto3=1.29.4=pyhd8ed1ab_0 + - boto3=1.29.5=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - dagster=1.5.9=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index c617ab5d90..533d675e77 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -1875,52 +1875,52 @@ package: category: main optional: false - name: boto3 - version: 1.29.4 + version: 1.29.5 manager: conda platform: linux-64 dependencies: - botocore: ">=1.32.4,<1.33.0" + botocore: ">=1.32.5,<1.33.0" jmespath: ">=0.7.1,<2.0.0" python: ">=3.7" s3transfer: ">=0.7.0,<0.8.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.29.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.29.5-pyhd8ed1ab_0.conda hash: - md5: 5b2a15870e272dcd6c93b55a51911ef0 - sha256: 766f8a1d03fec78f00fee1d9856e1d2d7f67906ea6a12641c2911d5b0b9cff6a + md5: 71f950b9aaf48a7df14841177cbf52c1 + sha256: b734dadaff5e04ef632cf24417e04362e61778d5d97ba11e4648aa70d7cfcd7b category: main optional: false - name: boto3 - version: 1.29.4 + version: 1.29.5 manager: conda platform: osx-64 dependencies: python: ">=3.7" jmespath: ">=0.7.1,<2.0.0" s3transfer: ">=0.7.0,<0.8.0" - botocore: ">=1.32.4,<1.33.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.29.4-pyhd8ed1ab_0.conda + botocore: ">=1.32.5,<1.33.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.29.5-pyhd8ed1ab_0.conda hash: - md5: 5b2a15870e272dcd6c93b55a51911ef0 - sha256: 766f8a1d03fec78f00fee1d9856e1d2d7f67906ea6a12641c2911d5b0b9cff6a + md5: 71f950b9aaf48a7df14841177cbf52c1 + sha256: b734dadaff5e04ef632cf24417e04362e61778d5d97ba11e4648aa70d7cfcd7b category: main optional: false - name: boto3 - version: 1.29.4 + version: 1.29.5 manager: conda platform: osx-arm64 dependencies: python: ">=3.7" jmespath: ">=0.7.1,<2.0.0" s3transfer: ">=0.7.0,<0.8.0" - botocore: ">=1.32.4,<1.33.0" - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.29.4-pyhd8ed1ab_0.conda + botocore: ">=1.32.5,<1.33.0" + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.29.5-pyhd8ed1ab_0.conda hash: - md5: 5b2a15870e272dcd6c93b55a51911ef0 - sha256: 766f8a1d03fec78f00fee1d9856e1d2d7f67906ea6a12641c2911d5b0b9cff6a + md5: 71f950b9aaf48a7df14841177cbf52c1 + sha256: b734dadaff5e04ef632cf24417e04362e61778d5d97ba11e4648aa70d7cfcd7b category: main optional: false - name: botocore - version: 1.32.4 + version: 1.32.5 manager: conda platform: linux-64 dependencies: @@ -1928,14 +1928,14 @@ package: python: ">=3.7" python-dateutil: ">=2.1,<3.0.0" urllib3: ">=1.25.4,<1.27" - url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.32.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.32.5-pyhd8ed1ab_0.conda hash: - md5: f53119a5609759467402603088c0432f - sha256: eb0fa62f789ab85e314bc7d6637c391c9b978442118063f708071505e980e1b4 + md5: ee13db7160fcdf355ecec43180023020 + sha256: a76a6b9e0752cf079b3d154195f2517b35c572b760d5aed3ab59f4ed97df07e9 category: main optional: false - name: botocore - version: 1.32.4 + version: 1.32.5 manager: conda platform: osx-64 dependencies: @@ -1943,14 +1943,14 @@ package: python-dateutil: ">=2.1,<3.0.0" jmespath: ">=0.7.1,<2.0.0" urllib3: ">=1.25.4,<1.27" - url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.32.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.32.5-pyhd8ed1ab_0.conda hash: - md5: f53119a5609759467402603088c0432f - sha256: eb0fa62f789ab85e314bc7d6637c391c9b978442118063f708071505e980e1b4 + md5: ee13db7160fcdf355ecec43180023020 + sha256: a76a6b9e0752cf079b3d154195f2517b35c572b760d5aed3ab59f4ed97df07e9 category: main optional: false - name: botocore - version: 1.32.4 + version: 1.32.5 manager: conda platform: osx-arm64 dependencies: @@ -1958,10 +1958,10 @@ package: python-dateutil: ">=2.1,<3.0.0" jmespath: ">=0.7.1,<2.0.0" urllib3: ">=1.25.4,<1.27" - url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.32.4-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.32.5-pyhd8ed1ab_0.conda hash: - md5: f53119a5609759467402603088c0432f - sha256: eb0fa62f789ab85e314bc7d6637c391c9b978442118063f708071505e980e1b4 + md5: ee13db7160fcdf355ecec43180023020 + sha256: a76a6b9e0752cf079b3d154195f2517b35c572b760d5aed3ab59f4ed97df07e9 category: main optional: false - name: bottleneck @@ -17397,39 +17397,39 @@ package: category: main optional: false - name: pygments - version: 2.17.1 + version: 2.17.2 manager: conda platform: linux-64 dependencies: python: ">=3.7" - url: https://conda.anaconda.org/conda-forge/noarch/pygments-2.17.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pygments-2.17.2-pyhd8ed1ab_0.conda hash: - md5: 5bb8a4f4162594af97cee1434d39f500 - sha256: 406ed28a4c8cd6be56e7e1b2dabd283e834f234d057522228adb72b1885b87c7 + md5: 140a7f159396547e9799aa98f9f0742e + sha256: af5f8867450dc292f98ea387d4d8945fc574284677c8f60eaa9846ede7387257 category: main optional: false - name: pygments - version: 2.17.1 + version: 2.17.2 manager: conda platform: osx-64 dependencies: python: ">=3.7" - url: https://conda.anaconda.org/conda-forge/noarch/pygments-2.17.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pygments-2.17.2-pyhd8ed1ab_0.conda hash: - md5: 5bb8a4f4162594af97cee1434d39f500 - sha256: 406ed28a4c8cd6be56e7e1b2dabd283e834f234d057522228adb72b1885b87c7 + md5: 140a7f159396547e9799aa98f9f0742e + sha256: af5f8867450dc292f98ea387d4d8945fc574284677c8f60eaa9846ede7387257 category: main optional: false - name: pygments - version: 2.17.1 + version: 2.17.2 manager: conda platform: osx-arm64 dependencies: python: ">=3.7" - url: https://conda.anaconda.org/conda-forge/noarch/pygments-2.17.1-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pygments-2.17.2-pyhd8ed1ab_0.conda hash: - md5: 5bb8a4f4162594af97cee1434d39f500 - sha256: 406ed28a4c8cd6be56e7e1b2dabd283e834f234d057522228adb72b1885b87c7 + md5: 140a7f159396547e9799aa98f9f0742e + sha256: af5f8867450dc292f98ea387d4d8945fc574284677c8f60eaa9846ede7387257 category: main optional: false - name: pygraphviz @@ -17987,45 +17987,45 @@ package: category: main optional: false - name: pytest-xdist - version: 3.4.0 + version: 3.5.0 manager: conda platform: linux-64 dependencies: execnet: ">=1.1" pytest: ">=6.2.0" python: ">=3.7" - url: https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.4.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.5.0-pyhd8ed1ab_0.conda hash: - md5: b8dc6f9db1b9670e564b68277a79ffeb - sha256: b835170885a0d2b4bfdc7bc5d09e5a175518f41b6ffa1a0ac891797cd94e3292 + md5: d5f595da2daead898ca958ac62f0307b + sha256: 8dc1d422e48e5a80eb72e26ed0135bb4843cf508d3b1cb006c3257c8639784d1 category: main optional: false - name: pytest-xdist - version: 3.4.0 + version: 3.5.0 manager: conda platform: osx-64 dependencies: python: ">=3.7" execnet: ">=1.1" pytest: ">=6.2.0" - url: https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.4.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.5.0-pyhd8ed1ab_0.conda hash: - md5: b8dc6f9db1b9670e564b68277a79ffeb - sha256: b835170885a0d2b4bfdc7bc5d09e5a175518f41b6ffa1a0ac891797cd94e3292 + md5: d5f595da2daead898ca958ac62f0307b + sha256: 8dc1d422e48e5a80eb72e26ed0135bb4843cf508d3b1cb006c3257c8639784d1 category: main optional: false - name: pytest-xdist - version: 3.4.0 + version: 3.5.0 manager: conda platform: osx-arm64 dependencies: python: ">=3.7" execnet: ">=1.1" pytest: ">=6.2.0" - url: https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.4.0-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.5.0-pyhd8ed1ab_0.conda hash: - md5: b8dc6f9db1b9670e564b68277a79ffeb - sha256: b835170885a0d2b4bfdc7bc5d09e5a175518f41b6ffa1a0ac891797cd94e3292 + md5: d5f595da2daead898ca958ac62f0307b + sha256: 8dc1d422e48e5a80eb72e26ed0135bb4843cf508d3b1cb006c3257c8639784d1 category: main optional: false - name: python @@ -22867,39 +22867,39 @@ package: category: dev optional: true - name: wcwidth - version: 0.2.11 + version: 0.2.12 manager: conda platform: linux-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.11-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.12-pyhd8ed1ab_0.conda hash: - md5: 60f65626495b2883feeb394ca8bcf4aa - sha256: 34744528cbabb1b5cf9a0f2b718d905682591f529470207e57deb7e2f72541f7 + md5: bf4a1d1a97ca27b0b65bacd9e238b484 + sha256: ca757d0fc2dbd422af9d3238a8b4b630a6e11df3707a447bd89540656770d1d7 category: main optional: false - name: wcwidth - version: 0.2.11 + version: 0.2.12 manager: conda platform: osx-64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.11-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.12-pyhd8ed1ab_0.conda hash: - md5: 60f65626495b2883feeb394ca8bcf4aa - sha256: 34744528cbabb1b5cf9a0f2b718d905682591f529470207e57deb7e2f72541f7 + md5: bf4a1d1a97ca27b0b65bacd9e238b484 + sha256: ca757d0fc2dbd422af9d3238a8b4b630a6e11df3707a447bd89540656770d1d7 category: main optional: false - name: wcwidth - version: 0.2.11 + version: 0.2.12 manager: conda platform: osx-arm64 dependencies: python: ">=3.8" - url: https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.11-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.12-pyhd8ed1ab_0.conda hash: - md5: 60f65626495b2883feeb394ca8bcf4aa - sha256: 34744528cbabb1b5cf9a0f2b718d905682591f529470207e57deb7e2f72541f7 + md5: bf4a1d1a97ca27b0b65bacd9e238b484 + sha256: ca757d0fc2dbd422af9d3238a8b4b630a6e11df3707a447bd89540656770d1d7 category: main optional: false - name: webcolors diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index 680a46f935..28a8459b13 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -225,7 +225,7 @@ dependencies: - pure_eval=0.2.2=pyhd8ed1ab_0 - pyasn1=0.5.0=pyhd8ed1ab_0 - pycparser=2.21=pyhd8ed1ab_0 - - pygments=2.17.1=pyhd8ed1ab_0 + - pygments=2.17.2=pyhd8ed1ab_0 - pyjwt=2.8.0=pyhd8ed1ab_0 - pylev=1.4.0=pyhd8ed1ab_0 - pyparsing=3.1.1=pyhd8ed1ab_0 @@ -277,7 +277,7 @@ dependencies: - uri-template=1.3.0=pyhd8ed1ab_0 - uvloop=0.19.0=py311ha272bfe_0 - validators=0.22.0=pyhd8ed1ab_0 - - wcwidth=0.2.11=pyhd8ed1ab_0 + - wcwidth=0.2.12=pyhd8ed1ab_0 - webcolors=1.13=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_2 - websocket-client=1.6.4=pyhd8ed1ab_0 @@ -379,7 +379,7 @@ dependencies: - arrow=1.3.0=pyhd8ed1ab_0 - async-timeout=4.0.3=pyhd8ed1ab_0 - aws-crt-cpp=0.24.7=h0a75192_2 - - botocore=1.32.4=pyhd8ed1ab_0 + - botocore=1.32.5=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.5=py311hd51016d_0 @@ -413,7 +413,7 @@ dependencies: - pytest-console-scripts=1.4.1=pyhd8ed1ab_0 - pytest-cov=4.1.0=pyhd8ed1ab_0 - pytest-mock=3.12.0=pyhd8ed1ab_0 - - pytest-xdist=3.4.0=pyhd8ed1ab_0 + - pytest-xdist=3.5.0=pyhd8ed1ab_0 - python-build=1.0.3=pyhd8ed1ab_0 - requests=2.31.0=pyhd8ed1ab_0 - rich=13.7.0=pyhd8ed1ab_0 @@ -468,7 +468,7 @@ dependencies: - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0=h6eed73b_0 - virtualenv=20.24.6=pyhd8ed1ab_0 - - boto3=1.29.4=pyhd8ed1ab_0 + - boto3=1.29.5=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - dagster=1.5.9=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 5bdcd42440..c7044cbf05 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -225,7 +225,7 @@ dependencies: - pure_eval=0.2.2=pyhd8ed1ab_0 - pyasn1=0.5.0=pyhd8ed1ab_0 - pycparser=2.21=pyhd8ed1ab_0 - - pygments=2.17.1=pyhd8ed1ab_0 + - pygments=2.17.2=pyhd8ed1ab_0 - pyjwt=2.8.0=pyhd8ed1ab_0 - pylev=1.4.0=pyhd8ed1ab_0 - pyparsing=3.1.1=pyhd8ed1ab_0 @@ -277,7 +277,7 @@ dependencies: - uri-template=1.3.0=pyhd8ed1ab_0 - uvloop=0.19.0=py311h05b510d_0 - validators=0.22.0=pyhd8ed1ab_0 - - wcwidth=0.2.11=pyhd8ed1ab_0 + - wcwidth=0.2.12=pyhd8ed1ab_0 - webcolors=1.13=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_2 - websocket-client=1.6.4=pyhd8ed1ab_0 @@ -379,7 +379,7 @@ dependencies: - arrow=1.3.0=pyhd8ed1ab_0 - async-timeout=4.0.3=pyhd8ed1ab_0 - aws-crt-cpp=0.24.7=h528e168_2 - - botocore=1.32.4=pyhd8ed1ab_0 + - botocore=1.32.5=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 - cryptography=41.0.5=py311h71175c2_0 @@ -413,7 +413,7 @@ dependencies: - pytest-console-scripts=1.4.1=pyhd8ed1ab_0 - pytest-cov=4.1.0=pyhd8ed1ab_0 - pytest-mock=3.12.0=pyhd8ed1ab_0 - - pytest-xdist=3.4.0=pyhd8ed1ab_0 + - pytest-xdist=3.5.0=pyhd8ed1ab_0 - python-build=1.0.3=pyhd8ed1ab_0 - requests=2.31.0=pyhd8ed1ab_0 - rich=13.7.0=pyhd8ed1ab_0 @@ -468,7 +468,7 @@ dependencies: - typer=0.9.0=pyhd8ed1ab_0 - uvicorn-standard=0.24.0=ha1ab1f8_0 - virtualenv=20.24.6=pyhd8ed1ab_0 - - boto3=1.29.4=pyhd8ed1ab_0 + - boto3=1.29.5=pyhd8ed1ab_0 - cachecontrol-with-filecache=0.13.1=pyhd8ed1ab_0 - dagster=1.5.9=pyhd8ed1ab_0 - datasette=0.64.4=pyhd8ed1ab_1 From 15486819eaf165a6d0b19aae9c49c86d75fe5387 Mon Sep 17 00:00:00 2001 From: zaneselvans Date: Wed, 22 Nov 2023 15:04:44 +0000 Subject: [PATCH 3/3] Update conda-lock.yml and rendered conda environment files. --- environments/conda-linux-64.lock.yml | 6 +-- environments/conda-lock.yml | 78 +++++++++++++-------------- environments/conda-osx-64.lock.yml | 6 +-- environments/conda-osx-arm64.lock.yml | 6 +-- 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index 679da8427b..7db4554add 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -315,7 +315,7 @@ dependencies: - asttokens=2.4.1=pyhd8ed1ab_0 - async-lru=2.0.4=pyhd8ed1ab_0 - aws-c-auth=0.7.7=h37ad1db_0 - - aws-c-mqtt=0.9.9=h1387108_0 + - aws-c-mqtt=0.9.10=h1387108_0 - babel=2.13.1=pyhd8ed1ab_0 - beautifulsoup4=4.12.2=pyha770c72_0 - bleach=6.1.0=pyhd8ed1ab_0 @@ -398,7 +398,7 @@ dependencies: - argon2-cffi-bindings=21.2.0=py311h459d7ec_4 - arrow=1.3.0=pyhd8ed1ab_0 - async-timeout=4.0.3=pyhd8ed1ab_0 - - aws-c-s3=0.3.24=hdb3bed3_1 + - aws-c-s3=0.4.0=hdb3bed3_0 - botocore=1.32.5=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 @@ -448,7 +448,7 @@ dependencies: - alembic=1.12.1=pyhd8ed1ab_0 - arelle-release=2.17.4=pyhd8ed1ab_0 - argon2-cffi=23.1.0=pyhd8ed1ab_0 - - aws-crt-cpp=0.24.7=hd0f6be0_2 + - aws-crt-cpp=0.24.7=h08a389d_4 - bottleneck=1.3.7=py311h1f0f07a_1 - cachecontrol=0.13.1=pyhd8ed1ab_0 - contourpy=1.2.0=py311h9547e67_0 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 533d675e77..c834c4bc7b 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -1290,7 +1290,7 @@ package: category: main optional: false - name: aws-c-mqtt - version: 0.9.9 + version: 0.9.10 manager: conda platform: linux-64 dependencies: @@ -1298,42 +1298,42 @@ package: aws-c-http: ">=0.7.14,<0.7.15.0a0" aws-c-io: ">=0.13.35,<0.13.36.0a0" libgcc-ng: ">=12" - url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-mqtt-0.9.9-h1387108_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-mqtt-0.9.10-h1387108_0.conda hash: - md5: d03181571be036cfbe7accf52256efe7 - sha256: 1df6ad0f5db319090718f5d4575b8829ff5aa5b663c8580e191fa9005e71072d + md5: 52f15dd0717eb7124ca2f72096716d43 + sha256: 79804d7b1bc0b748867f38a4bfc29cd256b50cea78a86a1b987475ace8bb913a category: main optional: false - name: aws-c-mqtt - version: 0.9.9 + version: 0.9.10 manager: conda platform: osx-64 dependencies: aws-c-common: ">=0.9.8,<0.9.9.0a0" aws-c-http: ">=0.7.14,<0.7.15.0a0" aws-c-io: ">=0.13.35,<0.13.36.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-mqtt-0.9.9-h5e4a26e_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-mqtt-0.9.10-h5e4a26e_0.conda hash: - md5: 61eba6810125f2214ad6863bf8941c4e - sha256: e1812608ca7587561a7c8584c9c202404bfdf2d6f2e8f135fda92f5abf1556a4 + md5: bdccaf53194cfa8d3f0fa0c97949e26d + sha256: 9f8bad8212fca5f2affc35968b3e1eb2331436201f8639b58b7f8ec6681fa191 category: main optional: false - name: aws-c-mqtt - version: 0.9.9 + version: 0.9.10 manager: conda platform: osx-arm64 dependencies: aws-c-common: ">=0.9.8,<0.9.9.0a0" aws-c-http: ">=0.7.14,<0.7.15.0a0" aws-c-io: ">=0.13.35,<0.13.36.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-mqtt-0.9.9-h2364c62_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-mqtt-0.9.10-h2364c62_0.conda hash: - md5: f6fa220e8b10a832127be45ddb7f6f04 - sha256: f82dd9660edecf32482004d98a09ed6b2929cb3787be43e54f5db71be1d08b62 + md5: 5f2e388e03d6c309fb9b2f08b8f735b7 + sha256: 6dea107a19a493e3342299d40f45ee4660f04e3df4832f477a7d72645bdb71ab category: main optional: false - name: aws-c-s3 - version: 0.3.24 + version: 0.4.0 manager: conda platform: linux-64 dependencies: @@ -1345,14 +1345,14 @@ package: aws-checksums: ">=0.1.17,<0.1.18.0a0" libgcc-ng: ">=12" openssl: ">=3.1.4,<4.0a0" - url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-s3-0.3.24-hdb3bed3_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/aws-c-s3-0.4.0-hdb3bed3_0.conda hash: - md5: de14e39bcd4721b040f77aa37f241ff1 - sha256: 421069b755bf6f0091ef168d718612503b820005af3306781d4583e193d14a2e + md5: 6cf3186b5b12af3f2f8b7b5d3211b923 + sha256: c68d942d80eafcdf8eda5db9b820c1dcb015e53976eea2eef70d109040adcd4a category: main optional: false - name: aws-c-s3 - version: 0.3.24 + version: 0.4.0 manager: conda platform: osx-64 dependencies: @@ -1362,14 +1362,14 @@ package: aws-c-http: ">=0.7.14,<0.7.15.0a0" aws-c-io: ">=0.13.35,<0.13.36.0a0" aws-checksums: ">=0.1.17,<0.1.18.0a0" - url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-s3-0.3.24-h4293da7_1.conda + url: https://conda.anaconda.org/conda-forge/osx-64/aws-c-s3-0.4.0-h4293da7_0.conda hash: - md5: f336309a54f8846a21bed05b1dc8f419 - sha256: d78f1c4ff3b64c689db39e5a0771e311db1a4fbe7bc01256881215de5fc100fe + md5: 37ec6a79ae58d2d4f73892e8360ef7e7 + sha256: 69fb4395ee5fbbbae0ea470968f15137e89f51b8bcf00f9433ffda5a45bb26cd category: main optional: false - name: aws-c-s3 - version: 0.3.24 + version: 0.4.0 manager: conda platform: osx-arm64 dependencies: @@ -1379,10 +1379,10 @@ package: aws-c-http: ">=0.7.14,<0.7.15.0a0" aws-c-io: ">=0.13.35,<0.13.36.0a0" aws-checksums: ">=0.1.17,<0.1.18.0a0" - url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-s3-0.3.24-h2bce37b_1.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-c-s3-0.4.0-h2bce37b_0.conda hash: - md5: 219fd27c7fc531e45269878f2979c5df - sha256: bdd562f3a64992385fffc69f134e4d3d5c7096423c839c785020facf3615bac9 + md5: 2aae9ea67f1ea9d81b6962e89e35aa27 + sha256: eedc5254d199e7ced430b0a02dd7e82a375a6c01e19a0fa477f84fea642eacf6 category: main optional: false - name: aws-c-sdkutils @@ -1470,15 +1470,15 @@ package: aws-c-event-stream: ">=0.3.2,<0.3.3.0a0" aws-c-http: ">=0.7.14,<0.7.15.0a0" aws-c-io: ">=0.13.35,<0.13.36.0a0" - aws-c-mqtt: ">=0.9.9,<0.9.10.0a0" - aws-c-s3: ">=0.3.24,<0.3.25.0a0" + aws-c-mqtt: ">=0.9.10,<0.9.11.0a0" + aws-c-s3: ">=0.4.0,<0.4.1.0a0" aws-c-sdkutils: ">=0.1.12,<0.1.13.0a0" libgcc-ng: ">=12" libstdcxx-ng: ">=12" - url: https://conda.anaconda.org/conda-forge/linux-64/aws-crt-cpp-0.24.7-hd0f6be0_2.conda + url: https://conda.anaconda.org/conda-forge/linux-64/aws-crt-cpp-0.24.7-h08a389d_4.conda hash: - md5: dad2a20d6cec858052e7fdb6ee6741d7 - sha256: 8082e5ae80900e04321d08c41772469bc89714e78b8b331d3d7b0a278cf22cb2 + md5: b27b86c4faffba0f38dddfd8c55ffe43 + sha256: aa2d3ae52d5fb0332ac3ea9fcf86c7871065fced0df4ec6709e1c41fbf51c582 category: main optional: false - name: aws-crt-cpp @@ -1493,14 +1493,14 @@ package: aws-c-event-stream: ">=0.3.2,<0.3.3.0a0" aws-c-http: ">=0.7.14,<0.7.15.0a0" aws-c-io: ">=0.13.35,<0.13.36.0a0" - aws-c-mqtt: ">=0.9.9,<0.9.10.0a0" - aws-c-s3: ">=0.3.24,<0.3.25.0a0" + aws-c-mqtt: ">=0.9.10,<0.9.11.0a0" + aws-c-s3: ">=0.4.0,<0.4.1.0a0" aws-c-sdkutils: ">=0.1.12,<0.1.13.0a0" libcxx: ">=16.0.6" - url: https://conda.anaconda.org/conda-forge/osx-64/aws-crt-cpp-0.24.7-h0a75192_2.conda + url: https://conda.anaconda.org/conda-forge/osx-64/aws-crt-cpp-0.24.7-h6f34257_4.conda hash: - md5: e32ea3580856d5e269fd107ea37f641a - sha256: ed33d09614d9133a440dd29ea804fc785311dcab6477f74d5fc278cdc887d5e1 + md5: f413520333687e03b511b6c5fd94fc4b + sha256: 6a0add52b1a0fad5014b7b16492bc48df9a45daa38bf244d298a400d65ce944c category: main optional: false - name: aws-crt-cpp @@ -1515,14 +1515,14 @@ package: aws-c-event-stream: ">=0.3.2,<0.3.3.0a0" aws-c-http: ">=0.7.14,<0.7.15.0a0" aws-c-io: ">=0.13.35,<0.13.36.0a0" - aws-c-mqtt: ">=0.9.9,<0.9.10.0a0" - aws-c-s3: ">=0.3.24,<0.3.25.0a0" + aws-c-mqtt: ">=0.9.10,<0.9.11.0a0" + aws-c-s3: ">=0.4.0,<0.4.1.0a0" aws-c-sdkutils: ">=0.1.12,<0.1.13.0a0" libcxx: ">=16.0.6" - url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-crt-cpp-0.24.7-h528e168_2.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/aws-crt-cpp-0.24.7-h9b3cda8_4.conda hash: - md5: a01004b3736f99828d34191521a648ad - sha256: 38b5b5a93a0218586ee135cce4fce58c20b6be9cad8a7319d2bc83b3eee74668 + md5: 43b3d2a42a94a79d5e581e11acc9a302 + sha256: c8080f39a7a0b70ab0e42ad7372456f6ccadd513d0c7ee9766958594d0112c11 category: main optional: false - name: aws-sdk-cpp diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index 28a8459b13..361d2ff601 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -133,7 +133,7 @@ dependencies: - astroid=3.0.1=py311h6eed73b_0 - attrs=23.1.0=pyh71513ae_1 - aws-c-auth=0.7.7=hc3630cc_0 - - aws-c-mqtt=0.9.9=h5e4a26e_0 + - aws-c-mqtt=0.9.10=h5e4a26e_0 - backoff=2.2.1=pyhd8ed1ab_0 - backports.zoneinfo=0.2.1=py311h6eed73b_8 - blinker=1.7.0=pyhd8ed1ab_0 @@ -295,7 +295,7 @@ dependencies: - asgiref=3.7.2=pyhd8ed1ab_0 - asttokens=2.4.1=pyhd8ed1ab_0 - async-lru=2.0.4=pyhd8ed1ab_0 - - aws-c-s3=0.3.24=h4293da7_1 + - aws-c-s3=0.4.0=h4293da7_0 - babel=2.13.1=pyhd8ed1ab_0 - beautifulsoup4=4.12.2=pyha770c72_0 - bleach=6.1.0=pyhd8ed1ab_0 @@ -378,7 +378,7 @@ dependencies: - argon2-cffi-bindings=21.2.0=py311h2725bcf_4 - arrow=1.3.0=pyhd8ed1ab_0 - async-timeout=4.0.3=pyhd8ed1ab_0 - - aws-crt-cpp=0.24.7=h0a75192_2 + - aws-crt-cpp=0.24.7=h6f34257_4 - botocore=1.32.5=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index c7044cbf05..80c7f592b8 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -133,7 +133,7 @@ dependencies: - astroid=3.0.1=py311h267d04e_0 - attrs=23.1.0=pyh71513ae_1 - aws-c-auth=0.7.7=h30f9597_0 - - aws-c-mqtt=0.9.9=h2364c62_0 + - aws-c-mqtt=0.9.10=h2364c62_0 - backoff=2.2.1=pyhd8ed1ab_0 - backports.zoneinfo=0.2.1=py311h267d04e_8 - blinker=1.7.0=pyhd8ed1ab_0 @@ -295,7 +295,7 @@ dependencies: - asgiref=3.7.2=pyhd8ed1ab_0 - asttokens=2.4.1=pyhd8ed1ab_0 - async-lru=2.0.4=pyhd8ed1ab_0 - - aws-c-s3=0.3.24=h2bce37b_1 + - aws-c-s3=0.4.0=h2bce37b_0 - babel=2.13.1=pyhd8ed1ab_0 - beautifulsoup4=4.12.2=pyha770c72_0 - bleach=6.1.0=pyhd8ed1ab_0 @@ -378,7 +378,7 @@ dependencies: - argon2-cffi-bindings=21.2.0=py311heffc1b2_4 - arrow=1.3.0=pyhd8ed1ab_0 - async-timeout=4.0.3=pyhd8ed1ab_0 - - aws-crt-cpp=0.24.7=h528e168_2 + - aws-crt-cpp=0.24.7=h9b3cda8_4 - botocore=1.32.5=pyhd8ed1ab_0 - branca=0.7.0=pyhd8ed1ab_1 - croniter=2.0.1=pyhd8ed1ab_0