Skip to content

Commit

Permalink
Merge pull request #999 from Ouranosinc/prepare_v033
Browse files Browse the repository at this point in the history
Prepare version 0.33.0
  • Loading branch information
Zeitsperre authored Jan 28, 2022
2 parents 422a44c + 3292351 commit f29edd0
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 11 deletions.
8 changes: 4 additions & 4 deletions .github/CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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::
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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`), Yannick Rousseau (:user:`yrouranos`).

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.
Expand Down
1 change: 1 addition & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.32.4-beta
current_version = 0.33.0
commit = True
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+).(?P<patch>\d+)(\-(?P<release>[a-z]+))?
Expand Down Expand Up @@ -44,7 +44,7 @@ ignore =
W504
per-file-ignores =
tests/*:E402
rst-roles =
rst-roles =
mod,
py:attr,
py:attribute,
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
LICENSE = "Apache Software License 2.0"

with open("README.rst") as readme_file:
Expand Down
2 changes: 1 addition & 1 deletion xclim/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

__author__ = """Travis Logan"""
__email__ = "logan.travis@ouranos.ca"
__version__ = "0.32.4-beta"
__version__ = "0.33.0"


# Load official locales
Expand Down

0 comments on commit f29edd0

Please sign in to comment.