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

upgrade python #61

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ Before you submit a pull request, check that it meets these guidelines:
your 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 2.7, 3.5, 3.6 and 3.7, and for PyPy. Check
3. The pull request should work for Python 2.7, 3.8, 3.9, 3.10, and 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 README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Features
* Testing setup with ``unittest`` and ``pytest``
* Github-Actions_: Ready for Github Actions Continuous Integration testing
* Travis-CI_: Ready for Travis Continuous Integration testing
* Tox_ testing: Setup to easily test for Python 2.7, 3.5, 3.6, 3.7, 3.8
* Tox_ testing: Setup to easily test for Python 2.7, 3.8, 3.9, 3.10, 3.11
* Sphinx_ docs: Documentation ready for generation, automatic building and deploying to gh-pages (strongly recommended)
* Bumpversion_: Pre-configured version bumping with a single command
* Auto-release to PyPI_ when you push a new tag to master (strongly recommended)
Expand Down Expand Up @@ -199,8 +199,8 @@ things are files and folders and I'll give you a quick overview of what they
are/do.

* Tox_ (tox.ini): A system that can run all kinds of tests for you. For
instance, you can test your code on various versions (Python 2.7, 3.5,
3.6, 3.7, 3.8) and test your code on linters as well.
instance, you can test your code on various versions (Python 2.7, 3.8,
3.9, 3.10, 3.11) and test your code on linters as well.

* Travis-CI_ (travis.yml): A continuous integration system. That means every
time you push a commit it will simulate downloading your project, installing
Expand Down
4 changes: 2 additions & 2 deletions {{cookiecutter.repository_name}}/.github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Set up Python 3.7
- name: Set up Python 3.8
uses: actions/setup-python@v1
with:
python-version: 3.7
python-version: 3.8

- name: Install dependencies
run: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Python
uses: actions/setup-python@v1
with:
python-version: '3.7'
python-version: '3.8'

- name: Build
run: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: {{ '${{ matrix.os }}' }}
strategy:
matrix:
python-version: [3.5, 3.6, 3.7, 3.8]
python-version: ['3.8', '3.9', '3.10', '3.11']
os: [ubuntu-latest, macos-latest]

steps:
Expand Down
12 changes: 6 additions & 6 deletions {{cookiecutter.repository_name}}/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ dist: trusty
language: python
python:
- 3.8
- 3.7
- 3.6
- 3.5
- 3.9
- 3.10
- 3.11
{%- if cookiecutter.support_py2 == 'y' %}
- 2.7
{%- endif %}

matrix:
include:
- python: 3.7
- python: 3.8
dist: xenial
sudo: required

Expand Down Expand Up @@ -46,7 +46,7 @@ deploy:
on:
tags: true
repo: {{ cookiecutter.github_owner }}/{{ cookiecutter.repository_name }}
python: 3.7
python: 3.8
{%- endif %}
{% if cookiecutter.use_ghpages_with_ci == 'y' %}
# Automatically build and deploy documentation to GitHub Pages after every
Expand All @@ -62,5 +62,5 @@ deploy:
target-branch: gh-pages
on:
branch: master
python: 3.7
python: 3.8
{%- endif %}
4 changes: 2 additions & 2 deletions {{cookiecutter.repository_name}}/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ TODO: Provide a short overview of the project here.

## Requirements

**{{ cookiecutter.project_name }}** has been developed and tested on [Python {% if cookiecutter.support_py2 == 'y' %}2.7, {% endif %}3.5, 3.6, 3.7 and 3.8](https://www.python.org/downloads/)
**{{ cookiecutter.project_name }}** has been developed and tested on [Python {% if cookiecutter.support_py2 == 'y' %}2.7, {% endif %}3.8, 3.9, 3.10 and 3.11](https://www.python.org/downloads/)

Also, although it is not strictly required, the usage of a [virtualenv](https://virtualenv.pypa.io/en/latest/)
is highly recommended in order to avoid interfering with other software installed in the system
in which **{{ cookiecutter.project_name }}** is run.

These are the minimum commands needed to create a virtualenv using python3.6 for **{{ cookiecutter.project_name }}**:
These are the minimum commands needed to create a virtualenv using python3.8 for **{{ cookiecutter.project_name }}**:

```bash
pip install virtualenv
Expand Down
8 changes: 4 additions & 4 deletions {{cookiecutter.repository_name}}/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@
'Programming Language :: Python :: 2.7',
{%- endif %}
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'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',
],
description='{{ cookiecutter.project_short_description.replace("\'", "\\\'") }}',
{%- if 'no' not in cookiecutter.command_line_interface|lower %}
Expand Down Expand Up @@ -108,7 +108,7 @@
{%- if cookiecutter.support_py2 == 'y' %}
python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
{%- else %}
python_requires='>=3.5',
python_requires='>=3.8',
{%- endif %}
setup_requires=setup_requires,
test_suite='tests',
Expand Down
14 changes: 7 additions & 7 deletions {{cookiecutter.repository_name}}/tox.ini
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[tox]
envlist = {% if cookiecutter.support_py2 == 'y' %}py27, {% endif %}py35, py36, py37, py38, lint, docs
envlist = {% if cookiecutter.support_py2 == 'y' %}py27, {% endif %}py38, py39, py310, py311, lint, docs


{%- if cookiecutter.ci_provider == 'Travis CI' %}
[travis]
python =
3.8: py38
3.7: py37, docs, lint
3.6: py36
3.5: py35
3.9: py39, docs, lint
3.10: py310
3.11: py311
{%- if cookiecutter.support_py2 == 'y' %}
2.7: py27
{%- endif %}
Expand All @@ -18,9 +18,9 @@ python =
[gh-actions]
python =
3.8: py38
3.7: py37, docs, lint
3.6: py36
3.5: py35
3.9: py39, docs, lint
3.10: py310
3.11: py311
{%- if cookiecutter.support_py2 == 'y' %}
2.7: py27
{%- endif %}
Expand Down