Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ce13dfc

Browse files
charrischarris
committed
wip
1 parent a8ceec7 commit ce13dfc

File tree

4 files changed

+53
-21
lines changed

4 files changed

+53
-21
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,9 @@ jobs:
6161
name: build numpy
6262
command: |
6363
. venv/bin/activate
64-
pip install --progress-bar=off --upgrade pip 'setuptools<49.2.0'
6564
pip install --progress-bar=off -r test_requirements.txt
6665
pip install --progress-bar=off -r doc_requirements.txt
67-
pip install .
66+
pip install . --config-settings=setup-args="-Dallow-noblas=true"
6867
6968
- run:
7069
name: create release notes

‎.github/workflows/wheels.yml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
# │ │ │ ┌───────────── month (1 - 12 or JAN-DEC)
2222
# │ │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
2323
# │ │ │ │ │
24-
- cron: "42 1 * * 4"
24+
- cron: "42 2 * * SUN,WED"
2525
push:
2626
pull_request:
2727
types: [labeled, opened, synchronize, reopened]
@@ -78,8 +78,7 @@ jobs:
7878
- [ubuntu-20.04, musllinux_x86_64]
7979
- [macos-12, macosx_x86_64]
8080
- [windows-2019, win_amd64]
81-
- [windows-2019, win32]
82-
python: ["cp39", "cp310", "cp311", "pp39"]
81+
python: ["cp39", "cp310", "cp311", "cp312"] # "pp39"
8382
exclude:
8483
# Don't build PyPy 32-bit windows
8584
- buildplat: [windows-2019, win32]
@@ -101,25 +100,20 @@ jobs:
101100
# https://github.com/actions/checkout/issues/338
102101
fetch-depth: 0
103102

103+
- name: pkg-config-for-win
104+
run: |
105+
choco install -y --checksum 6004DF17818F5A6DBF19CB335CC92702 pkgconfiglite
106+
if: runner.os == 'windows'
107+
104108
# Used to push the built wheels
105109
- uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
106110
with:
107111
python-version: "3.x"
108112

109-
# We need rtools 4.0 to have 32 bit support on windows
110-
- if: runner.os == 'windows'
111-
uses: r-windows/install-rtools@ca1090c210479e995c03019a22b9798cdf57073a # main
112-
113-
- name: setup rtools for 32-bit
114-
run: |
115-
echo "PLAT=i686" >> $env:GITHUB_ENV
116-
echo "PATH=c:\rtools40\mingw32\bin;$env:PATH" >> $env:GITHUB_ENV
117-
gfortran --version
118-
if: ${{ matrix.buildplat[1] == 'win32' }}
119-
120113
- name: Build wheels
121114
uses: pypa/cibuildwheel@f21bb8376a051ffb6cb5604b28ccaef7b90e8ab7 # v2.14.1
122115
env:
116+
CIBW_PRERELEASE_PYTHONS: True
123117
CIBW_BUILD: ${{ matrix.python }}-${{ matrix.buildplat[1] }}
124118

125119
- uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
@@ -192,12 +186,14 @@ jobs:
192186
python-version: "3.9"
193187
- name: Build sdist
194188
run: |
195-
python setup.py sdist
189+
python -m pip install -U pip build
190+
python -m build --sdist -Csetup-args=-Dallow-noblas=true
196191
- name: Test the sdist
197192
run: |
198193
# TODO: Don't run test suite, and instead build wheels from sdist
199194
# Depends on pypa/cibuildwheel#1020
200-
python -m pip install dist/*.gz
195+
python -m pip install dist/*.gz -Csetup-args=-Dallow-noblas=true
196+
pip install ninja
201197
pip install -r test_requirements.txt
202198
cd .. # Can't import numpy within numpy src directory
203199
python -c "import numpy, sys; print(numpy.__version__); sys.exit(numpy.test() is False)"

‎.github/workflows/windows_meson.yml

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ permissions:
1717
contents: read # to fetch code (actions/checkout)
1818

1919
jobs:
20-
meson:
21-
name: Meson windows build/test
20+
msvc_64bit_python_openblas:
21+
name: MSVC, x86-64, LP64 OpenBLAS
2222
runs-on: windows-2019
23-
# if: "github.repository == 'numpy/numpy'"
23+
if: "github.repository == 'numpy/numpy'"
2424
steps:
2525
- name: Checkout
2626
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
@@ -86,3 +86,38 @@ jobs:
8686
echo "LASTEXITCODE is '$LASTEXITCODE'"
8787
python -c "import numpy, sys; sys.exit(numpy.test(verbose=3) is False)"
8888
echo "LASTEXITCODE is '$LASTEXITCODE'"
89+
90+
msvc_32bit_python_openblas:
91+
name: MSVC, 32-bit Python, no BLAS
92+
runs-on: windows-2019
93+
if: "github.repository == 'numpy/numpy'"
94+
steps:
95+
- name: Checkout
96+
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
97+
with:
98+
submodules: recursive
99+
fetch-depth: 0
100+
101+
- name: Setup Python (32-bit)
102+
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
103+
with:
104+
python-version: '3.10'
105+
architecture: 'x86'
106+
107+
- name: Setup MSVC (32-bit)
108+
uses: bus1/cabuild/action/msdevshell@e22aba57d6e74891d059d66501b6b5aed8123c4d # v1
109+
with:
110+
architecture: 'x86'
111+
112+
- name: Build and install
113+
run: |
114+
python -m pip install . -v -Ccompile-args="-j2" -Csetup-args="-Dallow-noblas=true"
115+
116+
- name: Install test dependencies
117+
run: |
118+
python -m pip install -r test_requirements.txt
119+
120+
- name: Run test suite (fast)
121+
run: |
122+
cd tools
123+
python -m pytest --pyargs numpy -m "not slow" -n2

‎meson_options.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ option('blas', type: 'string', value: 'openblas',
22
description: 'option for BLAS library switching')
33
option('lapack', type: 'string', value: 'openblas',
44
description: 'option for LAPACK library switching')
5+
option('allow-noblas', type: 'boolean', value: false,
6+
description: 'If set to true, allow building with (slow!) internal fallback routines')
57
option('use-ilp64', type: 'boolean', value: false,
68
description: 'Use ILP64 (64-bit integer) BLAS and LAPACK interfaces')
79
option('blas-symbol-suffix', type: 'string', value: '',

0 commit comments

Comments
 (0)