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.

Sign up for GitHub

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

enable python 3.12 in wheels, use 3.11 as basepython #180

Merged
merged 5 commits into from
Apr 10, 2024
Merged

enable python 3.12 in wheels, use 3.11 as basepython #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6dfe1f9
enable python 3.12 in wheels, use 3.11 as basepython
dkriegner Mar 27, 2024
069293d
move to V2 of code coverage result publisher
dkriegner Apr 3, 2024
7b21a56
remove end of life python version and add 3.12
dkriegner Apr 9, 2024
dcc33f1
fix typo in setup.py (missing comma)
dkriegner Apr 9, 2024
b5f8a67
move more extensive tests (with optional test data) to Python 3.12
dkriegner Apr 9, 2024
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
2 changes: 1 addition & 1 deletion .azure/azure-builddocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ trigger:
pr: none

variables:
python_version: 3.10
python_version: 3.11

pool:
vmImage: 'ubuntu-latest'
Expand Down
4 changes: 2 additions & 2 deletions .azure/azure-buildwheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ trigger: none
pr: none

variables:
CIBW_BUILD: cp37-* cp38-* cp39-* cp310-* cp311-*
CIBW_BUILD: cp38-* cp39-* cp310-* cp311-* cp312-*
CIBW_BEFORE_BUILD: pip install numpy scipy h5py
CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux_*"
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
DEVVERSION: post$(Build.BuildNumber)
python_version: 3.10
python_version: 3.11

jobs:
- job: linux
Expand Down
9 changes: 5 additions & 4 deletions .azure/templates/testing_job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
python.version: '3.10'
Python311:
python.version: '3.11'
Python312:
python.version: '3.12'

steps:
- task: UsePythonVersion@0
Expand All @@ -28,12 +30,12 @@ jobs:
key: testdata20190812
path: $(System.DefaultWorkingDirectory)/tests/data
cacheHitVar: TESTDATA_RESTORED
condition: and(succeeded(), eq(variables['python.version'], '3.10'))
condition: and(succeeded(), eq(variables['python.version'], '3.12'))
displayName: Cache test data
- script: |
curl -s -L https://sourceforge.net/projects/xrayutilities/files/xrayutilities-testdata-20190812.tar.gz -o xu_testdata.tar.gz
tar xzf xu_testdata.tar.gz -C tests
condition: and(succeeded(), ne(variables['TESTDATA_RESTORED'], 'true'), eq(variables['python.version'], '3.10'))
condition: and(succeeded(), ne(variables['TESTDATA_RESTORED'], 'true'), eq(variables['python.version'], '3.12'))
displayName: Download test data
- script: |
pip install -r recommended_requirements.txt
Expand All @@ -56,8 +58,7 @@ jobs:
inputs:
testResultsFiles: '**/test-*.xml'
testRunTitle: 'Publish test results for Python $(python.version)'
- task: PublishCodeCoverageResults@1
- task: PublishCodeCoverageResults@2
inputs:
codeCoverageTool: Cobertura
summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/coverage.xml'

5 changes: 2 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# Copyright (C) 2009 Eugen Wintersberger <eugen.wintersberger@desy.de>
# Copyright (C) 2010-2021 Dominik Kriegner <dominik.kriegner@gmail.com>
# Copyright (C) 2010-2024 Dominik Kriegner <dominik.kriegner@gmail.com>

import glob
import os.path
Expand Down Expand Up @@ -144,12 +144,11 @@ def run(self):
description="package for x-ray diffraction data evaluation",
classifiers=[
"Programming Language :: C",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Scientific/Engineering :: Physics",
"Intended Audience :: Science/Research",
"Development Status :: 5 - Production/Stable",
Expand Down
Loading