Skip to content

Commit adc78e6

Browse files
Support Numpy 2.0 and bump to v0.6.7.post0 (#147)
* Added numpy >= 2.0.0 support for python_version > 3.8 * Bump version to v0.6.7.post0 * Clean {package}/osqp_sources/build before builds --------- Co-authored-by: Ian McInerney <[email protected]>
1 parent cc38014 commit adc78e6

File tree

5 files changed

+17
-4
lines changed

5 files changed

+17
-4
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ jobs:
4949
CIBW_BUILD: "cp3*"
5050
# Skip testing on arm64 Python 3.8 because it uses the x86_64 executable, not the arm executable
5151
CIBW_TEST_SKIP: "cp38-macosx_*:arm64"
52+
# Clean the build directory between builds
53+
CIBW_BEFORE_BUILD: >-
54+
rm -rf {package}/osqp_sources/build
5255
CIBW_ENVIRONMENT_LINUX: CMAKE_GENERATOR="Unix Makefiles"
5356
CIBW_ENVIRONMENT_MACOS: CMAKE_GENERATOR="Unix Makefiles" CMAKE_OSX_ARCHITECTURES=${{ matrix.osx_arch }}
5457
CIBW_ENVIRONMENT_WINDOWS: CMAKE_GENERATOR="Visual Studio 17 2022" CMAKE_GENERATOR_PLATFORM=x64

pyproject.toml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
[build-system]
2-
requires = ["oldest-supported-numpy", "setuptools>=40.8.0", "wheel", "setuptools_scm>=6.2", "qdldl"]
2+
requires = [
3+
# Building with numpy 2.0 is compatible with numpy 1.x, but it
4+
# is only available on Python 3.9+
5+
"numpy >= 2.0.0; python_version > '3.8'",
6+
"oldest-supported-numpy; python_version <= '3.8'",
7+
"scipy >= 0.13.2, !=1.12.0",
8+
"setuptools>=40.8.0",
9+
"setuptools_scm>=6.2",
10+
"wheel",
11+
"qdldl"
12+
]
313
build-backend = "setuptools.build_meta"
414

515
[tool.setuptools_scm]

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',
77+
version='0.6.7.post0',
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
2+
Python interface module for OSQP solver v0.6.7.post0
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"
333+
self._version = "0.6.7.post0"
334334

335335
@property
336336
def version(self):

0 commit comments

Comments
 (0)