Skip to content

Commit

Permalink
Update version to 1.3.2; Fix syntax error in setup.py; update doc
Browse files Browse the repository at this point in the history
- Updated version numgers to 1.3.2 in several locations.
- Added clarifying text updates to docs/source/Release_guide.txt
- Updated CHANGELOG.md accordingly.
- Fixed an syntax error in setup.py (cartopy=0.19.0.post1 should be
  cartopy==0.19.0.post1 with double == signs). This was preventing
  packaging for PyPI and Conda-Forge.

Signed-off-by: Bob Yantosca <[email protected]>
  • Loading branch information
yantosca committed Oct 26, 2022
1 parent 475adb8 commit f8da728
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 10 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion benchmark/modules/run_1yr_fullchem_benchmark.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
"""

Expand Down
2 changes: 1 addition & 1 deletion benchmark/modules/run_1yr_tt_benchmark.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
"""

Expand Down
2 changes: 1 addition & 1 deletion benchmark/run_benchmark.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
"""

Expand Down
7 changes: 4 additions & 3 deletions docs/source/Release_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gcpy/_version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

__version__ = '1.3.1'
__version__ = '1.3.2'
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit f8da728

Please sign in to comment.