Skip to content
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
6 changes: 3 additions & 3 deletions .github/workflows/ci-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.9', '3.14']
python-version: ['3.10', '3.14']
database-backend: [psql]

services:
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.9']
python-version: ['3.10']
database-backend: [sqlite]

services:
Expand Down Expand Up @@ -213,7 +213,7 @@ jobs:
- name: Install aiida-core
uses: ./.github/actions/install-aiida-core
with:
python-version: '3.9'
python-version: '3.10'
from-lock: 'true'
extras: tests

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Install aiida-core and docs deps
uses: ./.github/actions/install-aiida-core
with:
python-version: '3.9'
python-version: '3.10'
extras: docs,tests,rest,atomic_tools
from-lock: 'false'

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v6

- name: Set up Python 3.9
- name: Set up Python 3.10
uses: actions/setup-python@v6
with:
python-version: '3.9'
python-version: '3.10'

- name: Check tag
run: python .github/workflows/check_release_tag.py $GITHUB_REF
Expand Down Expand Up @@ -95,10 +95,10 @@ jobs:
steps:
- name: Checkout source
uses: actions/checkout@v6
- name: Set up Python 3.9
- name: Set up Python 3.10
uses: actions/setup-python@v6
with:
python-version: '3.9'
python-version: '3.10'
- name: Install flit
run: pip install flit~=3.4
- name: Build
Expand All @@ -123,10 +123,10 @@ jobs:
steps:
- name: Checkout source
uses: actions/checkout@v6
- name: Set up Python 3.9
- name: Set up Python 3.10
uses: actions/setup-python@v6
with:
python-version: '3.9'
python-version: '3.10'
- name: Install flit
run: pip install flit~=3.4
- name: Build
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ jobs:
steps:
- uses: actions/checkout@v6

- name: Set up Python 3.9
- name: Set up Python 3.10
uses: actions/setup-python@v6
with:
python-version: '3.9'
python-version: '3.10'

- name: Pip install
id: pip_install
Expand All @@ -111,7 +111,7 @@ jobs:
fail-fast: false
matrix:

python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']

# 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 @@ -165,7 +165,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']

services:
postgres:
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.9
- python>=3.10
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't this make more sense rather than python~=3.10? Its consistent with our pyproject.toml. I feel like there was a reason for it but I cannot guess it.

- alembic~=1.8
- archive-path~=0.4.2
- asyncssh~=2.21.0
Expand Down
17 changes: 7 additions & 10 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ classifiers = [
'Operating System :: POSIX :: Linux',
'Operating System :: MacOS :: MacOS X',
'Programming Language :: Python',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
Expand Down Expand Up @@ -69,7 +68,7 @@ keywords = ['aiida', 'workflows']
license = {file = 'LICENSE.txt'}
name = 'aiida-core'
readme = 'README.md'
requires-python = '>=3.9'
requires-python = '>=3.10'

[project.entry-points.'aiida.brokers']
'core.rabbitmq' = 'aiida.brokers.rabbitmq.broker:RabbitmqBroker'
Expand Down Expand Up @@ -261,7 +260,7 @@ pre-commit = [
'types-requests~=2.0'
]
rest = [
'flask-cors~=3.0',
'flask-cors~=4.0',
'flask-restful~=0.3.10',
'flask~=2.3.3',
'pyparsing~=3.1',
Expand Down Expand Up @@ -496,33 +495,32 @@ envlist = py39
[testenv]
usedevelop=True
deps =
py39: -rrequirements/requirements-py-3.9.txt
py310: -rrequirements/requirements-py-3.10.txt
py311: -rrequirements/requirements-py-3.11.txt
py312: -rrequirements/requirements-py-3.12.txt

[testenv:py{39,310,311,312}-presto]
[testenv:py{310,311,312}-presto]
passenv =
PYTHONASYNCIODEBUG
setenv =
AIIDA_WARN_v3 =
commands = pytest -m 'presto' {posargs}

[testenv:py{39,310,311,312}]
[testenv:py{310,311,312}]
passenv =
PYTHONASYNCIODEBUG
setenv =
AIIDA_WARN_v3 =
commands = pytest {posargs}

[testenv:py{39,310,311,312}-verdi]
[testenv:py{310,311,312}-verdi]
passenv =
AIIDA_TEST_BACKEND
setenv =
AIIDA_PATH = {toxinidir}/.tox/.aiida
commands = verdi {posargs}

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

[testenv:py{39,310,311,312}-docs-live]
[testenv:py{310,311,312}-docs-live]
# tip: remove apidocs before using this feature (`cd docs; make clean`)
description = Build the documentation and launch browser (with live updates)
deps =
py39: -rrequirements/requirements-py-3.9.txt
py310: -rrequirements/requirements-py-3.10.txt
py311: -rrequirements/requirements-py-3.11.txt
py312: -rrequirements/requirements-py-3.12.txt
Expand Down
3 changes: 2 additions & 1 deletion src/aiida/orm/nodes/data/array/bands.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
in a Brillouin zone, and how to operate on them.
"""

import itertools
import json
import typing as t
from string import Template
Expand Down Expand Up @@ -493,7 +494,7 @@ def _get_bandplot_data(self, cartesian, prettify_format=None, join_symbol=None,
# I add an empty label that points to the last band if the last label does not do it
if labels[-1][0] != len(bands) - 1:
labels.append((len(bands) - 1, ''))
for (position_from, label_from), (position_to, label_to) in zip(labels[:-1], labels[1:]):
for (position_from, label_from), (position_to, label_to) in itertools.pairwise(labels):
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, TIL 👍

if position_to - position_from > 1:
# Create a new path line only if there are at least two points,
# otherwise it is probably just a discontinuity point in the band
Expand Down
3 changes: 2 additions & 1 deletion utils/dependency_management.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ 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.9']
python_requires = pyproject['project']['requires-python']
conda_requires = [f'python{python_requires}']
for req in install_requirements:
if req.name == 'python' or any(re.match(ignore, str(req)) for ignore in CONDA_IGNORE):
continue
Expand Down
Loading
Loading