Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release Version '' into 'master' Branch #349

Merged
merged 10 commits into from
Mar 9, 2024
8 changes: 5 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:

env:
### STRESS TEST Job MATRIX ###
FULL_MATRIX_STRATEGY: "{\"platform\": [\"ubuntu-latest\", \"macos-latest\", \"windows-latest\"], \"python-version\": [\"3.7\", \"3.8\", \"3.9\", \"3.10\", \"3.11\"]}"
FULL_MATRIX_STRATEGY: "{\"platform\": [\"ubuntu-latest\", \"macos-latest\", \"windows-latest\"], \"python-version\": [\"3.7\", \"3.8\", \"3.9\", \"3.10\", \"3.12\"]}"
# Python 3.7 has reached End of Life (EOL) on June 27th, 2023
# Python 3.12 is in bugfix mode, same as 3.11 -> can start supporting 3.12 it
UBUNTU_PY310_STRATEGY: "{\"platform\": [\"ubuntu-latest\"], \"python-version\": [\"3.10\"]}"
Expand Down Expand Up @@ -104,10 +104,12 @@ jobs:

if [[ "$affected_components" =~ "Distro" ]]; then
echo "matrix=$TEST_STRATEGY" >> $GITHUB_OUTPUT
elif [[ "$affected_components" =~ "Docs" ]]; then
else
echo "matrix=$UBUNTU_PY310_STRATEGY" >> $GITHUB_OUTPUT
fi
if [[ "$affected_components" =~ "Docs" ]]; then
# set policy to 1 to trigger Docs Build (higher level override might be in place)
PIPE_DOCS_POLICY="${{ (env.DOCS_JOB_ON != 'true' && '0') || (env.ALWAYS_DOCS == 'true' && '1') || '1' }}"
echo "matrix=$UBUNTU_PY310_STRATEGY" >> $GITHUB_OUTPUT
fi

else
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@
Changelog
=========

2.2.0 (2024-03-10)
==================

Changes
^^^^^^^

ci
""
- enable Python 3.12 CI Builds


2.1.0 (2024-03-09)
==================

Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,9 @@ Free/Libre and Open Source Software (FLOSS)

.. Github Releases & Tags

.. |commits_since_specific_tag_on_master| image:: https://img.shields.io/github/commits-since/boromir674/cookiecutter-python-package/v2.1.0/master?color=blue&logo=github
.. |commits_since_specific_tag_on_master| image:: https://img.shields.io/github/commits-since/boromir674/cookiecutter-python-package/v2.2.0/master?color=blue&logo=github
:alt: GitHub commits since tagged version (branch)
:target: https://github.com/boromir674/cookiecutter-python-package/compare/v2.1.0..master
:target: https://github.com/boromir674/cookiecutter-python-package/compare/v2.2.0..master

.. |commits_since_latest_github_release| image:: https://img.shields.io/github/commits-since/boromir674/cookiecutter-python-package/latest?color=blue&logo=semver&sort=semver
:alt: GitHub commits since latest release (by SemVer)
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
author = 'Konstantinos Lampridis'

# The full version, including alpha/beta/rc tags
release = '2.1.0'
release = '2.2.0'

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

Expand Down
4 changes: 2 additions & 2 deletions docs/contents/35_development/gitops-v2-cheatsheet.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,5 @@ Clean Local with:
```shell
git tag -d board-request
git tag -d auto-prod
```
git checkout release && git rebase master
git checkout release && git rebase master
```
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ build-backend = "poetry.core.masonry.api"
## Also renders on pypi as 'subtitle'
[tool.poetry]
name = "cookiecutter_python"
version = "2.1.0"
version = "2.2.0"
description = "1-click Generator of Python Project, from Template with streamlined \"DevOps\" using a powerful CI/CD Pipeline."
authors = ["Konstantinos Lampridis <[email protected]>"]
maintainers = ["Konstantinos Lampridis <[email protected]>"]
Expand Down Expand Up @@ -39,11 +39,12 @@ classifiers = [
"Operating System :: POSIX :: Linux",
"Operating System :: MacOS",
"Programming Language :: Python",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Software Development",
"Topic :: Software Development :: Libraries :: Python Modules",
"Topic :: System :: Software Distribution",
Expand Down
2 changes: 1 addition & 1 deletion src/cookiecutter_python/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
__version__ = '2.1.0'
__version__ = '2.2.0'

from . import _logging # noqa
17 changes: 9 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
{py311, py310, py39, py38, py37}-{dev, sdist, wheel}-{linux, macos, windows}
{py312, py311, py310, py39, py38, py37}-{dev, sdist, wheel}-{linux, macos, windows}
coverage
isolated_build = true
skip_missing_interpreters = true
Expand All @@ -13,6 +13,7 @@ python =
3.9: {py39}{, -path, -sdist, -wheel, -dev}
3.10: {py310}{, -path, -sdist, -wheel, -dev}
3.11: {py311}{, -path, -sdist, -wheel, -dev}
3.12: {py312}{, -path, -sdist, -wheel, -dev}


[gh-actions:env]
Expand Down Expand Up @@ -66,7 +67,7 @@ commands =
{posargs:-n auto {toxinidir}{/}tests}

# PATH
[testenv:{py311, py310, py39, py38, py37, py36, pypy3}-path{, -linux, -macos, -windows}]
[testenv:{py312, py311, py310, py39, py38, py37, py36, pypy3}-path{, -linux, -macos, -windows}]
description = Add Source Code to Path & Test
setenv =
{[testenv]setenv}
Expand All @@ -78,7 +79,7 @@ commands =
{[testenv]commands}

# SDIST
[testenv:{py311-, py310-, py39-, py38-, py37-, py36-, pypy3-,}sdist{, -linux, -macos}]
[testenv:{py312-, py311-, py310-, py39-, py38-, py37-, py36-, pypy3-,}sdist{, -linux, -macos}]
description = Install as Source Distribution & Test
basepython = {env:TOXPYTHON:python3}

Expand All @@ -87,7 +88,7 @@ description = Install as Source Distribution & Test
basepython = {env:TOXPYTHON:python3}

# SDIST Windows special cases
[testenv:{py311-, py310-, py39-, py38-, pypy3-,}sdist-windows]
[testenv:{py312-, py311-, py310-, py39-, py38-, pypy3-,}sdist-windows]
description = Install as Source Distribution & Test
basepython = {env:TOXPYTHON:python3}
setenv =
Expand All @@ -103,7 +104,7 @@ commands_pre =
pip install --exists-action w --force-reinstall "{env:_WHEEL_DIR}{/}{env:_WHEEL}[test]"

# Build WHEEL via PIP
[testenv:{py311-, py310-, py39-, py38-, py37-, py36-, pypy3-,}wheel{, -linux, -macos, -windows}]
[testenv:{py312-, py311-, py310-, py39-, py38-, py37-, py36-, pypy3-,}wheel{, -linux, -macos, -windows}]
description = Build Wheel, via pip
basepython = {env:TOXPYTHON:python3}
setenv = {[wheel_env]setenv}
Expand All @@ -112,7 +113,7 @@ changedir = {toxinidir}
commands = pip wheel --wheel-dir {env:_WHEEL_DIR} {toxinidir}

# Install WHEEL and TEST
[testenv:{py311-, py310-, py39-, py38-, py37-, py36-, pypy3-,}wheel-test{, -linux, -macos}]
[testenv:{py312-, py311-, py310-, py39-, py38-, py37-, py36-, pypy3-,}wheel-test{, -linux, -macos}]
description = Install Wheel, and Test
basepython = {env:TOXPYTHON:python3}
setenv =
Expand All @@ -123,7 +124,7 @@ changedir = {toxinidir}
commands_pre = {[wheel_env]commands_pre}

# Install WHEEL and TEST - Special case on Windows
[testenv:{py311-, py310-, py39-, py38-, }wheel-test-windows]
[testenv:{py312-, py311-, py310-, py39-, py38-, }wheel-test-windows]
description = Install Wheel, and Test
basepython = {env:TOXPYTHON:python3}
setenv =
Expand All @@ -136,7 +137,7 @@ commands_pre = {[wheel_env]commands_pre}


## DEV on CI ##
[testenv:{py311, py310, py39, py38, py37, py36, pypy3}-dev{, -linux, -macos, -windows}]
[testenv:{py312, py311, py310, py39, py38, py37, py36, pypy3}-dev{, -linux, -macos, -windows}]
description = Install in 'edit' mode & Test
usedevelop = true

Expand Down
Loading