Skip to content

Commit 361d480

Browse files
authored
Merge pull request #1 from tynanford/master
Update CI for debian 11-13
2 parents 796f7d7 + 0550f16 commit 361d480

File tree

6 files changed

+93
-2
lines changed

6 files changed

+93
-2
lines changed

.github/workflows/ci-scripts-build.yml

Lines changed: 80 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ env:
1111

1212
jobs:
1313
build-base:
14-
name: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.python }}/${{ matrix.extra }}
14+
name: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.profile }}/${{ matrix.python }}/${{ matrix.extra }}
1515
runs-on: ${{ matrix.os }}
16+
container: ${{ matrix.container }}
1617
# Set environment variables from matrix parameters
1718
env:
1819
CMP: ${{ matrix.cmp }}
@@ -33,6 +34,49 @@ jobs:
3334
base: "7.0"
3435
python: "3.7"
3536
profile: deb10
37+
container: "python:3.7"
38+
test: yes
39+
40+
- os: ubuntu-latest
41+
cmp: gcc
42+
configuration: default
43+
base: "7.0"
44+
python: "3.9"
45+
profile: deb11
46+
test: yes
47+
48+
- os: ubuntu-latest
49+
cmp: gcc
50+
configuration: default
51+
base: "7.0"
52+
python: "3.11"
53+
profile: deb12
54+
test: yes
55+
56+
- os: ubuntu-latest
57+
cmp: gcc
58+
configuration: default
59+
base: "7.0"
60+
python: "3.13"
61+
profile: deb13
62+
test: yes
63+
64+
- os: ubuntu-latest
65+
cmp: gcc
66+
configuration: default
67+
base: "7.0"
68+
python: "3.6"
69+
container: "python:3.6"
70+
profile: latest
71+
test: yes
72+
73+
- os: ubuntu-latest
74+
cmp: gcc
75+
configuration: default
76+
base: "7.0"
77+
python: "3.7"
78+
container: "python:3.7"
79+
profile: latest
3680
test: yes
3781

3882
- os: ubuntu-latest
@@ -59,6 +103,30 @@ jobs:
59103
profile: latest
60104
test: yes
61105

106+
- os: ubuntu-latest
107+
cmp: gcc
108+
configuration: default
109+
base: "7.0"
110+
python: "3.11"
111+
profile: latest
112+
test: yes
113+
114+
- os: ubuntu-latest
115+
cmp: gcc
116+
configuration: default
117+
base: "7.0"
118+
python: "3.12"
119+
profile: latest
120+
test: yes
121+
122+
- os: ubuntu-latest
123+
cmp: gcc
124+
configuration: default
125+
base: "7.0"
126+
python: "3.13"
127+
profile: latest
128+
test: yes
129+
62130
- os: macos-latest
63131
cmp: gcc
64132
configuration: default
@@ -72,20 +140,31 @@ jobs:
72140
configuration: default
73141
base: "3.15"
74142
python: "3.7"
143+
container: "python:3.7"
75144
profile: deb10
76145
test: yes
77146

147+
- os: ubuntu-latest
148+
cmp: gcc
149+
configuration: default
150+
base: "3.15"
151+
python: "3.13"
152+
profile: deb13
153+
test: yes
154+
78155
- os: ubuntu-latest
79156
cmp: gcc
80157
configuration: default
81158
base: "3.14"
82159
python: "3.7"
160+
container: "python:3.7"
83161
profile: deb10
84162
steps:
85163
- uses: actions/checkout@v3
86164
with:
87165
submodules: true
88166
- name: Set up Python ${{ matrix.python }}
167+
if: ${{ !matrix.container }}
89168
uses: actions/setup-python@v4
90169
with:
91170
python-version: ${{ matrix.python }}

devsupApp/src/dbfield.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ static PyArray_Descr* dbf2np[DBF_MENU+1];
4444
#define PyDataType_ELSIZE(descr) ((descr)->elsize)
4545
#define PyDataType_SET_ELSIZE(descr, size) (descr)->elsize = size
4646
#endif
47+
#ifndef NPY_CARRAY_RO
48+
#define NPY_CARRAY_RO NPY_ARRAY_CARRAY_RO
49+
#endif
50+
#ifndef NPY_CARRAY
51+
#define NPY_CARRAY NPY_ARRAY_CARRAY
52+
#endif
4753
#endif
4854

4955
typedef struct {

requirements-deb11.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
numpy==1.19.5
2+
nose2==0.9.2

requirements-deb12.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
numpy==1.24.2
2+
nose2==0.12.0

requirements-deb13.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
numpy==2.2.4
2+
nose2==0.15.1

0 commit comments

Comments
 (0)