Skip to content

Commit f8e6393

Browse files
committed
delete pyscipopt
1 parent 7cef83f commit f8e6393

35 files changed

+7
-280882
lines changed

pyproject.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ['setuptools', 'cython >=3.0.0']
2+
requires = ['setuptools', 'pyscipopt', 'cython >=3.0.0']
33
build-backend = "setuptools.build_meta"
44

55
[project]
@@ -38,15 +38,19 @@ version = {attr = "pygcgopt.__version__"}
3838

3939
[tool.cibuildwheel]
4040
skip="pp*" # currently doesn't work with PyPy
41+
test-command = "pytest tests"
42+
test-requires = ["pytest"]
4143

4244

4345
[tool.cibuildwheel.linux]
4446
skip="pp* cp36* cp37* *musllinux*"
4547
before-all = [
48+
"pip install pyscipopt",
49+
"pip show pyscipopt",
4650
"(apt-get update && apt-get install --yes wget) || yum install -y wget zlib libgfortran || brew install wget",
4751
"wget https://github.com/scipopt/scipoptsuite-deploy/releases/download/v0.4.0/libscip-gcg-linux.zip -O gcg.zip",
4852
"unzip gcg.zip",
49-
"mv scip_install gcg"
53+
"mv scip_install gcg",
5054
]
5155
environment = { SCIPOPTDIR="$(pwd)/gcg", GCGOPTDIR="$(pwd)/gcg", LD_LIBRARY_PATH="$(pwd)/gcg/lib:$LD_LIBRARY_PATH", DYLD_LIBRARY_PATH="$(pwd)/gcg/lib:$DYLD_LIBRARY_PATH", PATH="$(pwd)/gcg/bin:$PATH", PKG_CONFIG_PATH="$(pwd)/gcg/lib/pkgconfig:$PKG_CONFIG_PATH", RELEASE="true"}
5256

setup.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666

6767
use_cython = True
6868

69-
packagedirscip = os.path.join('src', 'pyscipopt')
7069
packagedirgcg = os.path.join('src', 'pygcgopt')
7170

7271
with open(os.path.join(packagedirgcg, '__init__.py'), 'r') as initfile:
@@ -92,14 +91,7 @@
9291
release_mode = os.getenv('RELEASE') == 'true'
9392
compile_with_line_tracing = on_github_actions and not release_mode
9493

95-
extensions = [Extension("pyscipopt.scip", [os.path.join(packagedirscip, f"scip{ext}")],
96-
include_dirs=includedirs,
97-
library_dirs=[sciplibdir],
98-
libraries=[sciplibname],
99-
extra_compile_args=extra_compile_args,
100-
extra_link_args=extra_link_args,
101-
define_macros= [("CYTHON_TRACE_NOGIL", 1), ("CYTHON_TRACE", 1)] if compile_with_line_tracing else []),
102-
Extension('pygcgopt.gcg', [os.path.join(packagedirgcg, 'gcg'+ext)],
94+
extensions = [Extension('pygcgopt.gcg', [os.path.join(packagedirgcg, 'gcg'+ext)],
10395
include_dirs=includedirs,
10496
library_dirs=list(set([sciplibdir, gcglibdir])),
10597
libraries=[sciplibname, gcglibname],

src/pyscipopt/Multidict.py

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/pyscipopt/__init__.py

Lines changed: 0 additions & 47 deletions
This file was deleted.

src/pyscipopt/_version.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/pyscipopt/benders.pxi

Lines changed: 0 additions & 212 deletions
This file was deleted.

0 commit comments

Comments
 (0)