Skip to content

Commit

Permalink
Merge branch 'release-v1.2.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
fedejaure committed Apr 27, 2021
2 parents 60fac66 + 8dad2cc commit d1d3168
Show file tree
Hide file tree
Showing 15 changed files with 272 additions and 224 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
@@ -1,7 +1,7 @@
[bumpversion]
commit = True
tag = False
current_version = 1.2.2
current_version = 1.2.3

[bumpversion:file:pyproject.toml]
search = version = "{current_version}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v2.3.4

- name: Set up Python 3.6
uses: actions/setup-python@v2.2.1
uses: actions/setup-python@v2.2.2
with:
python-version: 3.6

Expand All @@ -36,7 +36,7 @@ jobs:
- uses: actions/checkout@v2.3.4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2.2.1
uses: actions/setup-python@v2.2.2
with:
python-version: ${{ matrix.python-version }}

Expand Down
22 changes: 11 additions & 11 deletions .pre-commit-config.yaml
Expand Up @@ -13,7 +13,7 @@ repos:
exclude: "^{{cookiecutter.project_name}}/"
- id: end-of-file-fixer
- repo: https://github.com/timothycrosley/isort
rev: 5.7.0
rev: 5.8.0
hooks:
- id: isort
exclude: "^{{cookiecutter.project_name}}/"
Expand All @@ -33,15 +33,15 @@ repos:
types: [python]
require_serial: true
additional_dependencies: [
'flake8>=3.8.4',
'flakehell>=0.9.0',
'flake8-builtins>=1.5.3',
'flake8-blind-except>=0.2.0',
'flake8-logging-format>=0.6.0',
'flake8-bugbear>=21.3.2',
'flake8-annotations>=2.6.1',
'flake8-docstrings>=1.6.0',
'flake8-bandit>=2.1.2',
'darglint>=1.7.0'
'flake8~=3.9.1',
'flakehell~=0.9.0',
'flake8-builtins~=1.5.3',
'flake8-blind-except~=0.2.0',
'flake8-logging-format~=0.6.0',
'flake8-bugbear~=21.4.3',
'flake8-annotations~=2.6.2',
'flake8-docstrings~=1.6.0',
'flake8-bandit~=2.1.2',
'darglint~=1.8.0'
]
exclude: "^{{cookiecutter.project_name}}/"
20 changes: 19 additions & 1 deletion CHANGELOG.md
Expand Up @@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.2.3] - 2021-04-27
### Changed
- sphinx from `3.5.2` to `3.5.4`.
- flake8 from `3.8.4` to `3.9.1`.
- isort from `5.7.0` to `5.8.0`.
- flake8-bugbear from `21.3.2` to `21.4.3`.
- flake8-annotations from `2.6.1` to `2.6.2`.
- darglint from `1.7.0` to `1.8.0`.
- pytest from `6.2.2` to `6.2.3`.
- watchdog from `^2.0.2` to `^2.0.3`.
- pre-commit from `^2.11.1` to `^2.12.1`.
- actions/setup-python from `v2.2.1` to `v2.2.2`.
- pre-commit flakehell additional_dependencies versions config.

### Fixed
- flakehell config for flake8 >= 3.9.1.

## [1.2.2] - 2021-03-19
### Changed
- xdoctest from `0.15.2` to `0.15.4`.
Expand Down Expand Up @@ -187,7 +204,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- First release.


[Unreleased]: https://github.com/fedejaure/cookiecutter-modern-pypackage/compare/v1.2.2...develop
[Unreleased]: https://github.com/fedejaure/cookiecutter-modern-pypackage/compare/v1.2.3...develop
[1.2.3]: https://github.com/fedejaure/cookiecutter-modern-pypackage/compare/v1.2.2...v1.2.3
[1.2.2]: https://github.com/fedejaure/cookiecutter-modern-pypackage/compare/v1.2.1...v1.2.2
[1.2.1]: https://github.com/fedejaure/cookiecutter-modern-pypackage/compare/v1.2.0...v1.2.1
[1.2.0]: https://github.com/fedejaure/cookiecutter-modern-pypackage/compare/v1.1.3...v1.2.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -45,7 +45,7 @@ pip install -U cookiecutter
Generate a Python package project:

```
cookiecutter gh:fedejaure/cookiecutter-modern-pypackage --checkout v1.2.2
cookiecutter gh:fedejaure/cookiecutter-modern-pypackage --checkout v1.2.3
```

Then:
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Expand Up @@ -17,9 +17,9 @@
# built documents.
#
# The short X.Y version.
version = "1.2.2"
version = "1.2.3"
# The full version, including alpha/beta/rc tags.
release = "1.2.2"
release = "1.2.3"

# -- General configuration ---------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
@@ -1,2 +1,2 @@
sphinx==3.5.2
sphinx==3.5.4
recommonmark==0.7.1
2 changes: 1 addition & 1 deletion docs/tutorial.rst
Expand Up @@ -35,7 +35,7 @@ Use cookiecutter, pointing it at the cookiecutter-pypackage repo:

.. code-block:: bash
$ cookiecutter gh:fedejaure/cookiecutter-modern-pypackage --checkout v1.2.2
$ cookiecutter gh:fedejaure/cookiecutter-modern-pypackage --checkout v1.2.3
You'll be asked to enter a bunch of values to set the package up.
If you don't know what to enter, stick with the defaults.
Expand Down

0 comments on commit d1d3168

Please sign in to comment.