Skip to content

Commit

Permalink
Merge pull request #627 from cookiejar/release/1.3.0
Browse files Browse the repository at this point in the history
Release 1.3.0
  • Loading branch information
Imipenem authored Apr 10, 2021
2 parents f7d43f6 + 5939710 commit 06c6350
Show file tree
Hide file tree
Showing 113 changed files with 3,173 additions and 1,461 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.2.4
version: 1.3.0
license: Apache2.0
template_version: '1.1.0 # <<COOKIETEMPLE_NO_BUMP>>'
template_handle: cli-python
Expand Down
53 changes: 53 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
version: 2
updates:
# cookietemple itself
- package-ecosystem: pip
directory: "/"
schedule:
Expand All @@ -23,3 +24,55 @@ updates:
- dependabot
commit-message:
prefix: "[DEPENDABOT]"

# Templates
# CLI
- package-ecosystem: pip
directory: "/cookietemple/create/templates/cli/cli_python/{{ cookiecutter.project_slug_no_hyphen }}"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 99
target-branch: development
labels:
- dependabot
commit-message:
prefix: "[DEPENDABOT]"

- package-ecosystem: java:gradle
directory: "/cookietemple/create/templates/cli/cli_java/{{ cookiecutter.project_slug_no_hyphen }}"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 99
target-branch: development
labels:
- dependabot
commit-message:
prefix: "[DEPENDABOT]"

# GUI
- package-ecosystem: java:maven
directory: "/cookietemple/create/templates/gui/gui_java/{{ cookiecutter.project_slug_no_hyphen }}"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 99
target-branch: development
labels:
- dependabot
commit-message:
prefix: "[DEPENDABOT]"

# WEB
- package-ecosystem: pip
directory: "/cookietemple/create/templates/web/website_python/flask/{{ cookiecutter.project_slug_no_hyphen }}"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 99
target-branch: development
labels:
- dependabot
commit-message:
prefix: "[DEPENDABOT]"
2 changes: 1 addition & 1 deletion .github/workflows/build_package.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.1.4
uses: actions/setup-python@v2.2.1
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.1.4
uses: actions/setup-python@v2.2.1
with:
python-version: 3.8

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

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

Expand All @@ -38,7 +38,7 @@ jobs:
echo -e "\n\033[B\nHomer\nhomer.simpson@hotmail.com\nhomergithub\nnExplodingSpringfield\ndescription\n1.0.0\n\ngroup_domain\ngroup_organization\nn" | cookietemple create
- uses: actions/checkout@v2
- uses: DeLaGuardo/setup-graalvm@8bbfe44ef9c6f5c07e5af036a1bffd561c037d18
- uses: DeLaGuardo/setup-graalvm@b990167df27a6253bcd645d6b0eed91d4c795b38
with:
graalvm-version: '20.1.0.java11'
- run: java -version
Expand All @@ -47,7 +47,7 @@ jobs:
- name: Build with Gradle
run: |
cd ..
cd ExplodingSpringfield
cd explodingspringfield
make binary
- name: Install doc dependencies
Expand Down
24 changes: 17 additions & 7 deletions .github/workflows/create_cli_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ jobs:
if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')"
strategy:
matrix:
python: [3.7, 3.8]
python: [3.8, 3.9]

steps:
- uses: actions/checkout@v2
name: Check out source-code repository

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

Expand All @@ -34,18 +34,28 @@ jobs:
- name: Create cli-python Template
run: |
echo -e "\n\nHomer\nsimpson@gmail.com\nhomergithub\nnExplodingSpringfield\ndescription\n1.0.0\n\n\n\nn" | cookietemple create
echo -e "\n\nHomer\nsimpson@gmail.com\nhomergithub\nnExplodingSpringfield\ndescription\n1.0.0\n\nn" | cookietemple create
- name: Install Poetry, nox and the nox poetry extension
run: pip install poetry nox nox-poetry

- name: Build Package
run: |
cd ExplodingSpringfield
cd explodingspringfield
make install
- name: Install doc dependencies
- name: Run Tests
run: |
pip install -r docs/requirements.txt
mv explodingspringfield /tmp
cd /tmp/explodingspringfield
git init
git add .
nox
- name: Install doc dependencies
run: pip install -r /tmp/explodingspringfield/docs/requirements.txt

- name: Build docs
run: |
cd docs
cd /tmp/explodingspringfield/docs
make html
4 changes: 2 additions & 2 deletions .github/workflows/create_gui_java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
name: Check out source-code repository

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

Expand All @@ -43,7 +43,7 @@ jobs:

- name: Compile Package
run: |
cd ExplodingSpringfield
cd explodingspringfield
make compile
- name: Install doc dependencies
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/create_lib_cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
name: Check out source-code repository

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

Expand All @@ -38,7 +38,7 @@ jobs:
- name: Build Package
run: |
cd ExplodingSpringfield
cmake -Bbuild -DExplodingSpringfield_ENABLE_UNIT_TESTING=0 && \
cd explodingspringfield
cmake -Bbuild -Dexplodingspringfield_ENABLE_UNIT_TESTING=0 && \
cmake --build build
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 @@ -24,7 +24,7 @@ jobs:
name: Check out source-code repository

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

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/create_web_python_flask.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
name: Check out source-code repository

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

Expand All @@ -42,7 +42,7 @@ jobs:
- name: Build basic Package
run: |
cd ExplodingSpringfield
cd explodingspringfield
make install
- name: Install doc dependencies
Expand All @@ -56,7 +56,7 @@ jobs:
- name: Build advanced Package
run: |
cd ExplodingSpringfieldAdvanced
cd explodingspringfieldadvanced
make install
- name: Install doc dependencies
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 @@ -19,7 +19,7 @@ jobs:
name: Check out source-code repository

- name: Setup Python
uses: actions/setup-python@v2.1.4
uses: actions/setup-python@v2.2.1
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 @@ -13,7 +13,7 @@ jobs:
name: Check out source-code repository

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

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

- name: Setup Python
uses: actions/setup-python@v2.1.4
uses: actions/setup-python@v2.2.1
with:
python-version: 3.8

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- uses: actions/checkout@master
- name: Setup Python
uses: actions/setup-python@v2.1.4
uses: actions/setup-python@v2.2.1
with:
python-version: ${{ matrix.python }}

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 @@ -12,7 +12,7 @@ jobs:
name: Check out source-code repository

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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_flake8_linting.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.1.4
uses: actions/setup-python@v2.2.1
with:
python-version: 3.8

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run_mypy.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.1.4
uses: actions/setup-python@v2.2.1
with:
python-version: 3.9

Expand All @@ -29,4 +29,4 @@ jobs:
- name: Lint with mypy
run: |
pip install mypy
mypy . --show-error-codes
mypy -p cookietemple --show-error-codes
2 changes: 1 addition & 1 deletion .github/workflows/run_tox_testsuite.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.1.4
uses: actions/setup-python@v2.2.1
with:
python-version: ${{ matrix.python }}

Expand Down
4 changes: 2 additions & 2 deletions .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.1.4
uses: actions/setup-python@v2.2.1
with:
python-version: 3.8

Expand All @@ -23,7 +23,7 @@ jobs:
token: '${{ secrets.CT_SYNC_TOKEN }}'
name: Check out source-code repository

- uses: oleksiyrudenko/gha-git-credentials@v2
- uses: oleksiyrudenko/gha-git-credentials@v2.1
with:
name: 'zethson'
email: 'lukas.heumos@posteo.net'
Expand Down
18 changes: 18 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,24 @@ Changelog

This project adheres to `Semantic Versioning <https://semver.org/>`_.

1.3.0 (2021-01-17)
------------------

**Added**

* cli-python version 2.0.0 with Poetry, Nox, pre-commit (with black, prettier, [...]), working module autogeneration and much more.
* [ALL TEMPLATES] Removed Changelog.rst files in favor of Release Drafter, a GitHub Action to automatically include descriptions of changes into a new release

**Fixed**

* blacklisted files for sync defined by the user are now correctly picked up
* blacklisted sync files, that are newly introduced by a PR are now included in the sync PR, they were introduced but not in the following ones

**Dependencies**

**Deprecated**


1.2.4 (2020-12-19)
------------------

Expand Down
5 changes: 4 additions & 1 deletion cookietemple.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.2.4
current_version = 1.3.0

[bumpversion_files_whitelisted]
setup_file = setup.py
Expand All @@ -9,6 +9,9 @@ conf_py = docs/conf.py

[bumpversion_files_blacklisted]

[sync]
sync_enabled = True

[sync_level]
ct_sync_level = minor

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.2.4'
__version__ = '1.3.0'
Loading

0 comments on commit 06c6350

Please sign in to comment.