diff --git a/.github/workflows/tox_pytest.yml b/.github/workflows/tox_pytest.yml index 381eb345c..dade3ebc6 100644 --- a/.github/workflows/tox_pytest.yml +++ b/.github/workflows/tox_pytest.yml @@ -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 diff --git a/ci/templates/.appveyor.yml b/ci/templates/.appveyor.yml index 0423027f0..c90413989 100644 --- a/ci/templates/.appveyor.yml +++ b/ci/templates/.appveyor.yml @@ -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')) %} diff --git a/ci/templates/.travis.yml b/ci/templates/.travis.yml index 56da4d5f2..c450665e1 100644 --- a/ci/templates/.travis.yml +++ b/ci/templates/.travis.yml @@ -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 %}{{ '' }} diff --git a/ci/templates/tox.ini b/ci/templates/tox.ini index b87a4072d..c5f326fff 100644 --- a/ci/templates/tox.ini +++ b/ci/templates/tox.ini @@ -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 diff --git a/docs/whats_new/v0-4-3-003.rst b/docs/whats_new/v0-4-3-003.rst index ff50ed14b..57d2e4bdb 100644 --- a/docs/whats_new/v0-4-3-003.rst +++ b/docs/whats_new/v0-4-3-003.rst @@ -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 ` diff --git a/setup.py b/setup.py index f92514235..c0de83b20 100644 --- a/setup.py +++ b/setup.py @@ -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', @@ -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', diff --git a/tox.ini b/tox.ini index 2b376463f..31df49f36 100644 --- a/tox.ini +++ b/tox.ini @@ -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 @@ -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 =