Skip to content

Commit b42effd

Browse files
committed
simpler setup
1 parent 6ce097e commit b42effd

7 files changed

Lines changed: 56 additions & 161 deletions

File tree

.github/workflows/cibuildwheel.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,11 @@ jobs:
3636
fetch-depth: 0
3737
persist-credentials: false
3838

39-
- name: Build just oldest and newest on PRs, all on tags
40-
if: ${{ github.event_name == 'pull_request' }}
41-
shell: bash
42-
# - On PPs, omit musllinux for speed
43-
# - On PRs, run just oldest and newest Python versions (3.11 is the oldest abi3 target)
44-
run: |
45-
CIBW_SKIP="cp310-win_arm64 *musllinux*"
46-
echo "CIBW_SKIP=$CIBW_SKIP" >> $GITHUB_ENV
47-
echo "Setting CIBW_SKIP=$CIBW_SKIP"
48-
49-
CIBW_TEST_SKIP="cp312-* cp313-*"
50-
echo "CIBW_TEST_SKIP=$CIBW_TEST_SKIP" >> $GITHUB_ENV
51-
echo "Setting CIBW_TEST_SKIP=$CIBW_TEST_SKIP"
52-
5339
- name: "Building ${{ matrix.os }} (${{ matrix.arch }}) wheels"
5440
uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0
5541
env:
56-
CIBW_SKIP: ${{ env.CIBW_SKIP }}
57-
CIBW_TEST_SKIP: ${{ env.CIBW_TEST_SKIP }}
42+
CIBW_SKIP: "*-musllinux*"
43+
CIBW_BUILD: "cp311-* cp315-*"
5844
CIBW_ARCHS: ${{ matrix.arch }}
5945

6046
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1

.github/workflows/deploy-docs.yml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,21 @@ jobs:
2525
fetch-depth: 0
2626
persist-credentials: false
2727

28-
- name: Setup Mamba
29-
uses: mamba-org/setup-micromamba@f457c30a868e4760d3a6fcea5f25dc655b8edf39 # v3.2.1
28+
- name: Set up Python
29+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
3030
with:
31-
environment-name: TEST
32-
create-args: >-
33-
python=3
34-
numpy>1.13.3
35-
sphinx
36-
37-
- name: Build environment
38-
shell: bash -l {0}
31+
python-version: "3.x"
32+
33+
- name: Install cftime
3934
run: |
40-
python -m pip install -e . --no-deps --force-reinstall
35+
pip install --group dev
36+
pip install -e .
4137
4238
- name: Get the version
43-
shell: bash -l {0}
4439
id: get_version
45-
run: echo "name=VERSION::$(python setup.py --version)" >> $GITHUB_OUTPUT
40+
run: echo "name=VERSION::$(python -c 'import cftime; print(cftime.__version__)')" >> $GITHUB_OUTPUT
4641

4742
- name: Build documentation
48-
shell: bash -l {0}
4943
run: |
5044
set -e
5145
pushd docs

.github/workflows/tests.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: TESTS-CONDA-ENV
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches: [master]
7+
8+
# Deny all permissions by default
9+
permissions: {}
10+
11+
jobs:
12+
run:
13+
runs-on: ${{ matrix.os }}
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
python-version: [ "3.11", "3.15-dev" ]
18+
os: [ windows-latest, ubuntu-latest, macos-latest, macos-15-intel ]
19+
platform: [x64, x32]
20+
exclude:
21+
- os: macos-latest
22+
platform: x32
23+
24+
steps:
25+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
26+
with:
27+
persist-credentials: false
28+
29+
- name: Set up Python
30+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
31+
with:
32+
python-version: ${{ matrix.python-version }}
33+
34+
- name: Install cftime
35+
run: |
36+
pip install --group dev
37+
pip install -e .
38+
39+
40+
- name: Run Tests
41+
run: |
42+
coverage run -m pytest -vv test
43+
coverage report

.github/workflows/tests_conda.yml

Lines changed: 0 additions & 66 deletions
This file was deleted.

.github/workflows/tests_latest.yml

Lines changed: 0 additions & 48 deletions
This file was deleted.

docs/conf.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@
1818

1919

2020
# -- Project information -----------------------------------------------------
21+
import cftime
2122

2223
project = 'cftime'
2324
copyright = '2018, Jeff Whitaker'
2425
author = 'Jeff Whitaker'
2526

2627
# The short X.Y version
27-
version = ''
28-
# The full version, including alpha/beta/rc tags
29-
release = '1.0'
28+
version = release = cftime.__version__
3029

3130

3231
# -- General configuration ---------------------------------------------------

pyproject.toml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ classifiers = [
1515
'Operating System :: POSIX :: Linux',
1616
'Programming Language :: Python',
1717
'Programming Language :: Python :: 3',
18-
'Programming Language :: Python :: 3.10',
1918
'Programming Language :: Python :: 3.11',
2019
'Programming Language :: Python :: 3.12',
2120
'Programming Language :: Python :: 3.13',
@@ -27,7 +26,7 @@ dependencies = [
2726
"numpy>=2.3.0; platform_system == 'Windows' and platform_machine == 'ARM64'",
2827
"numpy>=1.21.2; platform_system != 'Windows' or platform_machine != 'ARM64'",
2928
]
30-
requires-python = ">=3.10"
29+
requires-python = ">=3.11"
3130

3231
[dependency-groups]
3332
dev = [
@@ -109,24 +108,12 @@ ignore = [
109108

110109
[tool.cibuildwheel]
111110
build-verbosity = 1
112-
skip = [
113-
"*musllinux_aarch64*",
114-
# Skipped due to unavailability of Python binary and NumPy for Win-ARM64
115-
"cp310-win_arm64",
116-
]
117111

118-
test-skip = [
119-
# Emulated testing is slow, so trust that the Python 3.14 test is good enough on aarch64
120-
# (takes about 5 minutes per wheel to build, and 5 minutes to test)
121-
"cp3{10,11,12,13}-*_aarch64",
122-
]
123112
test-groups = "dev"
124113
test-command = [
125114
'''python -c "import cftime; print(f'cftime v{cftime.__version__}')"''',
126115
"python -m pytest -vv {package}/test"
127116
]
128-
#manylinux-x86_64-image = "manylinux2014"
129-
#manylinux-aarch64-image = "manylinux2014"
130117
manylinux-x86_64-image = "manylinux_2_28"
131118
manylinux-aarch64-image = "manylinux_2_28"
132119
environment = { CFTIME_LIMITED_API = "1" }

0 commit comments

Comments
 (0)