Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Prevent setuptools 72.x #1067

Merged
merged 7 commits into from
Aug 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure/pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ stages:
condition: startsWith(variables.image, 'windows')

- bash: |
conda create --quiet --name wheelEnvironment --channel conda-forge python=3.10
conda create --quiet --name wheelEnvironment --channel conda-forge python=3.10 "setuptools<72.0"
source activate wheelEnvironment
mkdir -p tmp
cd tmp
Expand Down
12 changes: 10 additions & 2 deletions .azure/templates/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,19 @@ steps:
conda-lock install --name myEnvironment \
environments/locks/conda-${{ parameters.solver }}-lock.yml
displayName: Create Anaconda environment from lockfile
condition: not(eq(variables['Build.CronSchedule.DisplayName'], 'Daily midnight build'))
condition: and(ne(variables['Build.CronSchedule.DisplayName'], 'Daily midnight build'),eq(variables['CONDA_ENVIRONMENT_NOT_LOCK'],''))

# Daily midnight build uses environment.yml files to catch regressions
# due to updates in dependencies
- bash: |
conda env create --name myEnvironment \
--file environments/${{ parameters.solver }}-environment.yml
displayName: Create Anaconda environment from environments
condition: eq(variables['Build.CronSchedule.DisplayName'], 'Daily midnight build')
condition: or(eq(variables['Build.CronSchedule.DisplayName'], 'Daily midnight build'), ne(variables['CONDA_ENVIRONMENT_NOT_LOCK'],''))

- bash: |
conda env export --name myEnvironment
displayName: EnvironmentA

- bash: |
if [[ "${{ parameters.conda_packages }}" != "" ]]; then
Expand All @@ -64,6 +68,10 @@ steps:
fi
displayName: Install Anaconda packages

- bash: |
conda env export --name myEnvironment
displayName: EnvironmentB

- bash: |
if [[ "${{ parameters.pip_packages }}" != "" ]]; then
source activate myEnvironment
Expand Down
14 changes: 14 additions & 0 deletions docs/source/ADMINISTRATA.rst
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,17 @@ We use the :term:`Azure` and :term:`GitHub Actions` cloud services for
|.azure/pipelines.yml|_, |.github/workflows/NISTtheDocs2Death.yml|_, and
|.github/workflows/nix.yml|_.

.. note::

In order to focus on breakages introduced by changes to :term:`FiPy`, a
`pull request`_ is normally built with one of the :ref:`CONDALOCKFILES`,
whereas the nightly builds use an :file:`environment.yml` in order to
catch breakages introduced by :term:`FiPy`'s prerequisites.

A `pull request`_ may be tested with the latest prerequisites by setting
the ``CONDA_ENVIRONMENT_NOT_LOCK`` environment variable in
`Azure at queue time`_.

.. |Tests| image:: https://dev.azure.com/guyer/FiPy/_apis/build/status/usnistgov.fipy?branchName=master
.. _Tests: https://dev.azure.com/guyer/FiPy/_build?definitionId=2
.. |Documentation| image:: https://github.com/usnistgov/fipy/actions/workflows/NISTtheDocs2Death.yml/badge.svg
Expand All @@ -118,6 +129,9 @@ We use the :term:`Azure` and :term:`GitHub Actions` cloud services for
.. _.github/workflows/NISTtheDocs2Death.yml: https://github.com/usnistgov/fipy/blob/master/.github/workflows/NISTtheDocs2Death.yml
.. |.github/workflows/nix.yml| replace:: :file:`{FiPySource}/.github/workflows/nix.yml`
.. _.github/workflows/nix.yml: https://github.com/usnistgov/fipy/blob/master/.github/workflows/nix.yml
.. _Azure at queue time: https://learn.microsoft.com/en-us/azure/devops/pipelines/process/variables?view=azure-devops&tabs=yaml%2Cbatch#allow-at-queue-time

.. _CONDALOCKFILES:

===============
Conda Lockfiles
Expand Down
10 changes: 5 additions & 5 deletions environments/locks/conda-petsc-linux-64.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: 6a37057229efda6d84261e395d8b3fa4943f5c5ebd92a310b9c0721e96c931a8
# input_hash: 872e638bc9b0f904ddf88796629828a64c36ccf577723c2a8f4bdf805733fed2
@EXPLICIT
https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2#d7c89558ba9fa0495403155b64376d81
https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2024.7.4-hbcca054_0.conda#23ab7665c5f63cfb9f1f6195256daac6
Expand Down Expand Up @@ -131,7 +131,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libtheora-1.1.1-h4ab18f5_1006.co
https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.6.0-h1dd3fc0_3.conda#66f03896ffbe1a110ffda05c7a856504
https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.12.7-hc051c1a_1.conda#340278ded8b0dc3a73f3660bbb0adbc6
https://conda.anaconda.org/conda-forge/linux-64/mpfr-4.2.1-h38ae2d0_2.conda#168e18a2bba4f8520e6c5e38982f5847
https://conda.anaconda.org/conda-forge/linux-64/mpich-4.2.2-h4a7f18d_100.conda#57413013e812d1a544e0b4d02ba868be
https://conda.anaconda.org/conda-forge/linux-64/mpich-4.2.2-h4a7f18d_101.conda#b4cdd5ee00e999edf626ae49ff6feac2
https://conda.anaconda.org/conda-forge/linux-64/mysql-libs-8.3.0-hca2cd23_4.conda#1b50eebe2a738a3146c154d2eceaa8b6
https://conda.anaconda.org/conda-forge/linux-64/nss-3.100-hca3bf56_0.conda#949c4a82290ee58b3c970cef4bcfd4ad
https://conda.anaconda.org/conda-forge/linux-64/openexr-3.2.2-haf962dd_1.conda#34e58e21fc28e404207d6ce4287da264
Expand All @@ -143,7 +143,7 @@ https://conda.anaconda.org/conda-forge/linux-64/xcb-util-keysyms-0.4.0-h8ee46fc_
https://conda.anaconda.org/conda-forge/linux-64/xcb-util-renderutil-0.3.9-hd590300_1.conda#e995b155d938b6779da6ace6c6b13816
https://conda.anaconda.org/conda-forge/linux-64/xcb-util-wm-0.4.1-h8ee46fc_1.conda#90108a432fb5c6150ccfee3f03388656
https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.8.9-h8ee46fc_0.conda#077b6e8ad6a3ddb741fce2496dd01bec
https://conda.anaconda.org/conda-forge/noarch/attrs-23.2.0-pyh71513ae_0.conda#5e4c0743c70186509d1412e03c2d8dfa
https://conda.anaconda.org/conda-forge/noarch/attrs-24.1.0-pyh71513ae_0.conda#1f2d47df5c1127313066a8651fe9288d
https://conda.anaconda.org/conda-forge/linux-64/brotli-1.1.0-hd590300_1.conda#f27a24d46e3ea7b70a1f98e50c62508f
https://conda.anaconda.org/conda-forge/noarch/certifi-2024.7.4-pyhd8ed1ab_0.conda#24e7fd6ca65997938fff9e5ab6f653e4
https://conda.anaconda.org/conda-forge/noarch/cycler-0.12.1-pyhd8ed1ab_0.conda#5cd86562580f274031ede6aa6aa24441
Expand Down Expand Up @@ -210,7 +210,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libraw-0.21.1-h2a13503_2.conda#6
https://conda.anaconda.org/conda-forge/linux-64/libva-2.21.0-h4ab18f5_2.conda#109300f4eeeb8a61498283565106b474
https://conda.anaconda.org/conda-forge/linux-64/libxkbcommon-1.7.0-h662e7e4_0.conda#b32c0da42b1f24a98577bb3d7fc0b995
https://conda.anaconda.org/conda-forge/linux-64/pillow-10.3.0-py312hdcec9eb_0.conda#425bb325f970e57a047ac57c4586489d
https://conda.anaconda.org/conda-forge/noarch/pip-24.0-pyhd8ed1ab_0.conda#f586ac1e56c8638b64f9c8122a7b8a67
https://conda.anaconda.org/conda-forge/noarch/pip-24.2-pyhd8ed1ab_0.conda#6721aef6bfe5937abe70181545dd2c51
https://conda.anaconda.org/conda-forge/linux-64/proj-9.3.1-h1d62c97_0.conda#44ec51d0857d9be26158bb85caa74fdb
https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.9.0-pyhd8ed1ab_0.conda#2cf4264fffb9e6eff6031c5b6884d61c
https://conda.anaconda.org/conda-forge/linux-64/sip-6.7.12-py312h30efb56_0.conda#32633871002ee9902f747d2236e0d122
Expand Down Expand Up @@ -261,7 +261,7 @@ https://conda.anaconda.org/conda-forge/linux-64/scipy-1.14.0-py312hc2bc53b_1.con
https://conda.anaconda.org/conda-forge/noarch/wslink-2.1.1-pyhd8ed1ab_0.conda#6b1aef9c878c58baa7bb9f0d44457174
https://conda.anaconda.org/conda-forge/linux-64/ffmpeg-6.1.1-gpl_he44c6f3_112.conda#51a49318bcd4e848e867a5b9ea5b6545
https://conda.anaconda.org/conda-forge/linux-64/gmsh-4.12.2-h6b98cf8_0.conda#fe4f54ab589df77b84fecc3b7991fed6
https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.9.1-py312h9201f00_0.conda#e1dc3a7d999666f5c58cbb391940e235
https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.9.1-py312h854627b_1.conda#3e91b5c827934aae7a6694e3aa41cc27
https://conda.anaconda.org/conda-forge/linux-64/petsc-3.20.2-real_h622a54c_100.conda#ad1583996178ca9d76bb33b751e9793f
https://conda.anaconda.org/conda-forge/linux-64/pulseaudio-client-17.0-hb77b528_0.conda#07f45f1be1c25345faddb8db0de8039b
https://conda.anaconda.org/conda-forge/noarch/traitsui-8.0.0-pyhd8ed1ab_0.conda#230a8da760e3037989d8d9ec8a370368
Expand Down
111 changes: 56 additions & 55 deletions environments/locks/conda-petsc-lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
version: 1
metadata:
content_hash:
linux-64: 6a37057229efda6d84261e395d8b3fa4943f5c5ebd92a310b9c0721e96c931a8
osx-64: e6001efe96ebc7e8c2c86c991f7eeaf40351bc97a2518c04ad579ad3dcc7c511
osx-arm64: d2be9f03bad6c2bc3b5b2132ba3f07f8b4f5e4dcd8af71cda104a17183304329
linux-64: 872e638bc9b0f904ddf88796629828a64c36ccf577723c2a8f4bdf805733fed2
osx-64: 6724fbeba5d8d1bd348ca6f4af65bc23daa78245f3d754b6e33f902b3fc3a126
osx-arm64: a0dacd781c3599fb30687dc5f9ae60701be37e733ba7bbb8b928d4fc405eb5e6
channels:
- url: conda-forge
used_env_vars: []
Expand Down Expand Up @@ -258,39 +258,39 @@ package:
category: main
optional: false
- name: attrs
version: 23.2.0
version: 24.1.0
manager: conda
platform: linux-64
dependencies:
python: '>=3.7'
url: https://conda.anaconda.org/conda-forge/noarch/attrs-23.2.0-pyh71513ae_0.conda
url: https://conda.anaconda.org/conda-forge/noarch/attrs-24.1.0-pyh71513ae_0.conda
hash:
md5: 5e4c0743c70186509d1412e03c2d8dfa
sha256: 77c7d03bdb243a048fff398cedc74327b7dc79169ebe3b4c8448b0331ea55fea
md5: 1f2d47df5c1127313066a8651fe9288d
sha256: fe47984d3e453c763ff7b4b854837f0bf4fe233a2cd162be82504a19c4ec1457
category: main
optional: false
- name: attrs
version: 23.2.0
version: 24.1.0
manager: conda
platform: osx-64
dependencies:
python: '>=3.7'
url: https://conda.anaconda.org/conda-forge/noarch/attrs-23.2.0-pyh71513ae_0.conda
url: https://conda.anaconda.org/conda-forge/noarch/attrs-24.1.0-pyh71513ae_0.conda
hash:
md5: 5e4c0743c70186509d1412e03c2d8dfa
sha256: 77c7d03bdb243a048fff398cedc74327b7dc79169ebe3b4c8448b0331ea55fea
md5: 1f2d47df5c1127313066a8651fe9288d
sha256: fe47984d3e453c763ff7b4b854837f0bf4fe233a2cd162be82504a19c4ec1457
category: main
optional: false
- name: attrs
version: 23.2.0
version: 24.1.0
manager: conda
platform: osx-arm64
dependencies:
python: '>=3.7'
url: https://conda.anaconda.org/conda-forge/noarch/attrs-23.2.0-pyh71513ae_0.conda
url: https://conda.anaconda.org/conda-forge/noarch/attrs-24.1.0-pyh71513ae_0.conda
hash:
md5: 5e4c0743c70186509d1412e03c2d8dfa
sha256: 77c7d03bdb243a048fff398cedc74327b7dc79169ebe3b4c8448b0331ea55fea
md5: 1f2d47df5c1127313066a8651fe9288d
sha256: fe47984d3e453c763ff7b4b854837f0bf4fe233a2cd162be82504a19c4ec1457
category: main
optional: false
- name: blosc
Expand Down Expand Up @@ -3662,10 +3662,10 @@ package:
platform: osx-64
dependencies:
__osx: '>=10.13'
url: https://conda.anaconda.org/conda-forge/osx-64/libcxx-18.1.8-hef8daea_1.conda
url: https://conda.anaconda.org/conda-forge/osx-64/libcxx-18.1.8-hef8daea_2.conda
hash:
md5: 8309952890f89dbd4283a18633ecdfe3
sha256: 92611f996ee339e1e5d2988d5e5d7ac9be2b7c2b5ce7ace1961ef4697558b644
md5: c21d8b63b5cf5d3290d5a7aa2b028bcc
sha256: d63c2c723014fd7c27bfbc69aff3c09975d00755d1821b1d2304303b08b2e560
category: main
optional: false
- name: libcxx
Expand All @@ -3674,10 +3674,10 @@ package:
platform: osx-arm64
dependencies:
__osx: '>=11.0'
url: https://conda.anaconda.org/conda-forge/osx-arm64/libcxx-18.1.8-h167917d_1.conda
url: https://conda.anaconda.org/conda-forge/osx-arm64/libcxx-18.1.8-h167917d_2.conda
hash:
md5: 2b2b76e189430c2c264b5b2d5869f667
sha256: 00b2419d7a25b146d7466bba101c424331f6c6b8cf9dce5562dcdd1b2b0109eb
md5: 15656a04159b40ab98e02b46b52b7919
sha256: 001b211de6264f7160f4e781efbff11cd67a326f67b7d6b07e6278fcb0cc2f50
category: main
optional: false
- name: libdeflate
Expand Down Expand Up @@ -6244,6 +6244,7 @@ package:
manager: conda
platform: linux-64
dependencies:
__glibc: '>=2.17,<3.0.a0'
certifi: '>=2020.06.20'
contourpy: '>=1.0.1'
cycler: '>=0.10'
Expand All @@ -6261,10 +6262,10 @@ package:
python_abi: 3.12.*
qhull: '>=2020.2,<2020.3.0a0'
tk: '>=8.6.13,<8.7.0a0'
url: https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.9.1-py312h9201f00_0.conda
url: https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.9.1-py312h854627b_1.conda
hash:
md5: e1dc3a7d999666f5c58cbb391940e235
sha256: 6535eaf7260fc7ebd30b208197dc5eb00a1f1e4bbbbc057bb8bc52442b28fcf8
md5: 3e91b5c827934aae7a6694e3aa41cc27
sha256: fb19939f39f95cf654210cb742a946bcd327d5f69016d400a576d1d1c6d511c1
category: main
optional: false
- name: matplotlib-base
Expand All @@ -6288,10 +6289,10 @@ package:
python-dateutil: '>=2.7'
python_abi: 3.12.*
qhull: '>=2020.2,<2020.3.0a0'
url: https://conda.anaconda.org/conda-forge/osx-64/matplotlib-base-3.9.1-py312h0d5aeb7_0.conda
url: https://conda.anaconda.org/conda-forge/osx-64/matplotlib-base-3.9.1-py312h0d5aeb7_1.conda
hash:
md5: 824194f775dbc413b1dc44d58f3249db
sha256: 9f4c796d6eb7841bbfd68e6272d25fe719d842134e08a17994e857f517062ba0
md5: bbccad0811c1624be9a17c4c7acac62e
sha256: 35a2398b1a61fc7d3421162b5b57ec08da56a7c3a6a1c51ad4f73d8f40ccff99
category: main
optional: false
- name: matplotlib-base
Expand All @@ -6315,10 +6316,10 @@ package:
python-dateutil: '>=2.7'
python_abi: 3.12.*
qhull: '>=2020.2,<2020.3.0a0'
url: https://conda.anaconda.org/conda-forge/osx-arm64/matplotlib-base-3.9.1-py312h32d6e5a_0.conda
url: https://conda.anaconda.org/conda-forge/osx-arm64/matplotlib-base-3.9.1-py312h32d6e5a_1.conda
hash:
md5: 02eddb506a3949536cfeb267a328e3e4
sha256: 57630e1a274fcfc8fa016e70cef13802afe8fdfb5852b8733c14dc25d6208de8
md5: c203f8eebe758ffdbc78e609f56902fe
sha256: dec21795361fbea6a66aefa9b1c1ad0b8f41e911d22770bf217ca946ad7fa4d3
category: main
optional: false
- name: mayavi
Expand Down Expand Up @@ -6568,13 +6569,13 @@ package:
__glibc: '>=2.17,<3.0.a0'
libgcc-ng: '>=12'
libgfortran-ng: ''
libgfortran5: '>=12.3.0'
libgfortran5: '>=12.4.0'
libstdcxx-ng: '>=12'
mpi: '1.0'
url: https://conda.anaconda.org/conda-forge/linux-64/mpich-4.2.2-h4a7f18d_100.conda
url: https://conda.anaconda.org/conda-forge/linux-64/mpich-4.2.2-h4a7f18d_101.conda
hash:
md5: 57413013e812d1a544e0b4d02ba868be
sha256: 915e2f3f8ab95256ece47ff7021a9c531632515ba1118f2ab65087c4d9427ab0
md5: b4cdd5ee00e999edf626ae49ff6feac2
sha256: 287298cce4187881ef54a3e6b733d2d3f5e796d36829b4dbb125729bbe3a55e4
category: main
optional: false
- name: mpich
Expand All @@ -6587,10 +6588,10 @@ package:
libgfortran: 5.*
libgfortran5: '>=13.2.0'
mpi: '1.0'
url: https://conda.anaconda.org/conda-forge/osx-64/mpich-4.2.2-hd5a4e64_100.conda
url: https://conda.anaconda.org/conda-forge/osx-64/mpich-4.2.2-hd5a4e64_101.conda
hash:
md5: 6dad777cb5b2278bb1189dacbfb26e13
sha256: aa9978ca5640cc4287f9b8b1a76ee6c20a07bf162f8c5878140e21a4fbfb0d3d
md5: ccbb9e9c433aee60e1a979a3481d234a
sha256: 8d1473fec13dd989f5af0a11a9f7d3d9c3abb4bcd0ae49c585256bc14946f36a
category: main
optional: false
- name: mpich
Expand All @@ -6603,10 +6604,10 @@ package:
libgfortran: 5.*
libgfortran5: '>=13.2.0'
mpi: '1.0'
url: https://conda.anaconda.org/conda-forge/osx-arm64/mpich-4.2.2-h9ee2227_100.conda
url: https://conda.anaconda.org/conda-forge/osx-arm64/mpich-4.2.2-h9ee2227_101.conda
hash:
md5: 113384cd2d7231fa69eb6782fd60a15e
sha256: 8eff6c3d376e791ba3b96157d91e5a85e32f46e158e1da654c62e9b5632492f3
md5: 3cd2f3265393249e7e789449ab663a3d
sha256: 0331a6f14fd0026d79d44cfd826a788dfd641808f8c06a4c27d06ab36d4cdc07
category: main
optional: false
- name: msgpack-python
Expand Down Expand Up @@ -7766,45 +7767,45 @@ package:
category: main
optional: false
- name: pip
version: '24.0'
version: '24.2'
manager: conda
platform: linux-64
dependencies:
python: '>=3.7'
python: '>=3.8'
setuptools: ''
wheel: ''
url: https://conda.anaconda.org/conda-forge/noarch/pip-24.0-pyhd8ed1ab_0.conda
url: https://conda.anaconda.org/conda-forge/noarch/pip-24.2-pyhd8ed1ab_0.conda
hash:
md5: f586ac1e56c8638b64f9c8122a7b8a67
sha256: b7c1c5d8f13e8cb491c4bd1d0d1896a4cf80fc47de01059ad77509112b664a4a
md5: 6721aef6bfe5937abe70181545dd2c51
sha256: 15b480571a7a4d896aa187648cce99f98bac3926253f028f228d2e9e1cf7c1e1
category: main
optional: false
- name: pip
version: '24.0'
version: '24.2'
manager: conda
platform: osx-64
dependencies:
setuptools: ''
wheel: ''
python: '>=3.7'
url: https://conda.anaconda.org/conda-forge/noarch/pip-24.0-pyhd8ed1ab_0.conda
python: '>=3.8'
url: https://conda.anaconda.org/conda-forge/noarch/pip-24.2-pyhd8ed1ab_0.conda
hash:
md5: f586ac1e56c8638b64f9c8122a7b8a67
sha256: b7c1c5d8f13e8cb491c4bd1d0d1896a4cf80fc47de01059ad77509112b664a4a
md5: 6721aef6bfe5937abe70181545dd2c51
sha256: 15b480571a7a4d896aa187648cce99f98bac3926253f028f228d2e9e1cf7c1e1
category: main
optional: false
- name: pip
version: '24.0'
version: '24.2'
manager: conda
platform: osx-arm64
dependencies:
setuptools: ''
wheel: ''
python: '>=3.7'
url: https://conda.anaconda.org/conda-forge/noarch/pip-24.0-pyhd8ed1ab_0.conda
python: '>=3.8'
url: https://conda.anaconda.org/conda-forge/noarch/pip-24.2-pyhd8ed1ab_0.conda
hash:
md5: f586ac1e56c8638b64f9c8122a7b8a67
sha256: b7c1c5d8f13e8cb491c4bd1d0d1896a4cf80fc47de01059ad77509112b664a4a
md5: 6721aef6bfe5937abe70181545dd2c51
sha256: 15b480571a7a4d896aa187648cce99f98bac3926253f028f228d2e9e1cf7c1e1
category: main
optional: false
- name: pixman
Expand Down
Loading
Loading