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

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

Merged
merged 15 commits into from
Jul 8, 2024

Conversation

fmalatino
Copy link
Contributor

@fmalatino fmalatino commented Jun 4, 2024

Description
The pytest-subtests package was added to requirements to enable full testing suite.
The python version in github workflows was rolled back to 3.11.7 to match environments in submodules.
The submodules, NDSL, pyFV3, and pySHiELD are also brought to the latest commits in their respective develop branches

How Has This Been Tested?
Tested via current test suite

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules
  • New check tests, if applicable, are included

@fmalatino fmalatino requested review from oelbert, xyuan, bensonr and mlee03 June 4, 2024 16:05
@bensonr
Copy link
Contributor

bensonr commented Jun 4, 2024

@fmalatino - before formally reviewing, wanted to make sure the submodule changes for NDSL, pyFV3, and pySHiELD is expected as part of the rollback to Python 3.11.7

@fmalatino
Copy link
Contributor Author

@bensonr I figured I would bring the develop branch up to date with the current versions of the submodules at the same time. I will ammend the initial comment as well.

@fmalatino fmalatino changed the title Addition of pytest-subtests to requirements and python workflow using 3.11.7 Matching packages between main and develop branches and removal of outdated pull request template Jun 13, 2024
Copy link
Contributor

@oelbert oelbert left a comment

Choose a reason for hiding this comment

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

Looks like you'll have to update any calls to constraints.txt now that it's been split into constraints_38 and constaints_311, though it's probably better to just bump the python version to 3.11 and keep one constraint file. If we want to keep support for python 3.8 it's probably better to use environment markers I think?

Also while we're updating the install environment can we delete lines 20-23 from pace/Dockerfile? It seems redundant with lines 24-27

@fmalatino
Copy link
Contributor Author

Looks like you'll have to update any calls to constraints.txt now that it's been split into constraints_38 and constaints_311, though it's probably better to just bump the python version to 3.11 and keep one constraint file. If we want to keep support for python 3.8 it's probably better to use environment markers I think?

Also while we're updating the install environment can we delete lines 20-23 from pace/Dockerfile? It seems redundant with lines 24-27

My vote is that we just move to support for 3.11.7. Can do with the lines in the Dockerfile; will be in next push.

@fmalatino fmalatino requested a review from oelbert June 13, 2024 15:35
Copy link
Contributor

@oelbert oelbert left a comment

Choose a reason for hiding this comment

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

Great thanks. One more change I think and we should be ok

Dockerfile Outdated
Copy link
Contributor

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

@fmalatino fmalatino requested a review from oelbert June 13, 2024 20:17
Copy link
Contributor

@oelbert oelbert left a comment

Choose a reason for hiding this comment

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

Have you successfully built the container and run a notebook in it?

@fmalatino fmalatino marked this pull request as draft June 27, 2024 18:06
Makefile Outdated Show resolved Hide resolved
constraints.txt Outdated Show resolved Hide resolved
@fmalatino fmalatino marked this pull request as ready for review July 1, 2024 18:58
@fmalatino fmalatino requested review from oelbert and mlee03 July 3, 2024 14:23
Copy link
Contributor

@oelbert oelbert left a comment

Choose a reason for hiding this comment

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

👍 👍 👍 👍 👍

@@ -1,6 +1,6 @@
stencil_config:
compilation_config:
backend: numpy
backend: dace:cpu
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need both numpy and dace:cpu here? Or do we have other tests for numpy that provide adequate coverage?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry this was a relic from the testing the orchestration issues. Will keep it at numpy only

@fmalatino fmalatino requested a review from bensonr July 8, 2024 19:01
@fmalatino fmalatino merged commit e7f5a48 into NOAA-GFDL:develop Jul 8, 2024
2 checks passed
@fmalatino fmalatino deleted the fix/python_ver_tests branch August 22, 2024 02:23
fmalatino added a commit that referenced this pull request Jan 6, 2025
* working baroclinic test case example (#81)

* fixing dockerfile overriding netcdf, mpi4py, and numpy versions with mutually incompatible versions (#84)

* Update notebooks for eta file creations  (#85)

* Update pace to use python 3.11.9 (#82)

* Updated container for Github Action and reusable workflow (#87)

* Updated container for Github Action and reusable workflow - Redo (#89)

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

* Changed workflows to use python 3.11.7, added pytest-subtests to requirments_dev.txt

* Updating constraints file

* Updating Dockerfile to use 3.11-slim-bookworm base python image

* reusable workflow CI - checkout corrrect repository (#90)

* pace/tests/main/grid/test_eta.py moved to NDSL/tests/grid/test_eta.py (#92)

* Updated README to include directions for generating eta files (#99)

* Updated submodules to most recent versions as of 3 Jan 2025 15:35 EST

* Updated c5 build script to match new methods

---------

Co-authored-by: Oliver Elbert <[email protected]>
Co-authored-by: MiKyung Lee <[email protected]>
Co-authored-by: mlee03 <[email protected]>
Co-authored-by: Xingqiu Yuan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants