Skip to content

Commit

Permalink
try using the system executable
Browse files Browse the repository at this point in the history
  • Loading branch information
bqpd committed Sep 4, 2019
1 parent 470764f commit 56611d2
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 210 deletions.
1 change: 0 additions & 1 deletion MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ gpkit/build.py
gpkit/exceptions.py
gpkit/globals.py
gpkit/keydict.py
gpkit/modified_ctypesgen.py
gpkit/repr_conventions.py
gpkit/small_classes.py
gpkit/small_scripts.py
Expand Down
4 changes: 2 additions & 2 deletions gpkit/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ def build(self):
"Builds a dynamic library to GPKITBUILD or $HOME/.gpkit"
try:
# Testing the import, so the variable is intentionally not used
import ctypesgencore # pylint: disable=unused-variable
import ctypesgen # pylint: disable=unused-variable
except ImportError:
log("## SKIPPING MOSEK INSTALL: CTYPESGENCORE WAS NOT FOUND")
return None
Expand Down Expand Up @@ -275,7 +275,7 @@ def build(self):

log("#\n# Building Python bindings for expopt and Mosek...")
log("# (if this fails on Windows, verify the mingw version)")
built_expopt_h = call("python modified_ctypesgen.py -a" +
built_expopt_h = call("ctypesgen -a" +
" -l " + pathjoin(solib_dir, "expopt.so").replace("\\", "/") + # pylint: disable=line-too-long
' -l "' + self.lib_path.replace("\\", "/") + '"' +
" -o "+pathjoin(lib_dir, "expopt_h.py") +
Expand Down
207 changes: 0 additions & 207 deletions gpkit/modified_ctypesgen.py

This file was deleted.

0 comments on commit 56611d2

Please sign in to comment.