Skip to content

Commit 7760fc6

Browse files
authored
Merge pull request #23 from SiLab-Bonn/wheel_testing
Numba support in pylandau environment
2 parents be2086b + a8f9dc8 commit 7760fc6

File tree

5 files changed

+29
-16
lines changed

5 files changed

+29
-16
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ jobs:
2525
with:
2626
python-version: ${{matrix.python-version}}
2727
cache: 'pip'
28-
- name: Install dependencies
29-
run: pip install cython numpy scipy hypothesis pytest
3028
- name: Install package
3129
run: pip install -e .
30+
- name: Install test dependencies
31+
run: pip install hypothesis pytest
3232
- name: Run tests
3333
run: pytest

.github/workflows/wheels.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@ jobs:
2020
env:
2121
CIBW_ARCHS: auto64 # Build 64bit versions only
2222
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
23-
CIBW_MANYLINUX_AARCH64_IMAGE: "manylinux2014"
24-
CIBW_BUILD: "cp38-* cp39-* cp310-*" # Build on CPython 3.8 - 3.10 only
23+
CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014
24+
CIBW_BUILD: cp38-* cp39-* cp310-* # Build on CPython 3.8 - 3.10 only
2525
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.8"
2626
CIBW_SKIP: "*-manylinux_i686 *_ppc64le *_s390x *-musllinux*"
2727
CIBW_ARCHS_MACOS: x86_64 arm64
28-
CIBW_TEST_COMMAND: "echo Wheel installed"
28+
CIBW_TEST_REQUIRES: hypothesis pytest
29+
CIBW_TEST_COMMAND: pytest {package}/tests
30+
CIBW_TEST_SKIP: "*-macosx_arm64 *-macosx_universal2:arm64"
2931

3032
- uses: actions/upload-artifact@v2
3133
with:

pyproject.toml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,31 @@
22
name = 'pylandau'
33
version = '2.2.0'
44
description = 'A Landau PDF definition to be used in Python.'
5-
repository = 'https://github.com/SiLab-Bonn/pyLandau'
6-
license = 'LGPL-2.1-only'
7-
python = '^3.8'
5+
license = {file = 'LICENSE'}
6+
requires-python = '>=3.8'
87
readme = 'README.md'
9-
authors = 'David-Leon Pohl, Christian Bespin'
10-
maintainers ='David-Leon Pohl, Christian Bespin'
11-
author_email = 'pohl@physik.uni-bonn.de, bespin@physik.uni-bonn.de'
12-
maintainer_email = 'pohl@physik.uni-bonn.de, bespin@physik.uni-bonn.de'
8+
authors = [
9+
{name = 'David-Leon Pohl', email = 'pohl@physik.uni-bonn.de'},
10+
{name = 'Christian Bespin', email = 'bespin@physik.uni-bonn.de'}
11+
]
12+
maintainers = [
13+
{name = 'Christian Bespin', email = 'bespin@physik.uni-bonn.de'}
14+
]
15+
dependencies = [
16+
"cython>=0.29",
17+
"numpy>=1.21",
18+
"scipy>=1.7",
19+
]
20+
21+
[project.urls]
22+
repository = 'https://github.com/SiLab-Bonn/pyLandau'
1323

1424
[build-system]
1525
# Minimum requirements for the build system to execute.
1626
requires = [
1727
"setuptools",
1828
"wheel",
19-
"numpy>=1.22",
29+
"numpy>=1.21",
2030
"cython>=0.29",
2131
] # PEP 508 specifications
2232
build-backend = "setuptools.build_meta"

requirements.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
numpy>=1.22
2-
scipy>=1.8
1+
cython>=0.29
2+
numpy>=1.21
3+
scipy>=1.7

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def finalize_options(self):
2727
sources=['pyLandau/cpp/pylandau.cpp'],
2828
language="c++")]
2929

30-
install_requires = ['numpy>=1.22', 'scipy>=1.8']
30+
install_requires = ['cython>=0.29', 'numpy>=1.21']
3131

3232
setup(
3333
cmdclass={'build_ext': build_ext},

0 commit comments

Comments
 (0)