diff --git a/HISTORY.md b/HISTORY.md index 2d511c40c..bb53d7e1d 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -4,9 +4,14 @@ History latest ------ + +v0.5.0 (2020-05-15) +------ + Breaking changes: - fixed a bug where atmosphere hybrid coordinates were incorrectly marked as cell center variables, and were missing one point - `send_buffer` and `recv_buffer` are modified to take in a `callable`, which is more easily serialized than a `numpy`-like module (necessary because we serialize the arguments to re-use buffers), and allows custom specification of the initialization if zeros are needed instead of empty. +- use remote data for restart conditions Major changes: - Added getters and setters for additional dynamics quantities needed to call an alternative dynamical core @@ -18,6 +23,8 @@ Minor changes: - Internally, get_state uses the new QuantityFactory class to initialize quantities - fixed bug in fv3util setup.py which prevented `python setup.py install` from copying submodules - fixed bug in dockerfile where gs://vcm-fv3config data was downloaded to incorrect location +- New hpc dockerfiles +- aquaplanet configuration Deprecations: - `Quantity.values` is deprecated diff --git a/external/fv3util b/external/fv3util index 05c8cc693..ee583efe8 160000 --- a/external/fv3util +++ b/external/fv3util @@ -1 +1 @@ -Subproject commit 05c8cc6936026d89d5ed7c00ba1895d081bd0c6b +Subproject commit ee583efe871a08085761704e81680000886b75e8 diff --git a/fv3gfs/__init__.py b/fv3gfs/__init__.py index 9ec77b08f..604a0224a 100644 --- a/fv3gfs/__init__.py +++ b/fv3gfs/__init__.py @@ -47,4 +47,4 @@ GridSizer, ) -__version__ = "0.4.3" +__version__ = "0.5.0" diff --git a/lib/external b/lib/external index 48a75438c..02892aec9 160000 --- a/lib/external +++ b/lib/external @@ -1 +1 @@ -Subproject commit 48a75438cba4e4d5c8bf65d8ff1592c62a6bddeb +Subproject commit 02892aec9c67cab5165a6f5aefc4a18c40b35d69 diff --git a/setup.cfg b/setup.cfg index 5c45ba11b..01b2dc386 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.4.3 +current_version = 0.5.0 commit = True tag = False @@ -11,14 +11,6 @@ replace = PACKAGE_VERSION = "{new_version}" search = __version__ = "{current_version}" replace = __version__ = "{new_version}" -[bumpversion:file:external/fv3util/fv3util/__init__.py] -search = __version__ = "{current_version}" -replace = __version__ = "{new_version}" - -[bumpversion:file:external/fv3util/setup.py] -search = version="{current_version}" -replace = version="{new_version}" - [bdist_wheel] universal = 1 diff --git a/setup.py b/setup.py index 41f505605..527902f61 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ # This line only needed if building with NumPy in Cython file. from numpy import get_include -PACKAGE_VERSION = "0.4.3" +PACKAGE_VERSION = "0.5.0" fv3gfs_build_path_environ_name = "FV3GFS_BUILD_DIR" make_command = os.environ.get("MAKE", "make") @@ -69,7 +69,7 @@ class BuildDirectoryError(Exception): "xarray>=0.13.0", "netCDF4>=1.4.2", "numpy", - f"fv3util=={PACKAGE_VERSION}", + f"fv3util>=0.5.1", ] setup_requirements = ["cython", "numpy", "jinja2"] diff --git a/test_docker.sh b/test_docker.sh index dd405da6d..6590a8ae4 100755 --- a/test_docker.sh +++ b/test_docker.sh @@ -12,16 +12,10 @@ pytest ./tests/image_tests/*.py if [[ "GOOGLE_APPLICATION_CREDENTIALS" == "" ]] then - docker run -it $DOCKER_IMAGE bash -c "mpirun --oversubscribe -n 6 pytest /fv3gfs-python/external/fv3util/tests/test_mpi_mock.py" - docker run -it $DOCKER_IMAGE bash -c "make -C /fv3gfs-python/external/fv3util test test_mpi" docker run -it $DOCKER_IMAGE bash -c "cd /fv3gfs-python; make test" docker run -it $DOCKER_IMAGE bash -c "pytest /fv3gfs-python/external/fv3config/tests" else - docker run -it $DOCKER_IMAGE bash -c "mpirun --allow-run-as-root --oversubscribe -n 6 pytest /fv3gfs-python/external/fv3util/tests/mpi" # needed for circleci tests on machine executor, even though we're accessing public data only - docker run -v $GOOGLE_APPLICATION_CREDENTIALS:$GOOGLE_APPLICATION_CREDENTIALS \ - --env GOOGLE_APPLICATION_CREDENTIALS=$GOOGLE_APPLICATION_CREDENTIALS \ - -it $DOCKER_IMAGE bash -c "make -C /fv3gfs-python/external/fv3util test test_mpi" docker run -v $GOOGLE_APPLICATION_CREDENTIALS:$GOOGLE_APPLICATION_CREDENTIALS \ --env GOOGLE_APPLICATION_CREDENTIALS=$GOOGLE_APPLICATION_CREDENTIALS \ -it $DOCKER_IMAGE bash -c "cd /fv3gfs-python; make test"