Skip to content

Commit

Permalink
updated for 3.11
Browse files Browse the repository at this point in the history
  • Loading branch information
EuanMason committed Feb 25, 2024
1 parent de7b7fb commit 4c8aaf7
Show file tree
Hide file tree
Showing 12 changed files with 625 additions and 558 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
# The type of runner that the job will run on
strategy:
matrix:
python-versions: [3.6, 3.7, 3.8, 3.9]
python-versions: [3.8, 3.9,3.11]
os: [ubuntu-20.04, windows-latest, macos-latest]
runs-on: ${{ matrix.os }}

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Temporary Items
# Distribution / packaging
.Python
env/
.env/
build/
develop-eggs/
dist/
Expand Down Expand Up @@ -104,3 +105,4 @@ cookiecutter-pypackage-env/
site/

venv/
.venv/
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ Before you submit a pull request, check that it meets these guidelines:
new functionality into a function with a docstring, and add the feature to
the list in README.rst.

3. The pull request should work for Python 3.5, 3.6 and 3.7, 3.8 and for PyPy. Check
3. The pull request should work for Python 3.8,3.9,3.11 and for PyPy. Check
https://travis-ci.org/audreyr/cookiecutter-pypackage/pull_requests and
make sure that the tests pass for all supported Python versions.

Expand Down
6 changes: 3 additions & 3 deletions cookiecutter.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"project_slug": "{{ cookiecutter.project_name.lower().replace(' ', '-') }}",
"pkg_name": "{{ cookiecutter.project_name.lower().replace(' ', '_').replace('-', '_') }}",
"project_short_description": "Skeleton project created by Cookiecutter PyPackage",
"full_name": "Xie Wei",
"email": "ampedee@gmail.com",
"github_username": "waynerv",
"full_name": "Euan Mason",
"email": "me@euanmason.com",
"github_username": "EuanMason",
"version": "0.1.0",
"command_line_interface": ["Click", "No command-line interface"],
"open_source_license": ["MIT", "BSD-3-Clause", "ISC", "Apache-2.0", "GPL-3.0-only", "Not open source"],
Expand Down
8 changes: 3 additions & 5 deletions mkdocs.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
site_name: Cookiecutter Pypackage
site_url: https://www.waynerv.com/cookiecutter-pypackage
repo_url: https://github.com/waynerv/cookiecutter-pypackage
repo_name: waynerv/cookiecutter-pypackage
repo_url: https://github.com/EuanMason/cookiecutter-pypackage
repo_name: EuanMason/cookiecutter-pypackage
nav:
- Introduction: index.md
- Tutorial: tutorial.md
Expand Down Expand Up @@ -43,7 +43,5 @@ plugins:
extra:
social:
- icon: fontawesome/brands/github
link: https://github.com/waynerv
link: https://github.com/EuanMason
name: Github
- icon: material/email
link: "mailto:[email protected]"
1,136 changes: 603 additions & 533 deletions poetry.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ name = "cookiecutter-pypackage"
version = "1.1.1"
description = "Cookiecutter template for a Python package"
license = "BSD-3-Clause"
authors = ["Xie Wei <ampedee@gmail.com>"]
authors = ["Euan Mason <me@euanmason.com>"]
readme = "README.md"
repository = "https://github.com/waynerv/cookiecutter-pypackage"
repository = "https://github.com/EuanMason/cookiecutter-pypackage/"
documentation = "https://waynerv.github.io/cookiecutter-pypackage/"
keywords = ['cookiecutter', 'template', 'package']

Expand All @@ -17,7 +17,7 @@ include = [
]

[tool.poetry.dependencies]
python = ">=3.6.*"
python = ">=3.8.*"
cookiecutter = "1.7.2"

pytest = {version = "^6.2.3", optional=true}
Expand Down
5 changes: 2 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
[tox]
envlist = py36, py37, py38, py39, docs
envlist = py38, py39, py311, docs
skipsdist = true

[gh-actions]
python =
3.6: py36
3.7: py37
3.8: py38, docs
3.9: py39
3.11, py311

[testenv:docs]
basepython=python
Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.project_slug}}/.github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
# The type of runner that the job will run on
strategy:
matrix:
python-versions: [3.6, 3.7, 3.8, 3.9]
python-versions: [3.8, 3.9, 3.11]
os: [ubuntu-18.04, macos-latest, windows-latest]
runs-on: ${{ matrix.os }}

Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.project_slug}}/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Before you submit a pull request, check that it meets these guidelines:
2. If the pull request adds functionality, the docs should be updated. Put
your new functionality into a function with a docstring, and add the
feature to the list in README.md.
3. The pull request should work for Python 3.6, 3.7, 3.8 and 3.9. Check
3. The pull request should work for Python 3.8, 3.9, 3.11. Check
https://github.com/{{ cookiecutter.github_username }}/{{ cookiecutter.project_slug }}/actions
and make sure that the tests pass for all supported Python versions.
Expand Down
7 changes: 3 additions & 4 deletions {{cookiecutter.project_slug}}/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,17 @@ classifiers=[
{%- endif %}
'Natural Language :: English',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.11',
]
packages = [
{ include = "{{ cookiecutter.pkg_name }}" },
{ include = "tests", format = "sdist" },
]

[tool.poetry.dependencies]
python = ">=3.6.2,<4.0"
python = ">=3.8.2,<4.0"
{%- if cookiecutter.command_line_interface|lower == 'click' %}
click = "8.0.1"
{%- endif %}
Expand Down Expand Up @@ -95,7 +94,7 @@ doc = [
[tool.black]
line-length = 120
skip-string-normalization = true
target-version = ['py36', 'py37', 'py38']
target-version = ['py311','py38']
include = '\.pyi?$'
exclude = '''
/(
Expand Down
5 changes: 2 additions & 3 deletions {{cookiecutter.project_slug}}/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,13 @@ exclude_lines =

[tox:tox]
isolated_build = true
envlist = py36, py37, py38, py39, format, lint, build
envlist = py38, py39, 311, format, lint, build

[gh-actions]
python =
3.11: py311
3.9: py39
3.8: py38, format, lint, build
3.7: py37
3.6: py36

[testenv]
allowlist_externals = pytest
Expand Down

0 comments on commit 4c8aaf7

Please sign in to comment.