Skip to content

Commit

Permalink
Remove python3.6 support
Browse files Browse the repository at this point in the history
  • Loading branch information
fwitte committed May 17, 2021
1 parent f99af10 commit 75f7359
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tox_pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.6, 3.7, 3.8]
python-version: [3.7, 3.8]

steps:
- uses: actions/checkout@v1
Expand Down
6 changes: 3 additions & 3 deletions ci/templates/.appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ environment:
COVERALLS_REPO_TOKEN: COVERALLS_TOKEN
matrix:
- TOXENV: check
TOXPYTHON: C:\Python36\python.exe
PYTHON_HOME: C:\Python36
PYTHON_VERSION: '3.6'
TOXPYTHON: C:\Python38\python.exe
PYTHON_HOME: C:\Python38
PYTHON_VERSION: '3.8'
PYTHON_ARCH: '32'
{% for env, config in tox_environments|dictsort %}
{% if env.startswith(('py2', 'py3')) %}
Expand Down
4 changes: 2 additions & 2 deletions ci/templates/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ env:
- SEGFAULT_SIGNALS=all
matrix:
include:
- python: '3.6'
- python: '3.8'
env:
- TOXENV=check
- python: '3.6'
- python: '3.8'
env:
- TOXENV=docs
{%- for env, config in tox_environments|dictsort %}{{ '' }}
Expand Down
2 changes: 1 addition & 1 deletion ci/templates/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ envlist =

[testenv]
basepython =
docs: {env:TOXPYTHON:python3.6}
docs: {env:TOXPYTHON:python3.8}
{bootstrap,clean,check,report,codecov,coveralls}: {env:TOXPYTHON:python3}
setenv =
PYTHONPATH={toxinidir}/tests
Expand Down
1 change: 1 addition & 0 deletions docs/whats_new/v0-4-3-003.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Documentation

Other Changes
#############
- Remove Python3.6 support.
- Make it possible to include results in automatic model report, for more
information see the corresponding section in the documentation:
:ref:`TESPy Networks Postprocessing <tespy_modules_network_label>`
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ def read(*names, **kwargs):
'Operating System :: POSIX',
'Operating System :: Microsoft :: Windows',
'Programming Language :: Python',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Topic :: Scientific/Engineering',
Expand All @@ -62,7 +61,7 @@ def read(*names, **kwargs):
'Changelog': 'https://tespy.readthedocs.io/en/latest/whats_new.html',
'Issue Tracker': 'https://github.com/oemof/tespy/issues',
},
python_requires='>=3.6, <3.9',
python_requires='>=3.7, <3.9',
install_requires=[
'CoolProp>=6.4,<7',
'matplotlib>=3.2.1,<4',
Expand Down
15 changes: 1 addition & 14 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,18 @@ envlist =
clean,
check,
docs,
py36,
py37,
py38,
report

[gh-actions]
python =
3.6: py36
3.7: py37
3.8: py38

[testenv]
basepython =
docs: {env:TOXPYTHON:python3.6}
docs: {env:TOXPYTHON:python3.8}
{bootstrap,clean,check,report,codecov,coveralls}: {env:TOXPYTHON:python3}
setenv =
PYTHONPATH={toxinidir}/tests
Expand Down Expand Up @@ -87,17 +85,6 @@ commands = coverage erase
skip_install = true
deps = coverage

[testenv:py36]
basepython = {env:TOXPYTHON:python3.6}
setenv =
{[testenv]setenv}
usedevelop = true
commands =
{posargs:pytest --cov --cov-report=term-missing -vv}
deps =
{[testenv]deps}
pytest-cov

[testenv:py37]
basepython = {env:TOXPYTHON:python3.7}
setenv =
Expand Down

0 comments on commit 75f7359

Please sign in to comment.