Skip to content

Commit d9daa53

Browse files
committed
Merge branch 'master' into 25/array-deepcopy
2 parents 31e08d8 + 6264b45 commit d9daa53

File tree

5 files changed

+64
-5
lines changed

5 files changed

+64
-5
lines changed

.github/problem-matchers/gcc.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "gcc-problem-matcher",
5+
"pattern": [
6+
{
7+
"regexp": "^\\s*(.*):(\\d+):(\\d+):\\s+(?:fatal\\s+)?(warning|error):\\s+(.*?(?:\\s+\\[(.*)\\])?)\\s*$",
8+
"file": 1,
9+
"line": 2,
10+
"column": 3,
11+
"severity": 4,
12+
"message": 5,
13+
"code": 6
14+
}
15+
]
16+
}
17+
]
18+
}

.github/problem-matchers/msvc.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "msvc-problem-matcher",
5+
"pattern": [
6+
{
7+
"regexp": "^\\s*(?:\\d+\\>)?([^\\s].*)\\((\\d+),?(\\d+)?(?:,\\d+,\\d+)?\\)\\s*:\\s+(error|warning)\\s+((\\w+\\d+)\\s*:\\s*.*?)\\s*$",
8+
"file": 1,
9+
"line": 2,
10+
"column": 3,
11+
"severity": 4,
12+
"message": 5,
13+
"code": 6
14+
}
15+
]
16+
}
17+
]
18+
}

.github/workflows/ci.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,11 @@ jobs:
2424
name: dist
2525
path: dist
2626
whl:
27-
name: Build / ${{ matrix.os }} / Python 3.${{ matrix.minor }}
27+
name: Build / ${{ matrix.os }} / Python ${{ matrix.major }}.${{ matrix.minor }}
2828
strategy:
2929
matrix:
3030
os: [macOS, Ubuntu, Windows]
31+
major: [3]
3132
minor: [6, 7, 8]
3233
runs-on: ${{ matrix.os }}-latest
3334
steps:
@@ -37,13 +38,18 @@ jobs:
3738
if: matrix.os == 'Ubuntu' && github.event_name == 'release' && github.event.action == 'published'
3839
with:
3940
platforms: all
40-
- uses: joerick/[email protected]
41+
- run: echo '::add-matcher::.github/problem-matchers/gcc.json'
42+
if: matrix.os == 'macOS' || matrix.os == 'Ubuntu'
43+
- run: echo '::add-matcher::.github/problem-matchers/msvc.json'
44+
if: matrix.os == 'Windows'
45+
- uses: joerick/[email protected]
4146
with:
4247
output-dir: dist
4348
env:
4449
CIBW_ARCHS: "${{ github.event_name == 'release' && github.event.action == 'published' && 'all' || 'auto' }}"
4550
CIBW_BEFORE_BUILD: pip install -r {project}/requirements.txt
46-
CIBW_BUILD: cp3${{ matrix.minor }}-*
51+
CIBW_BUILD: cp${{ matrix.major }}${{ matrix.minor }}-*
52+
CIBW_BUILD_VERBOSITY: 1
4753
CIBW_BEFORE_TEST: pip install -r {project}/requirements-test.txt
4854
CIBW_TEST_COMMAND: pytest {project}
4955
- uses: actions/upload-artifact@master

arraykit.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,25 @@
4141
return NULL;\
4242
} while (0)
4343

44+
# define _AK_DEBUG_BEGIN() \
45+
do { \
46+
fprintf(stderr, "XXX %s:%i:%s: ", __FILE__, __LINE__, __FUNCTION__);
47+
48+
# define _AK_DEBUG_END() \
49+
fprintf(stderr, "\n"); \
50+
fflush(stderr); \
51+
} while (0)
52+
53+
# define AK_DEBUG_OBJ(obj) \
54+
_AK_DEBUG_BEGIN(); \
55+
fprintf(stderr, #obj " = "); \
56+
PyObject_Print(obj, stderr, 0); \
57+
_AK_DEBUG_END()
58+
59+
# define AK_DEBUG(msg) \
60+
_AK_DEBUG_BEGIN(); \
61+
fprintf(stderr, #msg); \
62+
_AK_DEBUG_END()
4463

4564
# if defined __GNUC__ || defined __clang__
4665
# define AK_LIKELY(X) __builtin_expect(!!(X), 1)

tasks.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
import invoke
66

7-
8-
97
@invoke.task
108
def clean(context):
119
'''Clean doc and build artifacts

0 commit comments

Comments
 (0)