Skip to content

Commit 8f85a6c

Browse files
flexatoneflexatone
committed
0.5.1 RC 2
1 parent 5c7d288 commit 8f85a6c

File tree

5 files changed

+20
-109
lines changed

5 files changed

+20
-109
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 14 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -40,60 +40,20 @@ jobs:
4040
echo 'matrix_os=["macos-13", "ubuntu-22.04", "windows-2022"]' >> $GITHUB_OUTPUT
4141
fi
4242
43-
whl_3_8:
44-
name: Build / ${{ matrix.os }} / Python 3.${{ matrix.minor }}
43+
wheels:
44+
name: Build / ${{ matrix.os }} / Python 3.${{ matrix.python.minor }}
4545
needs: matrix_config
4646
strategy:
4747
fail-fast: false
4848
matrix:
4949
os: ${{ fromJson(needs.matrix_config.outputs.matrix_os) }}
50-
minor: [8]
51-
runs-on: ${{ matrix.os }}
52-
steps:
53-
- uses: actions/checkout@master
54-
- uses: actions/setup-python@master
55-
- run: echo '::add-matcher::.github/problem-matchers/gcc.json'
56-
if: startsWith(matrix.os, 'macos-') || startsWith(matrix.os, 'ubuntu-')
57-
- run: echo '::add-matcher::.github/problem-matchers/msvc.json'
58-
if: startsWith(matrix.os, 'windows-')
59-
60-
- uses: pypa/cibuildwheel@v2.16.2
61-
if: matrix.os != 'macos-13-xlarge'
62-
with:
63-
output-dir: dist
64-
env:
65-
CIBW_BUILD: cp3${{ matrix.minor }}-*
66-
CIBW_ARCHS_WINDOWS: x86 AMD64
67-
CIBW_ARCHS_MACOS: x86_64
68-
CIBW_BEFORE_BUILD: pip install -r {project}/requirements-build-3_08.txt
69-
CIBW_BEFORE_TEST: pip install -r {project}/requirements-dev-3_08.txt
70-
CIBW_TEST_COMMAND: pytest {project}/test
50+
python:
51+
- {minor: 8, req_build: 'requirements-build-3_08.txt', req_test: 'requirements-dev-3_08.txt'}
52+
- {minor: 9, req_build: 'requirements-build-3_11.txt', req_test: 'requirements-dev-3_11.txt'}
53+
- {minor: 10, req_build: 'requirements-build-3_11.txt', req_test: 'requirements-dev-3_11.txt'}
54+
- {minor: 11, req_build: 'requirements-build-3_11.txt', req_test: 'requirements-dev-3_11.txt'}
55+
- {minor: 12, req_build: 'requirements-build-3_12.txt', req_test: 'requirements-dev-3_12.txt'}
7156

72-
- run: pip install pipx
73-
if: matrix.os == 'macos-13-xlarge'
74-
- uses: pypa/cibuildwheel@v2.16.2
75-
if: matrix.os == 'macos-13-xlarge'
76-
with:
77-
output-dir: dist
78-
env:
79-
CIBW_BUILD: cp3${{ matrix.minor }}-macosx_arm64
80-
CIBW_BEFORE_BUILD: pip install -r {project}/requirements-build-3_08.txt
81-
CIBW_BEFORE_TEST: pip install -r {project}/requirements-dev-3_08.txt
82-
CIBW_TEST_COMMAND: pytest {project}/test
83-
84-
- uses: actions/upload-artifact@v3
85-
with:
86-
name: dist
87-
path: dist
88-
89-
whl_3_9_to_3_11:
90-
name: Build / ${{ matrix.os }} / Python 3.${{ matrix.minor }}
91-
needs: matrix_config
92-
strategy:
93-
fail-fast: false
94-
matrix:
95-
os: ${{fromJson(needs.matrix_config.outputs.matrix_os)}}
96-
minor: [9, 10, 11]
9757
runs-on: ${{ matrix.os }}
9858
steps:
9959
- uses: actions/checkout@master
@@ -108,57 +68,11 @@ jobs:
10868
with:
10969
output-dir: dist
11070
env:
111-
CIBW_BUILD: cp3${{ matrix.minor }}-*
71+
CIBW_BUILD: cp3${{ matrix.python.minor }}-*
11272
CIBW_ARCHS_WINDOWS: x86 AMD64
11373
CIBW_ARCHS_MACOS: x86_64
114-
CIBW_BEFORE_BUILD: pip install -r {project}/requirements-build-3_11.txt
115-
CIBW_BEFORE_TEST: pip install -r {project}/requirements-dev-3_11.txt
116-
CIBW_TEST_COMMAND: pytest {project}/test
117-
118-
- run: pip install pipx
119-
if: matrix.os == 'macos-13-xlarge'
120-
- uses: pypa/cibuildwheel@v2.16.2
121-
if: matrix.os == 'macos-13-xlarge'
122-
with:
123-
output-dir: dist
124-
env:
125-
CIBW_BUILD: cp3${{ matrix.minor }}-macosx_arm64
126-
CIBW_BEFORE_BUILD: pip install -r {project}/requirements-build-3_11.txt
127-
CIBW_BEFORE_TEST: pip install -r {project}/requirements-dev-3_11.txt
128-
CIBW_TEST_COMMAND: pytest {project}/test
129-
130-
- uses: actions/upload-artifact@v3
131-
with:
132-
name: dist
133-
path: dist
134-
135-
whl_3_12:
136-
name: Build / ${{ matrix.os }} / Python 3.${{ matrix.minor }}
137-
needs: matrix_config
138-
strategy:
139-
fail-fast: false
140-
matrix:
141-
os: ${{fromJson(needs.matrix_config.outputs.matrix_os)}}
142-
minor: [12]
143-
runs-on: ${{ matrix.os }}
144-
steps:
145-
- uses: actions/checkout@master
146-
- uses: actions/setup-python@master
147-
- run: echo '::add-matcher::.github/problem-matchers/gcc.json'
148-
if: startsWith(matrix.os, 'macos-') || startsWith(matrix.os, 'ubuntu-')
149-
- run: echo '::add-matcher::.github/problem-matchers/msvc.json'
150-
if: startsWith(matrix.os, 'windows-')
151-
152-
- uses: pypa/cibuildwheel@v2.16.2
153-
if: matrix.os != 'macos-13-xlarge'
154-
with:
155-
output-dir: dist
156-
env:
157-
CIBW_BUILD: cp3${{ matrix.minor }}-*
158-
CIBW_ARCHS_WINDOWS: AMD64 # testing requires pandas, which does not publish 3.12 32bit x86 wheels
159-
CIBW_ARCHS_MACOS: x86_64
160-
CIBW_BEFORE_BUILD: pip install -r {project}/requirements-build-3_12.txt
161-
CIBW_BEFORE_TEST: pip install -r {project}/requirements-dev-3_12.txt
74+
CIBW_BEFORE_BUILD: pip install -r {project}/${{ matrix.python.req_build }}
75+
CIBW_BEFORE_TEST: pip install -r {project}/${{ matrix.python.req_test }}
16276
CIBW_TEST_COMMAND: pytest {project}/test
16377

16478
- run: pip install pipx
@@ -168,9 +82,9 @@ jobs:
16882
with:
16983
output-dir: dist
17084
env:
171-
CIBW_BUILD: cp3${{ matrix.minor }}-macosx_arm64
172-
CIBW_BEFORE_BUILD: pip install -r {project}/requirements-build-3_12.txt
173-
CIBW_BEFORE_TEST: pip install -r {project}/requirements-dev-3_12.txt
85+
CIBW_BUILD: cp3${{ matrix.python.minor }}-macosx_arm64
86+
CIBW_BEFORE_BUILD: pip install -r {project}/${{ matrix.python.req_build }}
87+
CIBW_BEFORE_TEST: pip install -r {project}/${{ matrix.python.req_test }}
17488
CIBW_TEST_COMMAND: pytest {project}/test
17589

17690
- uses: actions/upload-artifact@v3

‎requirements-dev-3_08.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ numpy==1.19.5
22
pytest==7.1.2
33
pylint==2.7.4
44
invoke==1.4.0
5-
pandas==1.2.5
65
hypothesis==6.10.1

‎requirements-dev-3_11.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ numpy==1.23.5
22
pytest==7.1.2
33
pylint==2.7.4
44
invoke==1.4.0
5-
pandas==1.4.3
65
hypothesis==6.10.1

‎requirements-dev-3_12.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
numpy==1.26.2
22
pytest==7.1.2
33
invoke==2.2.0
4-
pandas==2.1.3
54
hypothesis==6.10.1

‎test/test_util.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import warnings
66
from io import StringIO
77
import numpy as np # type: ignore
8-
import pandas as pd
8+
# import pandas as pd # disable so as to compile 32 bit wheels for python 3.12
99

1010
from arraykit import resolve_dtype
1111
from arraykit import resolve_dtype_iter
@@ -345,12 +345,12 @@ def test_isna_element_c(self) -> None:
345345
self.assertFalse(isna_element(None, False))
346346
self.assertTrue(isna_element(None, True))
347347

348-
def test_isna_element_d(self) -> None:
349-
ts = pd.Timestamp('nat')
350-
self.assertTrue(isna_element(ts))
348+
# def test_isna_element_d(self) -> None:
349+
# ts = pd.Timestamp('nat')
350+
# self.assertTrue(isna_element(ts))
351351

352-
s1 = pd.Series((0,))
353-
self.assertFalse(isna_element(s1))
352+
# s1 = pd.Series((0,))
353+
# self.assertFalse(isna_element(s1))
354354

355355

356356
def test_isna_element_e(self) -> None:

0 commit comments

Comments
 (0)