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

Update the gsi-addon-dev environment to Python 3.11.7 #1252

Merged
merged 31 commits into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
af643cc
Bump Python to 3.11.7
climbfuji Aug 5, 2024
a12300c
Update .gitmodules and submodule pointer for spack for code review an…
climbfuji Aug 5, 2024
89fa6ea
Bump Python in Github actions to 3.11.7
climbfuji Aug 5, 2024
ee7ca35
Revert .gitmodules and update submodule pointer for spack
climbfuji Aug 6, 2024
34a66d1
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Aug 8, 2024
559fca5
Update submodule pointer for spack
climbfuji Aug 9, 2024
b74f34b
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Aug 9, 2024
4152e8d
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Aug 15, 2024
85fe5d4
Add 'py-dask +delayed' to gmao-swell-env and add comments in that pac…
climbfuji Aug 15, 2024
f1f1e54
Merge branch 'develop' into feature/py-dask-in-ue
climbfuji Aug 16, 2024
73f280b
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Aug 16, 2024
89f8983
Merge branch 'develop' into feature/py-dask-in-ue
climbfuji Aug 16, 2024
2a996bd
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Aug 16, 2024
ea57f81
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Aug 16, 2024
f75dd84
Merge branch 'develop' into feature/py-dask-in-ue
climbfuji Aug 16, 2024
81879f8
Merge branch 'feature/py-dask-in-ue' of https://github.com/climbfuji/…
climbfuji Aug 16, 2024
8a47c7e
Add MET/METplus v9.1.3/v3.1.1 to the unified-env requirements matrix
DavidHuber-NOAA Aug 19, 2024
8673c47
Add MET/METplus v9.1.3/v3.1.1 to the unified-env requirements matrix
DavidHuber-NOAA Aug 19, 2024
324c27c
Merge branch 'develop' into feature/MET_METp_3.1.1
climbfuji Aug 19, 2024
a39d81e
Update to Python 3.11.7 in the gsi-addon and pull upstream python pac…
DavidHuber-NOAA Aug 19, 2024
ebb4d2f
Revert mandatory met/metplus versions in the global-workflow env
DavidHuber-NOAA Aug 19, 2024
c11f7f5
Merge branch 'feature/MET_METp_3.1.1' of github.com:davidhuber-noaa/s…
DavidHuber-NOAA Aug 19, 2024
31c876d
Add Python library dependencies to verif-global
DavidHuber-NOAA Aug 19, 2024
5b92456
De-specify met/metplus versions for the global-workflow
DavidHuber-NOAA Aug 20, 2024
fa34fb6
Add emc-verif-global-env to gsi-addon-dev
DavidHuber-NOAA Aug 20, 2024
370aa3d
Merge branch 'develop' into feature/MET_METp_3.1.1
DavidHuber-NOAA Aug 21, 2024
22e5218
Merge branch 'develop' into feature/MET_METp_3.1.1
DavidHuber-NOAA Aug 22, 2024
edbe999
Merge remote-tracking branch 'jcsda/develop' into feature/MET_METp_3.1.1
DavidHuber-NOAA Aug 26, 2024
1bc6ac9
Merge branch 'develop' into feature/MET_METp_3.1.1
DavidHuber-NOAA Aug 27, 2024
fba44c3
Revert packages.py, move older met/metplus versions to gsi-addon-dev
DavidHuber-NOAA Aug 27, 2024
3b4f838
remove equals
DavidHuber-NOAA Aug 27, 2024
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 .github/workflows/macos-ci-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ jobs:
module use ${ENVDIR}/install/modulefiles/Core
module load stack-apple-clang/14.0.3
module load stack-openmpi/5.0.3
module load stack-python/3.10.13
module load stack-python/3.11.7
module available

module load jedi-ufs-env
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-ci-x86_64-gnu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ jobs:
module use ${ENVDIR}/install/modulefiles/Core
module load stack-gcc/11.4.0
module load stack-openmpi/5.0.3
module load stack-python/3.10.13
module load stack-python/3.11.7
module available

module load jedi-ufs-env
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-ci-x86_64-intel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ jobs:
module use ${ENVDIR}/install/modulefiles/Core
module load stack-intel/2021.10.0
module load stack-intel-oneapi-mpi/2021.10.0
module load stack-python/3.10.13
module load stack-python/3.11.7
module available

module load jedi-ufs-env
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-ci-x86_64-oneapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ jobs:
module use ${ENVDIR}/install/modulefiles/Core
module load stack-oneapi/2024.2.0
module load stack-intel-oneapi-mpi/2021.13
module load stack-python/3.10.13
module load stack-python/3.11.7
module available

module load jedi-ufs-env
Expand Down
9 changes: 6 additions & 3 deletions configs/common/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,12 @@ packages:
variants: '+pflogger'
# If making changes here, also check the Discover site configs and the CI workflows
met:
require: '@11.1.1 +python +grib2'
require:
- any_of: ['@=11.1.1', '@=9.1.3']
- '+python +grib2'
metplus:
require: '@5.1.0'
require:
AlexanderRichert-NOAA marked this conversation as resolved.
Show resolved Hide resolved
- any_of: ['@=5.1.0', '@=3.1.1']
metis:
require: '+int64 +real64'
mpich:
Expand Down Expand Up @@ -182,7 +185,7 @@ packages:
proj:
require: '~tiff'
python:
require: '@3.10.13'
require: '@3.11.7'
py-attrs:
# https://github.com/JCSDA/spack-stack/issues/740
require: '@21.4.0'
Expand Down
2 changes: 1 addition & 1 deletion configs/templates/ufs-srw-dev/spack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@ spack:
- wrf-io@1.2.0
- ncio@1.1.2
- gsi-ncdiag@1.1.2
- met@11.1.0
- met@11.1.1
- metplus@5.1.0
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ class GlobalWorkflowEnv(BundlePackage):
depends_on("wgrib2", when="%apple-clang")
depends_on("wgrib2", when="%gcc")
depends_on("wgrib2", when="%intel")
depends_on("met")
depends_on("metplus")
depends_on("met@9.1.3")
depends_on("metplus@3.1.1")
depends_on("gsi-ncdiag")
depends_on("crtm@2.4.0.1")
depends_on("py-wxflow", when="+python")
Expand Down
11 changes: 7 additions & 4 deletions spack-ext/repos/spack-stack/packages/gmao-swell-env/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,13 @@ class GmaoSwellEnv(BundlePackage):
depends_on("py-urllib3", type="run")
depends_on("py-wheel", type="run")
depends_on("py-setuptools", type="run")

# Different versions than other bundles
depends_on("py-pycodestyle@2.10:", type="run")
depends_on("py-pyyaml@6:", type="run")
depends_on("py-pycodestyle", type="run")
depends_on("py-pyyaml", type="run")
# Note that the +delayed option is for compatibility
# with the py-xnrl package (this restricts py-dask
# to certain versions, since the newest versions
# don't have that option anymore.
depends_on("py-dask +delayed", type="run")

# Future dependencies needed
# depends_on("py-bokeh", type="run")
Expand Down
2 changes: 2 additions & 0 deletions spack-ext/repos/spack-stack/packages/py-xnrl/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ class PyXnrl(PythonPackage):
depends_on("py-poetry", type="build")

depends_on("py-metpy", type=("build", "run"))
# Note: if the +delayed option is removed, also
# need to remove it from gmao-swell-env.
depends_on("py-dask +delayed", type=("build", "run"))
depends_on("py-h5netcdf", type=("build", "run"))
depends_on("py-netcdf4", type=("build", "run"))
Expand Down
Loading