Skip to content

Commit

Permalink
Merge pull request #825 from cookiejar/release/1.3.11
Browse files Browse the repository at this point in the history
Release 1.3.11
  • Loading branch information
Imipenem committed Nov 21, 2021
2 parents eab90b8 + bebc866 commit eb7be6d
Show file tree
Hide file tree
Showing 24 changed files with 286 additions and 254 deletions.
2 changes: 1 addition & 1 deletion .cookietemple.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ language: python
project_slug: cookietemple
project_slug_no_hyphen: cookietemple
project_short_description: A cookiecutter based project template creation tool supporting several domains and languages with linting and template sync support.
version: 1.3.10
version: 1.3.11
license: Apache2.0
template_version: '2.0.0 # <<COOKIETEMPLE_NO_BUMP>>'
template_handle: cli-python
Expand Down
4 changes: 2 additions & 2 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name-template: "1.3.10 🌈" # <<COOKIETEMPLE_FORCE_BUMP>>
tag-template: 1.3.10 # <<COOKIETEMPLE_FORCE_BUMP>>
name-template: "1.3.11 🌈" # <<COOKIETEMPLE_FORCE_BUMP>>
tag-template: 1.3.11 # <<COOKIETEMPLE_FORCE_BUMP>>
exclude-labels:
- "skip-changelog"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
name: Check out source-code repository

- name: Setup Python
uses: actions/setup-python@v2.2.2
uses: actions/setup-python@v2.3.0
with:
python-version: ${{ matrix.python }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_no_SNAPSHOT_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Setup Python
uses: actions/setup-python@v2.2.2
uses: actions/setup-python@v2.3.0
with:
python-version: 3.8

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/create_cli_java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
name: Check out source-code repository

- name: Setup Python
uses: actions/setup-python@v2.2.2
uses: actions/setup-python@v2.3.0
with:
python-version: ${{ matrix.python }}

Expand All @@ -34,7 +34,7 @@ jobs:
run: make install

- uses: actions/checkout@v2
- uses: DeLaGuardo/setup-graalvm@a766aa7b5fcc0a801fa3d4fd521ca299c03c9c00
- uses: DeLaGuardo/setup-graalvm@48f2bf339ab7d35e31029b1822a213681fdfc42e
with:
graalvm-version: "20.1.0.java11"
- run: java -version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_cli_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
name: Check out source-code repository

- name: Setup Python
uses: actions/setup-python@v2.2.2
uses: actions/setup-python@v2.3.0
with:
python-version: ${{ matrix.python }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_gui_java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
name: Check out source-code repository

- name: Setup Python
uses: actions/setup-python@v2.2.2
uses: actions/setup-python@v2.3.0
with:
python-version: ${{ matrix.python }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_lib_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
name: Check out source-code repository

- name: Setup Python
uses: actions/setup-python@v2.2.2
uses: actions/setup-python@v2.3.0
with:
python-version: ${{ matrix.python }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_pub_thesis_latex.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
name: Check out source-code repository

- name: Setup Python
uses: actions/setup-python@v2.2.2
uses: actions/setup-python@v2.3.0
with:
python-version: ${{ matrix.python }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_web_python_flask.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
name: Check out source-code repository

- name: Setup Python
uses: actions/setup-python@v2.2.2
uses: actions/setup-python@v2.3.0
with:
python-version: ${{ matrix.python }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
name: Check out source-code repository

- name: Setup Python
uses: actions/setup-python@v2.2.2
uses: actions/setup-python@v2.3.0
with:
python-version: 3.9

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fetch-depth: 2

- name: Set up Python
uses: actions/setup-python@v2.2.2
uses: actions/setup-python@v2.3.0
with:
python-version: "3.9"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_cookietemple_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: Check out source-code repository

- name: Setup Python
uses: actions/setup-python@v2.2.2
uses: actions/setup-python@v2.3.0
with:
python-version: 3.9

Expand Down
30 changes: 14 additions & 16 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,23 +61,22 @@ jobs:
uses: actions/checkout@v2.3.4

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

- name: Install Poetry
run: |
pip install poetry
pipx install poetry
poetry --version
- name: Install Nox
- name: Install nox nox-poetry rich
run: |
pip install nox nox-poetry
pipx install nox
pipx inject nox nox-poetry
pipx inject nox rich
nox --version
- name: Install Rich
run: pip install rich

- name: Compute pre-commit cache key
if: matrix.session == 'pre-commit'
id: pre-commit-cache
Expand Down Expand Up @@ -127,23 +126,22 @@ jobs:
uses: actions/checkout@v2.3.4

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

- name: Install Poetry
run: |
pip install poetry
pipx install poetry
poetry --version
- name: Install Nox
- name: Install nox nox-poetry rich
run: |
pip install nox nox-poetry
pipx install nox
pipx inject nox nox-poetry
pipx inject nox rich
nox --version
- name: Install Rich
run: pip install rich

- name: Download coverage data
uses: actions/download-artifact@v2.0.10
with:
Expand All @@ -153,7 +151,7 @@ jobs:
run: nox --force-color --session=coverage

- name: Create coverage report
run: nox --force-color --session=coverage -- xml
run: nox --force-color --session=coverage -- xml -i

- name: Upload coverage report
uses: codecov/codecov-action@v2.0.2
uses: codecov/codecov-action@v2.1.0
2 changes: 1 addition & 1 deletion .github/workflows/sync_project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Setup Python
uses: actions/setup-python@v2.2.2
uses: actions/setup-python@v2.3.0
with:
python-version: 3.8

Expand Down
2 changes: 1 addition & 1 deletion cookietemple.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.3.10
current_version = 1.3.11

[bumpversion_files_whitelisted]
init_file = cookietemple/__init__.py
Expand Down
2 changes: 1 addition & 1 deletion cookietemple/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.3.10"
__version__ = "1.3.11"
2 changes: 1 addition & 1 deletion cookietemple/create/github_support.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def create_push_github_repository(
# git commit
log.debug("git commit")
cloned_repo.index.commit(
f"Created {creator_ctx.project_slug} with {creator_ctx.template_handle} "
f"Create {creator_ctx.project_slug} with {creator_ctx.template_handle} "
f'template of version {creator_ctx.template_version.replace("# <<COOKIETEMPLE_NO_BUMP>>", "")} using cookietemple.'
)

Expand Down
2 changes: 1 addition & 1 deletion cookietemple/create/templates/available_templates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cli:
python:
name: Python Commandline Package
handle: cli-python
version: 2.0.1
version: 2.0.2
available libraries: click
short description: General Python package with command line interface
long description: Best practice Python package with (optional) command line support (click).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,22 @@ jobs:
uses: actions/checkout@v2.3.4

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

- name: Install Poetry
run: |
pip install poetry
pipx install poetry
poetry --version
- name: Install Nox
- name: Install nox nox-poetry rich
run: |
pip install nox nox-poetry
pipx install nox
pipx inject nox nox-poetry
pipx inject nox rich
nox --version
- name: Install Rich
run: pip install rich

- name: Compute pre-commit cache key
if: matrix.session == 'pre-commit'
id: pre-commit-cache
Expand All @@ -108,8 +107,7 @@ jobs:
${{ steps.pre-commit-cache.outputs.result }}-
- name: Run Nox
run: |
nox --force-color --python=${{ matrix.python-version }}
run: nox --force-color --python=${{ matrix.python-version }}

- name: Upload coverage data
if: always() && matrix.session == 'tests'
Expand All @@ -120,7 +118,7 @@ jobs:

- name: Upload documentation
if: matrix.session == 'docs-build'
uses: actions/upload-artifact@v2.2.3
uses: actions/upload-artifact@v2.2.4
with:
name: docs
path: docs/_build
Expand All @@ -133,25 +131,24 @@ jobs:
uses: actions/checkout@v2.3.4

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

- name: Install Poetry
run: |
pip install poetry
pipx install poetry
poetry --version
- name: Install Nox
- name: Install nox nox-poetry rich
run: |
pip install nox nox-poetry
pipx install nox
pipx inject nox nox-poetry
pipx inject nox rich
nox --version
- name: Install Rich
run: pip install rich

- name: Download coverage data
uses: actions/download-artifact@v2.0.9
uses: actions/download-artifact@v2.0.10
with:
name: coverage-data

Expand All @@ -162,4 +159,4 @@ jobs:
run: nox --force-color --session=coverage -- xml -i

- name: Upload coverage report
uses: codecov/codecov-action@v1.5.2{% endraw %}
uses: codecov/codecov-action@v2.1.0{% endraw %}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ repos:
language: system
types: [text]
stages: [commit, push, manual]
exclude: docs/
- id: flake8
name: flake8
entry: flake8
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
copyright = u"2020, Lukas Heumos, Philipp Ehmele, the cookiejar organization"
author = u"Lukas Heumos, Philipp Ehmele, the cookiejar organization"

version = "1.3.10"
release = "1.3.10"
version = "1.3.11"
release = "1.3.11"

language = None

Expand Down
Loading

0 comments on commit eb7be6d

Please sign in to comment.