From b89cb7db4aa8a3d3d4582c7d861c75e675f528bf Mon Sep 17 00:00:00 2001 From: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> Date: Fri, 28 Jan 2022 15:53:09 -0500 Subject: [PATCH 1/4] update HISTORY.rst --- HISTORY.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index 32dfccd8a..1be8d01d3 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,12 +2,13 @@ History ======= -0.33.0 (unreleased) +0.33.0 (2022-01-28) ------------------- Contributors to this version: Trevor James Smith (:user:`Zeitsperre`), Pascal Bourgault (:user:`aulemahal`), Tom Keel (:user:`Thomasjkeel`), Jeremy Fyke (:user:`JeremyFyke`), David Huard (:user:`huard`), Abel Aoun (:user:`bzah`), Juliette Lavoie (:user:`juliettelavoie`). Announcements ^^^^^^^^^^^^^ +* Deprecation: Release 0.33.0 of `xclim` will be the last version to explicitly support Python3.7 and `xarray<0.21.0`. * `xclim` now requires yaml files to pass `yamllint` checks on Pull Requests. (:pull:`981`). * `xclim` now requires docstrings have valid ReStructuredText formatting to pass basic linting checks. (:pull:`993`). Checks generally require: - Working hyperlinks and reference tags. From 74139d0bdfaa96830f2ed9ebfc444535ad499434 Mon Sep 17 00:00:00 2001 From: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> Date: Fri, 28 Jan 2022 16:07:43 -0500 Subject: [PATCH 2/4] update docs, set environment.yml to have a base python version --- .github/CONTRIBUTING.rst | 8 ++++---- environment.yml | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/CONTRIBUTING.rst b/.github/CONTRIBUTING.rst index bc5d902e0..c5fd65cea 100644 --- a/.github/CONTRIBUTING.rst +++ b/.github/CONTRIBUTING.rst @@ -113,7 +113,7 @@ Ready to contribute? Here's how to set up `xclim` for local development. 3. Create a development environment. We recommend using ``conda``:: - $ conda create -n xclim python=3.7 --file=environment.yml + $ conda create -n xclim python=3.8 --file=environment.yml $ pip install -e .[dev] 4. Create a branch for local development:: @@ -131,8 +131,8 @@ Ready to contribute? Here's how to set up `xclim` for local development. Instead of ``pre-commit``, you could also verify your changes manually with `black`, `flake8`, `flake8-rst-docstrings`, `pydocstyle`, and `yamllint`:: - $ black --check --target-version py37 xclim xclim/testing/tests - $ black --check --target-version py37 --include "\.ipynb$" docs + $ black --check --target-version py38 xclim xclim/testing/tests + $ black --check --target-version py38 --include "\.ipynb$" docs $ flake8 xclim xclim/testing/tests $ pydocstyle --convention=numpy --match='(?!test_).*\.py' xclim $ yamllint --config-file .yamllint.yaml xclim @@ -186,7 +186,7 @@ Before you submit a pull request, please follow these guidelines: If you aren't accustomed to writing documentation in reStructuredText (`.rst`), we encourage you to spend a few minutes going over the incredibly well-summarized `reStructuredText Primer`_ from the sphinx-doc maintainer community. -5. The pull request should work for Python 3.7, 3.8, and 3.9 as well as raise test coverage. +5. The pull request should work for Python 3.8 and 3.9 as well as raise test coverage. Pull requests are also checked for documentation build status and for `PEP8`_ compliance. The build statuses and build errors for pull requests can be found at: diff --git a/environment.yml b/environment.yml index 8b7915fe8..044bf4765 100644 --- a/environment.yml +++ b/environment.yml @@ -3,6 +3,7 @@ channels: - conda-forge - defaults dependencies: + - python>=3.7 - boltons>=20.1 - bottleneck>=1.3.1,<1.4 - cf_xarray>=0.6.1 From 612e08c6b9363ba1266cec3e7541ea601bd05735 Mon Sep 17 00:00:00 2001 From: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> Date: Fri, 28 Jan 2022 16:11:38 -0500 Subject: [PATCH 3/4] =?UTF-8?q?Bump=20version:=200.32.4-beta=20=E2=86=92?= =?UTF-8?q?=200.33.0-beta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.cfg | 7 +++---- setup.py | 2 +- xclim/__init__.py | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/setup.cfg b/setup.cfg index 9f77aebbb..bdd9360b2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.32.4-beta +current_version = 0.33.0-beta commit = True tag = False parse = (?P\d+)\.(?P\d+).(?P\d+)(\-(?P[a-z]+))? @@ -44,7 +44,7 @@ ignore = W504 per-file-ignores = tests/*:E402 -rst-roles = +rst-roles = mod, py:attr, py:attribute, @@ -58,9 +58,8 @@ rst-roles = py:obj, py:ref, ref -extend-ignore = +extend-ignore = RST399, - ; TODO: The following ignores should be dealt with in the near-future RST201, RST203, RST301 diff --git a/setup.py b/setup.py index a35e32308..b386e1118 100755 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ AUTHOR = "Travis Logan" AUTHOR_EMAIL = "logan.travis@ouranos.ca" REQUIRES_PYTHON = ">=3.7.0" -VERSION = "0.32.4-beta" +VERSION = "0.33.0-beta" LICENSE = "Apache Software License 2.0" with open("README.rst") as readme_file: diff --git a/xclim/__init__.py b/xclim/__init__.py index a8a448b90..0a18e73f6 100644 --- a/xclim/__init__.py +++ b/xclim/__init__.py @@ -10,7 +10,7 @@ __author__ = """Travis Logan""" __email__ = "logan.travis@ouranos.ca" -__version__ = "0.32.4-beta" +__version__ = "0.33.0-beta" # Load official locales From a2c9c78bae52ffa146d0754a52b98b1dbe5883c8 Mon Sep 17 00:00:00 2001 From: Trevor James Smith <10819524+Zeitsperre@users.noreply.github.com> Date: Fri, 28 Jan 2022 16:11:49 -0500 Subject: [PATCH 4/4] =?UTF-8?q?Bump=20version:=200.33.0-beta=20=E2=86=92?= =?UTF-8?q?=200.33.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup.cfg | 2 +- setup.py | 2 +- xclim/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index bdd9360b2..3b428f482 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.33.0-beta +current_version = 0.33.0 commit = True tag = False parse = (?P\d+)\.(?P\d+).(?P\d+)(\-(?P[a-z]+))? diff --git a/setup.py b/setup.py index b386e1118..6a9570440 100755 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ AUTHOR = "Travis Logan" AUTHOR_EMAIL = "logan.travis@ouranos.ca" REQUIRES_PYTHON = ">=3.7.0" -VERSION = "0.33.0-beta" +VERSION = "0.33.0" LICENSE = "Apache Software License 2.0" with open("README.rst") as readme_file: diff --git a/xclim/__init__.py b/xclim/__init__.py index 0a18e73f6..1d47641e3 100644 --- a/xclim/__init__.py +++ b/xclim/__init__.py @@ -10,7 +10,7 @@ __author__ = """Travis Logan""" __email__ = "logan.travis@ouranos.ca" -__version__ = "0.33.0-beta" +__version__ = "0.33.0" # Load official locales