Skip to content

Commit fa60d89

Browse files
committed
Merge remote-tracking branch 'upstream/main' into lazy-import
2 parents 923b28f + 95ca6db commit fa60d89

5 files changed

Lines changed: 19 additions & 19 deletions

File tree

.github/workflows/doc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/setup-python@v6
1717
name: Install Python
1818
with:
19-
python-version: '3.11'
19+
python-version: '3.13'
2020

2121
- name: Install build docs
2222
shell: bash -l {0}

.github/workflows/tests.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,30 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
os: [ubuntu, windows, macos]
24-
PYTHON_VERSION: ['3.10', '3.12']
24+
PYTHON_VERSION: ['3.11', '3.13']
2525
PIP_SELECTOR: ['[tests]',]
2626
include:
2727
- os: ubuntu
28-
PYTHON_VERSION: '3.11'
28+
PYTHON_VERSION: '3.12'
2929
PIP_SELECTOR: '[tests]'
3030
- os: ubuntu
31-
PYTHON_VERSION: '3.13'
31+
PYTHON_VERSION: '3.14'
3232
PIP_SELECTOR: '[tests]'
33-
# test for dev as long as HyperSpy 3.13 support is not released
33+
# test for dev as long as HyperSpy 3.14 support is not released
3434
LABEL: '-dev'
3535
# dev
3636
- os: ubuntu
37-
PYTHON_VERSION: '3.12'
37+
PYTHON_VERSION: '3.13'
3838
PIP_SELECTOR: '[tests]'
3939
LABEL: '-dev'
4040
# minimum
4141
- os: ubuntu
42-
PYTHON_VERSION: '3.9'
42+
PYTHON_VERSION: '3.10'
4343
PIP_SELECTOR: '[tests]'
4444
LABEL: '-minimum'
4545
# oldest
4646
- os: ubuntu
47-
PYTHON_VERSION: '3.9'
47+
PYTHON_VERSION: '3.10'
4848
PIP_SELECTOR: '[tests]'
4949
LABEL: -release-oldest
5050
# Matching pyproject.toml

azure-pipelines.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ resources:
2525

2626
strategy:
2727
matrix:
28-
Linux_Python38:
28+
Linux_Python311:
2929
vmImage: 'ubuntu-latest'
30-
PYTHON_VERSION: '3.8'
30+
PYTHON_VERSION: '3.11'
3131
MINIFORGE_PATH: $(Agent.BuildDirectory)/miniforge3
32-
MacOS_Python38:
32+
MacOS_Python311:
3333
vmImage: 'macOS-latest'
34-
PYTHON_VERSION: '3.8'
34+
PYTHON_VERSION: '3.11'
3535
MINIFORGE_PATH: $(Agent.BuildDirectory)/miniforge3
36-
Windows_Python38:
36+
Windows_Python311:
3737
vmImage: 'windows-latest'
38-
PYTHON_VERSION: '3.8'
38+
PYTHON_VERSION: '3.11'
3939
MINIFORGE_PATH: $(Agent.BuildDirectory)\miniforge3
4040

4141
pool:

pyproject.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ classifiers = [
1313
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
1414
"Natural Language :: English",
1515
"Operating System :: OS Independent",
16-
"Programming Language :: Python :: 3.9",
1716
"Programming Language :: Python :: 3.10",
1817
"Programming Language :: Python :: 3.11",
1918
"Programming Language :: Python :: 3.12",
2019
"Programming Language :: Python :: 3.13",
20+
"Programming Language :: Python :: 3.14",
2121
"Topic :: Scientific/Engineering",
2222
"Topic :: Scientific/Engineering :: Physics",
2323
"Topic :: Software Development :: Libraries",
@@ -61,7 +61,7 @@ keywords = [
6161
]
6262
dynamic = ["version"]
6363
readme = "README.md"
64-
requires-python = ">=3.9"
64+
requires-python = ">=3.10"
6565

6666
[project.entry-points."hyperspy.extensions"]
6767
lumispy = "lumispy"
@@ -81,9 +81,8 @@ doc = [
8181
"sphinx>=4.3.0",
8282
"sphinx_rtd_theme>=0.5.1",
8383
"sphinx-copybutton",
84-
"sphinxcontrib-towncrier>=0.3.0a0",
85-
# unpin when sphinxcontrib-towncrier support more recent version to towncrier
86-
"towncrier<24",
84+
"sphinxcontrib-towncrier>=0.5.0a0",
85+
"towncrier",
8786
"numba",
8887
]
8988
dev = [
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Drop python 3.9 and add explicit support for python 3.14.

0 commit comments

Comments
 (0)