Skip to content

Matching packages between main and develop branches and removal of outdated pull request template #86

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.

Sign up for GitHub

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

Merged
fmalatino merged 15 commits into from
Jul 8, 2024
Merged

Matching packages between main and develop branches and removal of outdated pull request template #86

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
da98b4d
Changed workflows to use python 3.11.7, added pytest-subtests to requ…
fmalatino Jun 4, 2024
f86e143
Matched package dependencies between main and develop branches
fmalatino Jun 13, 2024
01b31b7
Removed singular constraint file
fmalatino Jun 13, 2024
6eb9f27
Removed redudant lines from Dockerfile and created singular constrain…
fmalatino Jun 13, 2024
6c7ff9f
Fixing requirements_dev.txt
fmalatino Jun 13, 2024
14866fd
Updated Dockerfile base image to python 3.11.7-slim-bullseye
fmalatino Jun 13, 2024
b90b02e
Working on Dockerfile
fmalatino Jun 27, 2024
4f54c75
Merged in changes from PR 89
fmalatino Jun 27, 2024
9652fca
Updating constraints file
fmalatino Jun 27, 2024
0642982
Reverting changes in Makefile for docker builds, updating NDSL, and u…
fmalatino Jul 1, 2024
763250e
Updating platformdirs to v3.10.0 in constraints.txt
fmalatino Jul 1, 2024
9f68b76
Updating constraints.txt
fmalatino Jul 3, 2024
2c7bedb
Updating Dockerfile to use 3.11-slim-bookworm base python image
fmalatino Jul 3, 2024
5ed4ae9
Updating constraints to use platformdirs v3.10.0
fmalatino Jul 3, 2024
ecb7c65
Removing dace:cpu backend from baroclinic_c12 example
fmalatino Jul 8, 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
31 changes: 0 additions & 31 deletions .github/pull_request_template.md
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
uses: actions/checkout@v3.5.2
with:
submodules: 'recursive'
- name: Step Python 3.11.9
- name: Step Python 3.11.7
uses: actions/setup-python@v4.6.0
with:
python-version: '3.11.9'
python-version: '3.11.7'
- name: Install OpenMPI for gt4py
run: |
sudo apt-get install libopenmpi-dev
Expand Down
6 changes: 1 addition & 5 deletions Dockerfile
View file
Open in desktop

@oelbert oelbert Jun 13, 2024

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the change. We should probably update the python image in here from 3.8.3 to 3.11.7 as well

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8.13-bullseye@sha256:2a01d88a1684e6d7f08030cf5ae73b536926c64076cab197e9e3d9f699255283
FROM python:3.11.7-slim-bullseye@sha256:86cad05977011ea3c1b708e869057feb392eb99cb2b9f428d33bde6fe84c2288

RUN apt-get update && apt-get install -y make \
software-properties-common \
Expand All @@ -17,10 +17,6 @@ RUN apt-get update && apt-get install -y make \

RUN pip3 install --upgrade setuptools wheel

COPY constraints.txt /pace/constraints.txt

RUN pip3 install -r /pace/constraints.txt

COPY . /pace

RUN cd /pace && \
Expand Down
2 changes: 1 addition & 1 deletion NDSL
Open in desktop
Submodule NDSL updated 21 files
+6 −2 .github/workflows/unit_tests.yaml
+667 −0 examples/Fortran_serialization/01_serialize_fortran_data.ipynb
+240 −0 examples/Fortran_serialization/02_read_serialized_data_python.ipynb
+1,278 −0 examples/NDSL/01_gt4py_basics.ipynb
+492 −0 examples/NDSL/02_NDSL_basics.ipynb
+214 −0 examples/NDSL/03_orchestration_basics.ipynb
+73 −0 examples/NDSL/basic_boilerplate.py
+64 −0 examples/NDSL/orch_boilerplate.py
+1 −1 external/dace
+1 −1 external/gt4py
+109 −0 ndsl/boilerplate.py
+5 −4 ndsl/grid/geometry.py
+3 −2 ndsl/grid/helper.py
+6 −5 ndsl/initialization/allocator.py
+3 −4 ndsl/quantity.py
+137 −39 ndsl/stencils/testing/conftest.py
+165 −0 ndsl/stencils/testing/serialbox_to_netcdf.py
+3 −3 ndsl/stencils/testing/test_translate.py
+11 −0 setup.cfg
+7 −2 setup.py
+60 −0 tests/test_boilerplate.py
29 changes: 22 additions & 7 deletions constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ attrs==23.2.0
# aiohttp
# gt4py
# jsonschema
# pytest-subtests
# referencing
babel==2.9.1
# via sphinx
Expand All @@ -48,6 +49,7 @@ cfgv==3.3.1
# via pre-commit
cftime==1.6.3
# via
# -r requirements_dev.txt
# ndsl
# netcdf4
charset-normalizer==3.3.2
Expand Down Expand Up @@ -76,7 +78,9 @@ dacite==1.8.1
# fv3config
# pace
dask==2024.4.2
# via ndsl
# via
# -r requirements_dev.txt
# ndsl
debugpy==1.8.1
# via ipykernel
decorator==5.1.1
Expand Down Expand Up @@ -104,6 +108,7 @@ executing==2.0.1
# stack-data
f90nml==1.4.4
# via
# -r requirements_dev.txt
# fv3config
# ndsl
# pyfv3
Expand Down Expand Up @@ -221,6 +226,7 @@ matplotlib-inline==0.1.7
# ipython
mpi4py==3.1.5
# via
# -r requirements_dev.txt
# ndsl
# pace
mpmath==1.3.0
Expand All @@ -247,6 +253,7 @@ nest-asyncio==1.6.0
# nbclient
netcdf4==1.6.5
# via
# -r requirements_dev.txt
# ndsl
# pace
networkx==3.3
Expand All @@ -259,12 +266,14 @@ numcodecs==0.12.1
# via zarr
numpy==1.26.4
# via
# -r requirements_dev.txt
# cftime
# dace
# gt4py
# h5py
# netcdf4
# numcodecs
# pace
# pandas
# pyfv3
# pyshield
Expand Down Expand Up @@ -297,7 +306,7 @@ pathspec==0.12.1
# via black
pexpect==4.9.0
# via ipython
platformdirs==2.6.2
platformdirs==3.9.1
# via
# black
# jupyter-core
Expand Down Expand Up @@ -339,11 +348,13 @@ pygments==2.17.2
# sphinx
pytest==8.1.1
# via
# -r requirements_dev.txt
# nbmake
# pytest-cov
# pytest-datadir
# pytest-profiling
# pytest-regressions
# pytest-subtests
pytest-cov==5.0.0
# via -r requirements_dev.txt
pytest-datadir==1.5.0
Expand All @@ -352,6 +363,8 @@ pytest-profiling==1.7.0
# via -r requirements_dev.txt
pytest-regressions==2.5.0
# via -r requirements_dev.txt
pytest-subtests==0.12.1
# via -r requirements_dev.txt
python-dateutil==2.9.0.post0
# via
# faker
Expand Down Expand Up @@ -397,7 +410,9 @@ rsa==4.9
scikit-build==0.17.6
# via dace
scipy==1.13.0
# via ndsl
# via
# -r requirements_dev.txt
# ndsl
setuptools-scm==8.0.4
# via fparser
six==1.16.0
Expand Down Expand Up @@ -461,9 +476,7 @@ traitlets==5.14.3
# matplotlib-inline
# nbclient
# nbformat
types-pyyaml==6.0.12.20240311
# via pace
typing-extensions==4.5.0
typing-extensions==4.12.1
# via
# gt4py
# ipython
Expand All @@ -484,14 +497,16 @@ wheel==0.43.0
# scikit-build
xarray==2024.3.0
# via
# -r requirements_dev.txt
# ndsl
# pace
# pyfv3
# pyshield
xxhash==3.0.0
# via gt4py
yarl==1.9.4
# via aiohttp
zarr==2.17.2
zarr==2.18.2
# via
# -r requirements_dev.txt
# pace
Expand Down
2 changes: 1 addition & 1 deletion pyFV3
Open in desktop
Submodule pyFV3 updated 2 files
+2 −1 .pre-commit-config.yaml
+5 −1 pyFV3/stencils/dyn_core.py
2 changes: 1 addition & 1 deletion pySHiELD
Open in desktop
Submodule pySHiELD updated 5 files
+16 −2 .github/workflows/translate.yml
+2 −1 .pre-commit-config.yaml
+0 −6 pySHiELD/stencils/microphysics.py
+9 −0 tests/savepoint/translate/overrides/baroclinic.yaml
+18 −0 tests/savepoint/translate/overrides/standard.yaml
10 changes: 10 additions & 0 deletions requirements_dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
pytest
pytest-subtests
pytest-regressions
pytest-profiling
pytest-cov
scipy
nbmake
mpi4py
xarray
zarr
dask
netCDF4
cftime
fv3config
f90nml
numpy
-e NDSL
-e pySHiELD
-e pyFV3
Expand Down
4 changes: 3 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ def local_pkg(name: str, relative_path: str) -> str:


requirements: List[str] = [
"ndsl",
"dacite",
"pyyaml",
"mpi4py",
"numpy",
"netCDF4",
"xarray",
"zarr",
"types-pyyaml",
]


Expand Down