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.

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

ESMPy pip install and test update #58

Merged
merged 47 commits into from
Sep 15, 2022
Merged

ESMPy pip install and test update #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
46f666e
remove setup.py in favor of setup.cfg and pyproject.toml
rokuingh Jun 26, 2022
9c6ea60
remove setup.py in favor of setup.cfg and pyproject.toml
rokuingh Jun 26, 2022
d21f9b2
Merge branch 'develop' into esmpy-feature-pip
rokuingh Jul 8, 2022
89566ee
fix pip build for ESMPy on Cheyenne
rokuingh Jul 8, 2022
12fcb3f
modify doc to reflect pip installation process
rokuingh Jul 21, 2022
1bd8b61
temporarily remove slow tests and add unittest.expected_failure tags
rokuingh Jul 21, 2022
a15fd28
Merge branch 'develop' into esmpy-feature-pip
rokuingh Aug 19, 2022
88bff8a
reactivate setup.py for ESMPy testing up through Python 3.9
rokuingh Aug 19, 2022
8c9a3e7
Convert ESMPy testing from nose to pytest
rokuingh Aug 22, 2022
aead97d
Cheyenne adjustments
rokuingh Aug 22, 2022
84cf0c1
remove more unittest usage
rokuingh Aug 22, 2022
0559104
add pytest import to test_cbindings
rokuingh Aug 22, 2022
31e0ccf
use unittest.SkipTest, cleanup some warnings, more adjustments to mak…
rokuingh Aug 22, 2022
512b56a
update ESMPy docs with pytest commands
rokuingh Aug 23, 2022
d808ee9
remove the old esmfmkfile.py strategy from ESMPy
rokuingh Aug 24, 2022
f82e1dd
remove --user from ESMPy pip install target
rokuingh Aug 24, 2022
8e1b807
add || : to allow clean target of ESMPy to continue if files labeled …
rokuingh Aug 24, 2022
a5b56eb
add proper versions to ESMPy from git tags, and other metadata from s…
rokuingh Aug 26, 2022
6b25561
remove setup.py
rokuingh Aug 26, 2022
4cb82f5
use importlib from Python 3.8 onward, pkg_resources before
rokuingh Aug 26, 2022
692b6da
enable pyproject.toml and remove setup.cfg, add starting_version to g…
rokuingh Aug 29, 2022
277ef66
change module name ESMF to esmpy
rokuingh Aug 30, 2022
b7c4e78
fix esmpy regrid from file test runner
rokuingh Aug 30, 2022
1d65e88
improve esmpy test targets
rokuingh Aug 30, 2022
95bea1f
convert ESMPy regrid from file testing to use pytest
rokuingh Aug 30, 2022
638b5e9
fix the ESMPy cubed sphere example
rokuingh Aug 30, 2022
505b6a7
remove beta decorator from ESMPy GridCreateCubedSphere
rokuingh Sep 1, 2022
7a78966
use pytest markers throughout ESMPy for NetCDF, PIO and MPI support
rokuingh Sep 7, 2022
a185290
add pytest-json-report, cleap up pytest markers for netcdf and pio de…
rokuingh Sep 7, 2022
f1b50dd
remove old.setup.cfg
rokuingh Sep 7, 2022
4bf9050
ESMPy test script and targets for Cheyenne
rokuingh Sep 7, 2022
830bda6
rename ESMPy example and regrid_from_file test files, add dryrun targ…
rokuingh Sep 7, 2022
4653380
remove deprecated decorator from ESMP_FieldSMMStore
rokuingh Sep 8, 2022
e89e1c4
fix clean and dust targets of ESMPy Makefile
rokuingh Sep 8, 2022
7624b3c
add a version check for ESMPy and ESMF installations
rokuingh Sep 8, 2022
458d4a3
move test_all.bash to src/esmpy/test
rokuingh Sep 8, 2022
0e17ea8
fix esmpy skipif marker for inmemory factors with compilers other tha…
rokuingh Sep 8, 2022
8a52bc1
remove platform specific info from ESMPy test script
rokuingh Sep 8, 2022
9336e59
remove old ESMPy test file
rokuingh Sep 8, 2022
1f2363e
add ESMPy Manager to TestBase
rokuingh Sep 8, 2022
cc821ab
add file to test pytest functionality in question
rokuingh Sep 8, 2022
94489e2
better pytest names
rokuingh Sep 8, 2022
2aa5d4d
add a missing esmpy symbol
rokuingh Sep 9, 2022
1d6d934
change esmpy dryrun target to download
rokuingh Sep 10, 2022
074e4bf
remove pytest that require pytest-mpi
rokuingh Sep 10, 2022
2626e00
add optional dataurl command line argument to esmpy data download scr…
rokuingh Sep 10, 2022
08f639d
change dryrun to download in esmpy file names_
rokuingh Sep 12, 2022
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
18 changes: 4 additions & 14 deletions src/addon/ESMPy/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
###################
*.pyc

# Nose #
########
*.noseids
nosetests.xml

# Misc #
########
*~
Expand All @@ -19,21 +14,16 @@ PET*
*.vtk
*.csv

# Eclipse #
###########
*.project
*.pydevproject
*.settings

# ESMPy build and docs #
########################
build
dist
doc/esmpy_doc
src/ESMF/interface/esmfmkfile.py
src/ESMPy.egg-info
examples/data
src/ESMF/test/data
src/esmpy/test/data
examples/notebooks/ESMPy-data
src/ESMF/test/regrid_from_file/data
src/esmpy/test/regrid_from_file/data

# notebooks #
#############
Expand Down
63 changes: 63 additions & 0 deletions src/addon/ESMPy/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
.PHONY: clean install test test_int test_all uninstall

clean:
rm -rf build || :
rm -rf dist || :
find . -name "*.egg-info" -exec rm -rf {} \; || :
find . -name "*.pyc" -exec rm -f {} \; || :
find . -name "*.log" -exec rm -f {} \; || :
find . -name "*.vtk" -exec rm -f {} \; || :
find . -name "*.pytest_cache" -exec rm -rf {} \; || :
find . -name "*.python-version" -exec rm -f {} \; || :
find . -name "*__pycache__" -exec rm -rf {} \; || :
find . -name "*ESMF_LogFile*" -exec rm -f {} \; || :
find . -name "*.report.json" -exec rm -rf {} \; || :
find . -name "*.test" -exec rm -rf {} \; || :
rm -rf src/esmpy/test/regrid_from_file/data || :
rm -rf examples/data || :

dust:
find . -name "*ESMF_LogFile*" -exec rm -f {} \; || :
find . -name "*.report.json" -exec rm -rf {} \; || :
find . -name "*.test" -exec rm -rf {} \; || :

install:
python3 -m pip install .

download_examples:
python3 examples/test_examples_download.py

download_regrid_from_file:
python3 src/esmpy/test/regrid_from_file/test_regrid_from_file_download.py

download: download_examples download_regrid_from_file

test:
bash src/esmpy/test/test_all.bash

test_unit:
python3 -m pytest -vs

test_unit_parallel:
mpiexec -n 4 python3 -vs

test_examples:
python3 -m pytest -vs examples/test_examples.py

test_examples_parallel:
mpiexec -n 4 python3 -m pytest -vs examples/test_examples.py

test_regrid_from_file:
python3 -m pytest -vs src/esmpy/test/regrid_from_file/test_regrid_from_file.py

test_regrid_from_file_parallel:
mpiexec -n 4 python3 -m pytest -vs src/esmpy/test/regrid_from_file/test_regrid_from_file.py

test_serial: test_unit test_examples test_regrid_from_file

test_parallel: test_unit_parallel test_examples_parallel test_regrid_from_file_parallel

test_all: test_unit test_unit_parallel test_examples test_examples_parallel test_regrid_from_file test_regrid_from_file_parallel

uninstall:
python3 -m pip uninstall ESMPy
2 changes: 1 addition & 1 deletion src/addon/ESMPy/doc/CoordSys.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
CoordSys
~~~~~~~~

.. autoclass:: ESMF.api.constants.CoordSys
.. autoclass:: esmpy.api.constants.CoordSys
:members:
:exclude-members: __new__
2 changes: 1 addition & 1 deletion src/addon/ESMPy/doc/ExtrapMethod.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
ExtrapMethod
~~~~~~~~~~~~

.. autoclass:: ESMF.api.constants.ExtrapMethod
.. autoclass:: esmpy.api.constants.ExtrapMethod
:members:
:exclude-members: __new__
2 changes: 1 addition & 1 deletion src/addon/ESMPy/doc/FileFormat.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
FileFormat
~~~~~~~~~~

.. autoclass:: ESMF.api.constants.FileFormat
.. autoclass:: esmpy.api.constants.FileFormat
:members:
:exclude-members: __new__
2 changes: 1 addition & 1 deletion src/addon/ESMPy/doc/FileMode.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
FileMode
~~~~~~~~

.. autoclass:: ESMF.api.constants.FileMode
.. autoclass:: esmpy.api.constants.FileMode
:members:
:exclude-members: __new__
2 changes: 1 addition & 1 deletion src/addon/ESMPy/doc/GridItem.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
GridItem
~~~~~~~~

.. autoclass:: ESMF.api.constants.GridItem
.. autoclass:: esmpy.api.constants.GridItem
:members:
:exclude-members: __new__
2 changes: 1 addition & 1 deletion src/addon/ESMPy/doc/LineType.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
LineType
~~~~~~~~

.. autoclass:: ESMF.api.constants.LineType
.. autoclass:: esmpy.api.constants.LineType
:members:
:exclude-members: __new__
2 changes: 1 addition & 1 deletion src/addon/ESMPy/doc/LogKind.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
LogKind
~~~~~~~

.. autoclass:: ESMF.api.constants.LogKind
.. autoclass:: esmpy.api.constants.LogKind
:members:
:exclude-members: __new__
2 changes: 1 addition & 1 deletion src/addon/ESMPy/doc/MeshElemType.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
MeshElemType
~~~~~~~~~~~~

.. autoclass:: ESMF.api.constants.MeshElemType
.. autoclass:: esmpy.api.constants.MeshElemType
:members:
:exclude-members: __new__
2 changes: 1 addition & 1 deletion src/addon/ESMPy/doc/MeshLoc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
MeshLoc
~~~~~~~

.. autoclass:: ESMF.api.constants.MeshLoc
.. autoclass:: esmpy.api.constants.MeshLoc
:members:
:exclude-members: __new__
2 changes: 1 addition & 1 deletion src/addon/ESMPy/doc/NormType.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
NormType
~~~~~~~~

.. autoclass:: ESMF.api.constants.NormType
.. autoclass:: esmpy.api.constants.NormType
:members:
:exclude-members: __new__
2 changes: 1 addition & 1 deletion src/addon/ESMPy/doc/PoleKind.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
PoleKind
~~~~~~~~

.. autoclass:: ESMF.api.constants.PoleKind
.. autoclass:: esmpy.api.constants.PoleKind
:members:
:exclude-members: __new__
2 changes: 1 addition & 1 deletion src/addon/ESMPy/doc/PoleMethod.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
PoleMethod
~~~~~~~~~~

.. autoclass:: ESMF.api.constants.PoleMethod
.. autoclass:: esmpy.api.constants.PoleMethod
:members:
:exclude-members: __new__
2 changes: 1 addition & 1 deletion src/addon/ESMPy/doc/Region.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
Region
~~~~~~

.. autoclass:: ESMF.api.constants.Region
.. autoclass:: esmpy.api.constants.Region
:members:
:exclude-members: __new__
2 changes: 1 addition & 1 deletion src/addon/ESMPy/doc/RegridMethod.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
RegridMethod
~~~~~~~~~~~~

.. autoclass:: ESMF.api.constants.RegridMethod
.. autoclass:: esmpy.api.constants.RegridMethod
:members:
:exclude-members: __new__
2 changes: 1 addition & 1 deletion src/addon/ESMPy/doc/StaggerLoc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
StaggerLoc
~~~~~~~~~~

.. autoclass:: ESMF.api.constants.StaggerLoc
.. autoclass:: esmpy.api.constants.StaggerLoc
:members:
:exclude-members: __new__
2 changes: 1 addition & 1 deletion src/addon/ESMPy/doc/TypeKind.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
TypeKind
~~~~~~~~

.. autoclass:: ESMF.api.constants.TypeKind
.. autoclass:: esmpy.api.constants.TypeKind
:members:
:exclude-members: __new__
2 changes: 1 addition & 1 deletion src/addon/ESMPy/doc/UnmappedAction.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
UnmappedAction
~~~~~~~~~~~~~~

.. autoclass:: ESMF.api.constants.UnmappedAction
.. autoclass:: esmpy.api.constants.UnmappedAction
:members:
:exclude-members: __new__
Loading