Skip to content

Commit 43b12b8

Browse files
authored
Merge pull request #163 from dhalbert/python3
Don't use specific CPython versions
2 parents 3c54813 + 35e17dc commit 43b12b8

File tree

8 files changed

+14
-16
lines changed

8 files changed

+14
-16
lines changed

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-20.04
1414
steps:
1515
- uses: actions/checkout@v1
16-
- uses: actions/setup-python@v1
16+
- uses: actions/setup-python@v2
1717
- name: set PY
1818
run: echo >>$GITHUB_ENV "PY=$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')"
1919
- uses: actions/cache@v1

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
env:
1515
GITHUB_CONTEXT: ${{ toJson(github) }}
1616
run: echo "$GITHUB_CONTEXT"
17-
- name: Set up Python 3.6
18-
uses: actions/setup-python@v1
17+
- name: Set up Python 3.x
18+
uses: actions/setup-python@v2
1919
with:
20-
python-version: 3.6
20+
python-version: "3.x"
2121
- name: Versions
2222
run: |
2323
python3 --version

conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,5 +356,5 @@
356356
#
357357
# texinfo_no_detailmenu = False
358358

359-
intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),
359+
intersphinx_mapping = {'python': ('https://docs.python.org/3', None),
360360
'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None)}

{{ cookiecutter and 'tmp_repo' }}/.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
awk -F '\/' '{ print tolower($2) }' |
2323
tr '_' '-'
2424
)
25-
- name: Set up Python 3.7
26-
uses: actions/setup-python@v1
25+
- name: Set up Python 3.x
26+
uses: actions/setup-python@v2
2727
with:
28-
python-version: 3.7
28+
python-version: "3.x"
2929
- name: Versions
3030
run: |
3131
python3 --version

{{ cookiecutter and 'tmp_repo' }}/.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
awk -F '\/' '{ print tolower($2) }' |
2525
tr '_' '-'
2626
)
27-
- name: Set up Python 3.6
28-
uses: actions/setup-python@v1
27+
- name: Set up Python 3.x
28+
uses: actions/setup-python@v2
2929
with:
30-
python-version: 3.6
30+
python-version: "3.x"
3131
- name: Versions
3232
run: |
3333
python3 --version
@@ -67,7 +67,7 @@ jobs:
6767
echo ::set-output name=setup-py::$( find . -wholename './setup.py' )
6868
- name: Set up Python
6969
if: contains(steps.need-pypi.outputs.setup-py, 'setup.py')
70-
uses: actions/setup-python@v1
70+
uses: actions/setup-python@v2
7171
with:
7272
python-version: '3.x'
7373
- name: Install dependencies

{{ cookiecutter and 'tmp_repo' }}/docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030

3131
intersphinx_mapping = {
32-
"python": ("https://docs.python.org/3.4", None),
32+
"python": ("https://docs.python.org/3", None),
3333
{%- if cookiecutter.requires_bus_device in ["y", "yes"] -%}
3434
"BusDevice": ("https://circuitpython.readthedocs.io/projects/busdevice/en/latest/", None),
3535
{% endif %}

{{ cookiecutter and 'tmp_repo' }}/{% if cookiecutter.pypi_release in ['y', 'yes'] %}setup.py{% endif %}

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ setup(
8989
"Topic :: System :: Hardware",
9090
"License :: OSI Approved :: MIT License",
9191
"Programming Language :: Python :: 3",
92-
"Programming Language :: Python :: 3.4",
93-
"Programming Language :: Python :: 3.5",
9492
],
9593
# What does your project relate to?
9694
keywords="{{ kw_list.kw_list|sort|unique|join(' "\n"')|indent(width=13) }}",

{{ cookiecutter and 'tmp_repo' }}/{% if cookiecutter.sphinx_docs in ['y', 'yes'] %}.readthedocs.yaml{% endif %}

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
version: 2
1010

1111
python:
12-
version: "3.6"
12+
version: "3.x"
1313
install:
1414
- requirements: docs/requirements.txt
1515
- requirements: requirements.txt

0 commit comments

Comments
 (0)