Skip to content

Commit 74932b5

Browse files
As/v0.6.x.scipy (#151)
scipy!=1.12.0 only in dev mode; CIBW_TEST_EXTRAS; bumped version to v0.6.7.post1
1 parent adc78e6 commit 74932b5

File tree

8 files changed

+32
-8
lines changed

8 files changed

+32
-8
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ jobs:
5656
CIBW_ENVIRONMENT_MACOS: CMAKE_GENERATOR="Unix Makefiles" CMAKE_OSX_ARCHITECTURES=${{ matrix.osx_arch }}
5757
CIBW_ENVIRONMENT_WINDOWS: CMAKE_GENERATOR="Visual Studio 17 2022" CMAKE_GENERATOR_PLATFORM=x64
5858
CIBW_BUILD_VERBOSITY: 1
59+
CIBW_TEST_EXTRAS: dev
5960

6061
- name: Build source
6162
if: startsWith(matrix.os, 'ubuntu')

.github/workflows/build_aarch64.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ jobs:
3232
python -m cibuildwheel --output-dir wheelhouse
3333
env:
3434
CIBW_ARCHS_LINUX: aarch64
35-
CIBW_BEFORE_ALL: "yum -y update && yum install -y blas-devel lapack-devel suitesparse-devel"
35+
CIBW_BEFORE_ALL: "rm -rf {package}/osqp_sources/build && yum -y update && yum install -y blas-devel lapack-devel suitesparse-devel"
3636
CIBW_ENVIRONMENT_LINUX: CMAKE_GENERATOR="Unix Makefiles"
37+
CIBW_BUILD_VERBOSITY: 1
38+
CIBW_TEST_EXTRAS: dev
3739

3840
- name: Release to pypi
3941
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')

pyproject.toml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,38 @@
11
[build-system]
2+
build-backend = "setuptools.build_meta"
23
requires = [
34
# Building with numpy 2.0 is compatible with numpy 1.x, but it
45
# is only available on Python 3.9+
56
"numpy >= 2.0.0; python_version > '3.8'",
67
"oldest-supported-numpy; python_version <= '3.8'",
7-
"scipy >= 0.13.2, !=1.12.0",
8+
89
"setuptools>=40.8.0",
910
"setuptools_scm>=6.2",
1011
"wheel",
1112
"qdldl"
1213
]
13-
build-backend = "setuptools.build_meta"
14+
15+
[project]
16+
name = "osqp"
17+
dynamic = ["version", "dependencies"]
18+
description = "OSQP: The Operator Splitting QP Solver"
19+
readme = "README.rst"
20+
authors = [
21+
{ name = "Bartolomeo Stellato", email = "[email protected]" },
22+
{ name = "Goran Banjac" },
23+
]
24+
classifiers = [
25+
"License :: OSI Approved :: Apache Software License"
26+
]
27+
28+
[project.optional-dependencies]
29+
dev = [
30+
# Unit tests fail on scipy 1.12.0
31+
# see https://github.com/scipy/scipy/issues/20027
32+
# We'll employ this extra when building wheels
33+
# using cibuildwheel by setting CIBW_TEST_EXTRAS
34+
"scipy!=1.12.0",
35+
]
1436

1537
[tool.setuptools_scm]
1638
write_to = "src/osqp/_version.py"

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
numpy >= 1.7
2-
scipy >= 0.13.2, !=1.12.0
2+
scipy >= 0.13.2
33
qdldl

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ def readme():
265265
package_dir={'': 'src'},
266266
include_package_data=True, # Include package data from MANIFEST.in
267267
install_requires=requirements,
268-
license='Apache 2.0',
269268
url="https://osqp.org/",
270269
cmdclass={'build_ext': build_ext_osqp},
271270
packages=find_namespace_packages(where='src'),

src/osqp/codegen/files_to_generate/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def finalize_options(self):
7474

7575

7676
setup(name='PYTHON_EXT_NAME',
77-
version='0.6.7.post0',
77+
version='0.6.7.post1',
7878
author='Bartolomeo Stellato, Goran Banjac',
7979
author_email='[email protected]',
8080
description='This is the Python module for embedded OSQP: ' +

src/osqp/interface.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
Python interface module for OSQP solver v0.6.7.post0
2+
Python interface module for OSQP solver v0.6.7.post1
33
"""
44
from __future__ import print_function
55
from builtins import object

src/osqppurepy/_osqp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ class OSQP(object):
330330
work - workspace
331331
"""
332332
def __init__(self):
333-
self._version = "0.6.7.post0"
333+
self._version = "0.6.7.post1"
334334

335335
@property
336336
def version(self):

0 commit comments

Comments
 (0)