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

Dependencies: drop support for Python 3.7 #5307

Merged
merged 1 commit into from
Jan 13, 2022
Merged
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
8 changes: 4 additions & 4 deletions .github/workflows/ci-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.7', '3.10']
python-version: ['3.8', '3.10']
backend: ['django', 'sqlalchemy']

services:
Expand Down Expand Up @@ -129,10 +129,10 @@ jobs:
.github/workflows/tests.sh

- name: Upload coverage report
if: matrix.python-version == 3.7 && github.repository == 'aiidateam/aiida-core'
if: matrix.python-version == 3.8 && github.repository == 'aiidateam/aiida-core'
uses: codecov/codecov-action@v1
with:
name: aiida-pytests-py3.7-${{ matrix.backend }}
name: aiida-pytests-py3.8-${{ matrix.backend }}
flags: ${{ matrix.backend }}
file: ./coverage.xml
fail_ci_if_error: false # don't fail job, if coverage upload fails
Expand All @@ -145,7 +145,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.7', '3.10']
python-version: ['3.8', '3.10']

steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/post-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Set up Python 3.7
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: '3.7'
python-version: '3.8'

- name: Install python dependencies
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10']
python-version: ['3.8', '3.9', '3.10']

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
fail-fast: false
matrix:

python-version: ['3.7', '3.8', '3.9', '3.10']
python-version: ['3.8', '3.9', '3.10']

# Not being able to install with conda on a specific Python version is
# not sufficient to fail the run, but something we want to be aware of.
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10']
python-version: ['3.8', '3.9', '3.10']
backend: ['django', 'sqlalchemy']

services:
Expand Down
2 changes: 1 addition & 1 deletion .molecule/default/setup_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
pip:
chdir: "{{ aiida_core_dir }}"
# TODO dynamically change for python version
requirements: requirements/requirements-py-3.7.txt
requirements: requirements/requirements-py-3.8.txt
executable: "{{ venv_bin }}/pip"
extra_args: --cache-dir {{ aiida_pip_cache }}
register: pip_install_deps
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ channels:
- conda-forge
- defaults
dependencies:
- python~=3.7
- python~=3.8
- aldjemy~=2.4
- alembic~=1.2
- archive-path~=0.3.6
Expand Down
14 changes: 6 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -131,17 +131,16 @@ ignore_missing_imports = true
[tool.tox]
legacy_tox_ini = """
[tox]
envlist = py37-django
envlist = py38-django

[testenv]
usedevelop=True
deps =
py37: -rrequirements/requirements-py-3.7.txt
py38: -rrequirements/requirements-py-3.8.txt
py39: -rrequirements/requirements-py-3.9.txt
py310: -rrequirements/requirements-py-3.10.txt

[testenv:py{37,38,39,310}-{django,sqla}]
[testenv:py{38,39,310}-{django,sqla}]
passenv =
PYTHONASYNCIODEBUG
setenv =
Expand All @@ -150,13 +149,13 @@ setenv =
SQLALCHEMY_WARN_20 = 1
commands = pytest {posargs}

[testenv:py{37,38,39,310}-verdi]
[testenv:py{38,39,310}-verdi]
setenv =
AIIDA_TEST_BACKEND = django
AIIDA_PATH = {toxinidir}/.tox/.aiida
commands = verdi {posargs}

[testenv:py{37,38,39,310}-docs-{clean,update}]
[testenv:py{38,39,310}-docs-{clean,update}]
description =
clean: Build the documentation (remove any existing build)
update: Build the documentation (modify any existing build)
Expand All @@ -169,11 +168,10 @@ commands =
clean: make clean
make debug

[testenv:py{37,38,39,310}-docs-live]
[testenv:py{38,39,310}-docs-live]
# tip: remove apidocs before using this feature (`cd docs; make clean`)
description = Build the documentation and launch browser (with live updates)
deps =
py37: -rrequirements/requirements-py-3.7.txt
py38: -rrequirements/requirements-py-3.8.txt
py39: -rrequirements/requirements-py-3.9.txt
py310: -rrequirements/requirements-py-3.10.txt
Expand All @@ -186,7 +184,7 @@ commands =
--port 0 --open-browser \
-n -b {posargs:html} docs/source/ docs/build/{posargs:html}

[testenv:py{37,38,39,310}-pre-commit]
[testenv:py{38,39,310}-pre-commit]
description = Run the pre-commit checks
extras = pre-commit
commands = pre-commit run {posargs}
Expand Down
183 changes: 0 additions & 183 deletions requirements/requirements-py-3.7.txt

This file was deleted.

3 changes: 1 addition & 2 deletions setup.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@
"author_email": "[email protected]",
"description": "AiiDA is a workflow manager for computational science with a strong focus on provenance, performance and extensibility.",
"include_package_data": true,
"python_requires": ">=3.7",
"python_requires": ">=3.8",
"classifiers": [
"Development Status :: 5 - Production/Stable",
"Framework :: AiiDA",
"License :: OSI Approved :: MIT License",
"Operating System :: POSIX :: Linux",
"Operating System :: MacOS :: MacOS X",
"Programming Language :: Python",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
Expand Down
2 changes: 1 addition & 1 deletion utils/dependency_management.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def generate_environment_yml():
# python version cannot be overriden from outside environment.yml
# (even if it is not specified at all in environment.yml)
# https://github.com/conda/conda/issues/9506
conda_requires = ['python~=3.7']
conda_requires = ['python~=3.8']
for req in install_requirements:
if req.name == 'python' or any(re.match(ignore, str(req)) for ignore in CONDA_IGNORE):
continue
Expand Down