Skip to content

Commit

Permalink
Merge branch 'release-v2.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
fedejaure committed Jun 12, 2021
2 parents d1d3168 + 8731c81 commit 193ebf6
Show file tree
Hide file tree
Showing 44 changed files with 1,062 additions and 347 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[bumpversion]
commit = True
tag = False
current_version = 1.2.3
current_version = 2.0.0

[bumpversion:file:pyproject.toml]
search = version = "{current_version}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
---
name: 🐛 Bug report
about: Create a report to help us improve
labels: bug
assignees: ''

---

## Expected Behavior


Expand Down
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
blank_issues_enabled: false
contact_links: []
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: 🚀 Feature request
about: Suggest an idea for this project
labels: enhancement
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ updates:
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
interval: "monthly"
time: "08:00"
timezone: "Europe/Amsterdam"
labels:
Expand All @@ -14,7 +14,7 @@ updates:
- package-ecosystem: pip
directory: "/docs"
schedule:
interval: daily
interval: "monthly"
time: "08:00"
timezone: "Europe/Amsterdam"
labels:
Expand All @@ -25,7 +25,7 @@ updates:
- package-ecosystem: pip
directory: "/"
schedule:
interval: daily
interval: "monthly"
time: "08:00"
timezone: "Europe/Amsterdam"
labels:
Expand Down
44 changes: 44 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: "CodeQL"

on:
push:
branches:
- master
- develop
pull_request:
branches:
- develop
schedule:
- cron: '0 6 1 * *'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'python' ]

steps:
- name: Checkout repository
uses: actions/[email protected]

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
44 changes: 44 additions & 0 deletions .github/workflows/pre-commit-autoupdate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: "Pre-commit autoupdate"

on:
schedule:
- cron: '0 6 1 * *'
workflow_dispatch:

jobs:
autoupdate:
name: autoupdate
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
with:
ref: develop

- name: Set up Python 3.7
uses: actions/[email protected]
with:
python-version: 3.7

- name: Install pre-commit
run: pip install pre-commit

- name: Run autoupdate
run: pre-commit autoupdate

- name: Run pre-commit
run: pre-commit run --all-files

- uses: peter-evans/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: chore-update-pre-commit-hooks
title: Update pre-commit hooks
commit-message: "Update pre-commit hooks"
body: |
# Update pre-commit hooks
- Update pre-commit hooks to the latest version.
delete-branch: true
labels: |
dependencies
python
4 changes: 3 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
name: release

on:
push:
tags:
- 'v*'

jobs:
github_release:
name: Create Github Release
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]

- name: Get version from tag
id: tag_name
shell: bash
Expand Down
22 changes: 12 additions & 10 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: tests

on:
push:
branches:
Expand All @@ -7,18 +8,19 @@ on:
pull_request:
branches:
- develop

jobs:
linting:
name: Linting
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- name: Set up Python 3.6

- name: Set up Python 3.7
uses: actions/[email protected]
with:
python-version: 3.6
python-version: 3.7

- name: Linting
run: |
pip install pre-commit
Expand All @@ -30,32 +32,32 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.7, 3.8, 3.9]
fail-fast: true
steps:
- uses: actions/[email protected]

- name: Set up Python ${{ matrix.python-version }}
uses: actions/[email protected]
with:
python-version: ${{ matrix.python-version }}

- name: Install system deps
shell: bash
run: |
pip install virtualenv==20.2.1
pip install nox
pip install poetry
poetry config virtualenvs.in-project true
- name: Run mypy with nox
shell: bash
run: nox --force-color -s mypy-${{ matrix.python-version }}

- name: Run tests with nox
shell: bash
run: nox --force-color -s tests-${{ matrix.python-version }}

- name: Run safety check
if: matrix.python-version == 3.9
shell: bash
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.0.0
rev: v4.0.1
hooks:
- id: check-toml
exclude: "^{{cookiecutter.project_name}}/"
Expand All @@ -18,7 +18,7 @@ repos:
- id: isort
exclude: "^{{cookiecutter.project_name}}/"
- repo: https://github.com/psf/black
rev: 20.8b1
rev: 21.5b2
hooks:
- id: black
exclude: "^{{cookiecutter.project_name}}/"
Expand All @@ -33,7 +33,7 @@ repos:
types: [python]
require_serial: true
additional_dependencies: [
'flake8~=3.9.1',
'flake8~=3.9.2',
'flakehell~=0.9.0',
'flake8-builtins~=1.5.3',
'flake8-blind-except~=0.2.0',
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ sphinx:
configuration: docs/conf.py

python:
version: 3.6
version: 3.7
install:
- requirements: docs/requirements.txt
26 changes: 25 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.0.0] - 2021-06-12
### Added
- optional `CODE_OF_CONDUCT.md` file.
- optional `CONTRIBUTING.md` file.
- optional `SECURITY.md` file.
- multiple issue templates config.
- codeql analysis workflow.
- pre-commit autoupdate workflow.

### Changed
- sphinx from `3.5.4` to `4.0.2`.
- watchdog from `2.0.3` to `2.1.2`.
- flake8 from `3.9.1` to `3.9.2`.
- pytest from `6.2.3` to `6.2.4`.
- pre-commit from `^2.12.1` to `^2.13.0`.
- pre-commit-hooks from `^3.0.0` to `^4.0.1`.
- black from `^20.8b1` to `^21.5b2`.
- click from `^7.1.2` to `^8.0.1`.
- mypy from `^0.812` to `^0.902`.

### Removed
- Python `3.6` support.

## [1.2.3] - 2021-04-27
### Changed
- sphinx from `3.5.2` to `3.5.4`.
Expand Down Expand Up @@ -204,7 +227,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.3...develop
[Unreleased]: https://github.com/fedejaure/cookiecutter-modern-pypackage/compare/v2.0.0...develop
[2.0.0]: https://github.com/fedejaure/cookiecutter-modern-pypackage/compare/v1.2.3...v2.0.0
[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
Expand Down
Loading

0 comments on commit 193ebf6

Please sign in to comment.