diff --git a/CHANGELOG.md b/CHANGELOG.md index ddac648c..4892ac97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,17 @@ All notable changes to GCPy will be documented in this file. -The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## Unreleased +## [1.3.2] -- 2022-10-25 + +### Changed +- Bug fix: Fixed malformed version declaration for cartopy (use `==` + instead of `=`) in setup.py. This was preventing upload to + conda-forge. + ## [1.3.1] -- 2022-10-25 ### Changed diff --git a/benchmark/modules/run_1yr_fullchem_benchmark.py b/benchmark/modules/run_1yr_fullchem_benchmark.py index 74e6c908..78586a47 100755 --- a/benchmark/modules/run_1yr_fullchem_benchmark.py +++ b/benchmark/modules/run_1yr_fullchem_benchmark.py @@ -47,7 +47,7 @@ https://github.com/ipython/ipython/issues/10627 -This script corresponds with GCPy 1.3.1. Edit this version ID if releasing +This script corresponds with GCPy 1.3.2. Edit this version ID if releasing a new version of GCPy. """ diff --git a/benchmark/modules/run_1yr_tt_benchmark.py b/benchmark/modules/run_1yr_tt_benchmark.py index 9a2d3409..87f4be79 100755 --- a/benchmark/modules/run_1yr_tt_benchmark.py +++ b/benchmark/modules/run_1yr_tt_benchmark.py @@ -46,7 +46,7 @@ https://github.com/ipython/ipython/issues/10627 -This script corresponds with GCPy 1.3.1. Edit this version ID if releasing +This script corresponds with GCPy 1.3.2. Edit this version ID if releasing a new version of GCPy. """ diff --git a/benchmark/run_benchmark.py b/benchmark/run_benchmark.py index d51245e1..7ed819b2 100755 --- a/benchmark/run_benchmark.py +++ b/benchmark/run_benchmark.py @@ -36,7 +36,7 @@ https://github.com/ipython/ipython/issues/10627 -This script corresponds with GCPy 1.3.1. Edit this version ID if releasing +This script corresponds with GCPy 1.3.2. Edit this version ID if releasing a new version of GCPy. """ diff --git a/docs/source/Release_guide.rst b/docs/source/Release_guide.rst index 8b428327..129861fe 100644 --- a/docs/source/Release_guide.rst +++ b/docs/source/Release_guide.rst @@ -15,7 +15,7 @@ versions of GCPy on Github, PyPi, and conda-forge. following locations: - :file:`setup.py` - - :file:`_version.py` + - :file:`gcpy/_version.py` - :file:`docs/source/conf.py` - :file:`benchmark/run_benchmark.py` - :file:`benchmark/modules/run_1yr_fullchem_benchmark.py` @@ -41,8 +41,9 @@ versions of GCPy on Github, PyPi, and conda-forge. .. code-block:: console - $ run python setup.py sdist bdist_wheel - $ run twine check dist/* + $ conda activate gcpy_env # or whatever your conda env is named + $ python setup.py sdist bdist_wheel + $ twine check dist/* $ run twine upload --repository-url https://test.pypi.org/legacy/ dist/* Enter your login credentials for :file:`test.pypi.org` as diff --git a/gcpy/_version.py b/gcpy/_version.py index b7af371c..09ca992f 100644 --- a/gcpy/_version.py +++ b/gcpy/_version.py @@ -1,2 +1,2 @@ -__version__ = '1.3.1' +__version__ = '1.3.2' diff --git a/setup.py b/setup.py index 834d4b8c..3c448591 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ MAJOR = 1 MINOR = 3 -MICRO = 0 +MICRO = 2 EXTRA = '' # for alpha (aN), beta (bN), rc (rcN) versions VERSION = "{}.{}.{}{}".format(MAJOR, MINOR, MICRO, EXTRA) @@ -90,7 +90,7 @@ def _write_version_file(): packages = find_packages(), include_package_data=True, install_requires=[ - "cartopy=0.19.0.post1", + "cartopy==0.19.0.post1", "dask==2021.7.1", "docutils==0.16", "esmf==8.1.1",