Skip to content

Commit

Permalink
As/v0.6.x.scipy (#151)
Browse files Browse the repository at this point in the history
scipy!=1.12.0 only in dev mode; CIBW_TEST_EXTRAS; bumped version to v0.6.7.post1
  • Loading branch information
AmitSolomonPrinceton authored Jul 23, 2024
1 parent adc78e6 commit 74932b5
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 8 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ jobs:
CIBW_ENVIRONMENT_MACOS: CMAKE_GENERATOR="Unix Makefiles" CMAKE_OSX_ARCHITECTURES=${{ matrix.osx_arch }}
CIBW_ENVIRONMENT_WINDOWS: CMAKE_GENERATOR="Visual Studio 17 2022" CMAKE_GENERATOR_PLATFORM=x64
CIBW_BUILD_VERBOSITY: 1
CIBW_TEST_EXTRAS: dev

- name: Build source
if: startsWith(matrix.os, 'ubuntu')
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/build_aarch64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ jobs:
python -m cibuildwheel --output-dir wheelhouse
env:
CIBW_ARCHS_LINUX: aarch64
CIBW_BEFORE_ALL: "yum -y update && yum install -y blas-devel lapack-devel suitesparse-devel"
CIBW_BEFORE_ALL: "rm -rf {package}/osqp_sources/build && yum -y update && yum install -y blas-devel lapack-devel suitesparse-devel"
CIBW_ENVIRONMENT_LINUX: CMAKE_GENERATOR="Unix Makefiles"
CIBW_BUILD_VERBOSITY: 1
CIBW_TEST_EXTRAS: dev

- name: Release to pypi
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
Expand Down
26 changes: 24 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,38 @@
[build-system]
build-backend = "setuptools.build_meta"
requires = [
# Building with numpy 2.0 is compatible with numpy 1.x, but it
# is only available on Python 3.9+
"numpy >= 2.0.0; python_version > '3.8'",
"oldest-supported-numpy; python_version <= '3.8'",
"scipy >= 0.13.2, !=1.12.0",

"setuptools>=40.8.0",
"setuptools_scm>=6.2",
"wheel",
"qdldl"
]
build-backend = "setuptools.build_meta"

[project]
name = "osqp"
dynamic = ["version", "dependencies"]
description = "OSQP: The Operator Splitting QP Solver"
readme = "README.rst"
authors = [
{ name = "Bartolomeo Stellato", email = "[email protected]" },
{ name = "Goran Banjac" },
]
classifiers = [
"License :: OSI Approved :: Apache Software License"
]

[project.optional-dependencies]
dev = [
# Unit tests fail on scipy 1.12.0
# see https://github.com/scipy/scipy/issues/20027
# We'll employ this extra when building wheels
# using cibuildwheel by setting CIBW_TEST_EXTRAS
"scipy!=1.12.0",
]

[tool.setuptools_scm]
write_to = "src/osqp/_version.py"
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
numpy >= 1.7
scipy >= 0.13.2, !=1.12.0
scipy >= 0.13.2
qdldl
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,6 @@ def readme():
package_dir={'': 'src'},
include_package_data=True, # Include package data from MANIFEST.in
install_requires=requirements,
license='Apache 2.0',
url="https://osqp.org/",
cmdclass={'build_ext': build_ext_osqp},
packages=find_namespace_packages(where='src'),
Expand Down
2 changes: 1 addition & 1 deletion src/osqp/codegen/files_to_generate/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def finalize_options(self):


setup(name='PYTHON_EXT_NAME',
version='0.6.7.post0',
version='0.6.7.post1',
author='Bartolomeo Stellato, Goran Banjac',
author_email='[email protected]',
description='This is the Python module for embedded OSQP: ' +
Expand Down
2 changes: 1 addition & 1 deletion src/osqp/interface.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Python interface module for OSQP solver v0.6.7.post0
Python interface module for OSQP solver v0.6.7.post1
"""
from __future__ import print_function
from builtins import object
Expand Down
2 changes: 1 addition & 1 deletion src/osqppurepy/_osqp.py
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ class OSQP(object):
work - workspace
"""
def __init__(self):
self._version = "0.6.7.post0"
self._version = "0.6.7.post1"

@property
def version(self):
Expand Down

0 comments on commit 74932b5

Please sign in to comment.