always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add ortools and protobuf versions test to python examples archive

Browse Source
This commit is contained in:
Driss Lahlou
2016-08-04 21:07:14 +02:00
parent 6951f56f81
commit fd0b9e9e03
10 changed files with 127 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
makefiles/Makefile.csharp.mk
View File

@@ -427,6 +427,7 @@ ifeq ("$(SYSTEM)","win")
copy examples\data\quasigroup_completion\* temp\or-tools\examples\data\quasigroup_completion
copy tools\or-tools.nuspec temp\or-tools
$(SED) -i -e "s/VVVV/$(OR_TOOLS_VERSION)/g" temp\or-tools\or-tools.nuspec
$(SED) -i -e "s/PROTOBUF_TAG/$(PROTOBUF_TAG)/g" temp\or-tools\or-tools.nuspec
cd temp\or-tools && nuget pack or-tools.nuspec
cd temp\or-tools && nuget push Google.OrTools-$(OR_TOOLS_VERSION).nupkg
endif

66
makefiles/Makefile.python.mk
View File

@@ -24,7 +24,7 @@ ifeq ("$(PYTHON_VERSION)","35")
endif
# Main target
python: pycp pyalgorithms pygraph pylp
python: pyinit pycp pyalgorithms pygraph pylp
# Clean target
clean_python:
@@ -32,6 +32,7 @@ clean_python:
-$(DELREC) $(GEN_DIR)$Sortools$Sconstraint_solver$S*
-$(DELREC) $(GEN_DIR)$Sortools$Sgraph$S*
-$(DELREC) $(GEN_DIR)$Sortools$Slinear_solver$S*
-$(DEL) $(GEN_DIR)$Sortools$S__init__.py
-$(DEL) $(GEN_DIR)$Salgorithms$S*python_wrap*
-$(DEL) $(GEN_DIR)$Sconstraint_solver$S*python_wrap*
-$(DEL) $(GEN_DIR)$Sgraph$S*python_wrap*
@@ -47,6 +48,11 @@ clean_python:
-$(DEL) $(LIB_DIR)$S_pywrap*.$(SWIG_LIB_SUFFIX)
-$(DEL) $(OBJ_DIR)$Sswig$S*python_wrap.$O
pyinit: $(GEN_DIR)$Sortools$S__init__.py
$(GEN_DIR)$Sortools$S__init__.py:
$(COPY) $(SRC_DIR)$Sortools$S__init__.py $(GEN_DIR)$Sortools$S__init__.py
# pywrapknapsack_solver
pyalgorithms: $(LIB_DIR)/_pywrapknapsack_solver.$(SWIG_LIB_SUFFIX) $(GEN_DIR)/ortools/algorithms/pywrapknapsack_solver.py
@@ -206,53 +212,6 @@ endif
# Build stand-alone archive file for redistribution.
python_archive: python
-$(DELREC) temp
$(MKDIR) temp
$(MKDIR) temp$S$(INSTALL_DIR)
$(MKDIR) temp$S$(INSTALL_DIR)$Sexamples
$(MKDIR) temp$S$(INSTALL_DIR)$Sexamples$Sdata
$(MKDIR) temp$S$(INSTALL_DIR)$Sdummy
$(MKDIR) temp$S$(INSTALL_DIR)$Sortools
$(MKDIR) temp$S$(INSTALL_DIR)$Sortools$Sconstraint_solver
$(MKDIR) temp$S$(INSTALL_DIR)$Sortools$Slinear_solver
$(MKDIR) temp$S$(INSTALL_DIR)$Sortools$Sgraph
$(MKDIR) temp$S$(INSTALL_DIR)$Sortools$Salgorithms
$(COPY) src$Sgen$Sortools$Sconstraint_solver$S*.py temp$S$(INSTALL_DIR)$Sortools$Sconstraint_solver
$(COPY) src$Sgen$Sortools$Slinear_solver$Spywraplp.py temp$S$(INSTALL_DIR)$Sortools$Slinear_solver
$(COPY) src$Sgen$Sortools$Sgraph$Spywrapgraph.py temp$S$(INSTALL_DIR)$Sortools$Sgraph
$(COPY) src$Sgen$Sortools$Salgorithms$Spywrapknapsack_solver.py temp$S$(INSTALL_DIR)$Sortools$Salgorithms
$(COPY) examples$Spython$S*.py temp$S$(INSTALL_DIR)$Sexamples
$(TOUCH) temp$S$(INSTALL_DIR)$Sortools$S__init__.py
$(TOUCH) temp$S$(INSTALL_DIR)$Sortools$Sconstraint_solver$S__init__.py
$(TOUCH) temp$S$(INSTALL_DIR)$Sortools$Slinear_solver$S__init__.py
$(TOUCH) temp$S$(INSTALL_DIR)$Sortools$Sgraph$S__init__.py
$(TOUCH) temp$S$(INSTALL_DIR)$Sortools$Salgorithms$S__init__.py
$(COPY) tools$SREADME.python temp$S$(INSTALL_DIR)$SREADME
$(COPY) LICENSE-2.0.txt temp$S$(INSTALL_DIR)
$(COPY) tools$Ssetup.py temp$S$(INSTALL_DIR)
$(COPY) tools$Sdummy_ortools_dependency.cc temp$S$(INSTALL_DIR)$Sdummy
$(SED) -i -e 's/VVVV/$(OR_TOOLS_VERSION)/' temp$S$(INSTALL_DIR)$Ssetup.py
ifeq ($(SYSTEM),win)
copy src\gen\ortools\constraint_solver\_pywrapcp.pyd temp$S$(INSTALL_DIR)$Sortools$Sconstraint_solver
copy src\gen\ortools\linear_solver\_pywraplp.pyd temp$S$(INSTALL_DIR)$Sortools$Slinear_solver
copy src\gen\ortools\graph\_pywrapgraph.pyd temp$S$(INSTALL_DIR)$Sortools$Sgraph
copy src\gen\ortools\algorithms\_pywrapknapsack_solver.pyd temp$S$(INSTALL_DIR)$Sortools$Salgorithms
$(SED) -i -e 's/\.dll/\.pyd/' temp/$(INSTALL_DIR)/setup.py
-del temp\$(INSTALL_DIR)\setup.py-e
cd temp\$(INSTALL_DIR) && ..\..\tools\tar.exe -C ..\.. -c -v --exclude *svn* --exclude *roadef* examples\data | ..\..\tools\tar.exe xvm
cd temp && ..\tools\zip.exe -r ..\or-tools.python.$(INSTALL_PORT)-$(OR_TOOLS_VERSION).zip $(INSTALL_DIR)
else
cp lib$S_pywrapcp.$(SWIG_LIB_SUFFIX) temp$S$(INSTALL_DIR)$Sortools$Sconstraint_solver
cp lib$S_pywraplp.$(SWIG_LIB_SUFFIX) temp$S$(INSTALL_DIR)$Sortools$Slinear_solver
cp lib$S_pywrapgraph.$(SWIG_LIB_SUFFIX) temp$S$(INSTALL_DIR)$Sortools$Sgraph
cp lib$S_pywrapknapsack_solver.$(SWIG_LIB_SUFFIX) temp$S$(INSTALL_DIR)$Sortools$Salgorithms
$(SED) -i -e 's/\.dll/\.so/' temp/$(INSTALL_DIR)/setup.py
-rm temp/$(INSTALL_DIR)/setup.py-e
cd temp/$(INSTALL_DIR) && tar -C ../.. -c -v --exclude *svn* --exclude *roadef* examples/data | tar xvm
cd temp && tar -c -v -z --no-same-owner -f ../or-tools.python.$(INSTALL_PORT)-$(OR_TOOLS_VERSION).tar.gz $(INSTALL_DIR)
endif
python_examples_archive:
-$(DELREC) temp
$(MKDIR) temp
@@ -265,6 +224,9 @@ python_examples_archive:
$(COPY) LICENSE-2.0.txt temp$Sortools_examples
$(COPY) tools$Ssetup_data.py temp$Sortools_examples$Ssetup.py
$(SED) -i -e 's/VVVV/$(OR_TOOLS_VERSION)/' temp$Sortools_examples$Ssetup.py
$(COPY) tools$Scheck_python_deps.py temp$Sortools_examples
$(SED) -i -e 's/VVVV/$(OR_TOOLS_VERSION)/' temp$Sortools_examples$Scheck_python_deps.py
$(SED) -i -e 's/PROTOBUF_TAG/$(PROTOBUF_TAG)/' temp$Sortools_examples$Scheck_python_deps.py
-$(DEL) temp$Sortools_examples$Ssetup.py-e
ifeq ($(SYSTEM),win)
cd temp\ortools_examples && ..\..\tools\tar.exe -C ..\.. -c -v --exclude *svn* --exclude *roadef* examples\data | ..\..\tools\tar.exe xvm
@@ -289,7 +251,8 @@ pypi2_archive: python $(PATCHELF)
$(COPY) src$Sgen$Sortools$Slinear_solver$S*.py temp$Sortools$Sortools$Slinear_solver
$(COPY) src$Sgen$Sortools$Sgraph$Spywrapgraph.py temp$Sortools$Sortools$Sgraph
$(COPY) src$Sgen$Sortools$Salgorithms$Spywrapknapsack_solver.py temp$Sortools$Sortools$Salgorithms
$(TOUCH) temp$Sortools$Sortools$S__init__.py
$(COPY) $(GEN_DIR)$Sortools$S__init__.py temp$Sortools$Sortools$S__init__.py
$(SED) -i -e 's/VVVV/$(OR_TOOLS_VERSION)/' temp$Sortools$Sortools$S__init__.py
$(TOUCH) temp$Sortools$Sortools$Sconstraint_solver$S__init__.py
$(TOUCH) temp$Sortools$Sortools$Slinear_solver$S__init__.py
$(TOUCH) temp$Sortools$Sortools$Sgraph$S__init__.py
@@ -299,6 +262,7 @@ pypi2_archive: python $(PATCHELF)
$(COPY) LICENSE-2.0.txt temp$Sortools
$(COPY) tools$Ssetup.py temp$Sortools
$(SED) -i -e 's/VVVV/$(OR_TOOLS_VERSION)/' temp$Sortools$Ssetup.py
$(SED) -i -e 's/PROTOBUF_TAG/$(PROTOBUF_TAG)/' temp$Sortools$Ssetup.py
ifeq ($(SYSTEM),win)
copy src\gen\ortools\constraint_solver\_pywrapcp.pyd temp$Sortools$Sortools$Sconstraint_solver
copy src\gen\ortools\linear_solver\_pywraplp.pyd temp$Sortools$Sortools$Slinear_solver
@@ -355,7 +319,8 @@ pypi3_archive: python $(PATCHELF)
$(COPY) src$Sgen$Sortools$Slinear_solver$S*.py temp$Sortools$Sortools$Slinear_solver
$(COPY) src$Sgen$Sortools$Sgraph$Spywrapgraph.py temp$Sortools$Sortools$Sgraph
$(COPY) src$Sgen$Sortools$Salgorithms$Spywrapknapsack_solver.py temp$Sortools$Sortools$Salgorithms
$(TOUCH) temp$Sortools$Sortools$S__init__.py
$(COPY) $(GEN_DIR)$Sortools$S__init__.py temp$Sortools$Sortools$S__init__.py
$(SED) -i -e 's/VVVV/$(OR_TOOLS_VERSION)/' temp$Sortools$Sortools$S__init__.py
$(TOUCH) temp$Sortools$Sortools$Sconstraint_solver$S__init__.py
$(TOUCH) temp$Sortools$Sortools$Slinear_solver$S__init__.py
$(TOUCH) temp$Sortools$Sortools$Sgraph$S__init__.py
@@ -365,6 +330,7 @@ pypi3_archive: python $(PATCHELF)
$(COPY) LICENSE-2.0.txt temp$Sortools
$(COPY) tools$Ssetup_py3.py temp$Sortools$Ssetup.py
$(SED) -i -e 's/VVVV/$(OR_TOOLS_VERSION)/' temp$Sortools$Ssetup.py
$(SED) -i -e 's/PROTOBUF_TAG/$(PROTOBUF_TAG)/' temp$Sortools$Ssetup.py
ifeq ($(SYSTEM),win)
copy src\gen\ortools\constraint_solver\_pywrapcp.pyd temp$Sortools$Sortools$Sconstraint_solver
copy src\gen\ortools\linear_solver\_pywraplp.pyd temp$Sortools$Sortools$Slinear_solver

2
makefiles/Makefile.third_party.unix
View File

@@ -1,7 +1,7 @@
# SVN tags of dependencies to checkout.
GFLAGS_TAG = 2.1.2
PROTOBUF_TAG = 3.0.0-beta-4
PROTOBUF_TAG = 3.0.0
SPARSEHASH_TAG = 2.0.3
CBC_TAG = 2.9.8
SWIG_TAG = 3.0.10

2
makefiles/Makefile.third_party.win
View File

@@ -1,6 +1,6 @@
# tags of dependencies to checkout.
GFLAGS_TAG = master
PROTOBUF_TAG = 3.0.0-beta-3
PROTOBUF_TAG = 3.0.0
SPARSEHASH_TAG = 2.0.3
CBC_TAG = 2.9.8
ZLIB_TAG = 1.2.8

1
src/ortools/__init__.py
View File

@@ -0,0 +1 @@
__version__ = "VVVV"

69
tools/check_python_deps.py Normal file
View File

@@ -0,0 +1,69 @@
import sys
from six import print_
import inspect
from sys import executable
current_ortools_version = "VVVV"
minimum_protobuf_version = "PROTOBUF_TAG"
print_ ("Python path : " + sys.executable)
print_ ("Python version : " + sys.version + "\n")
def notinstalled(modulename):
return modulename + """ is not installed for \"""" + sys.executable + """\"
Please run \"easy_install --user """ + modulename + """\""""
def wrong_version(module, modulename, required_version):
return """
You're using an old version of """ + modulename + """ : """ + inspect.getfile(module) + """
The minimum required version is : """ + required_version + """
Please run \"""" + str(sys.executable) + """ setup.py install --user\" to upgrade
If the problem persits, then """ + inspect.getfile(module) + """ is binding the newely installed version of """ + modulename + """
You should either remove it, or use PYTHONPATH to manage your sys.path. If you decide to use PYTHONPATH, please do it to run the ortools examples as well.
Please check https://docs.python.org/3/tutorial/modules.html#the-module-search-path from more information."""
#try to import setuptools
try:
from setuptools import setup, Extension
from setuptools.command import easy_install
except ImportError:
raise ImportError("""setuptools is not installed for \"""" + sys.executable + """\"
Please follow this link for installing instructions :
https://pypi.python.org/pypi/setuptools
make sure you use \"""" + sys.executable + """\" during the installation""")
raise SystemExit
#try to import ortools
try:
import ortools
except ImportError:
print_ (notinstalled("ortools"))
raise SystemExit
#try to import protobuf
try:
import google.protobuf
except ImportError:
print_ (notinstalled("protobuf"))
raise SystemExit
#check ortools version
try:
if current_ortools_version > ortools.__version__:
raise Exception
print_ ("or-tools version : " + ortools.__version__)
print_ (inspect.getfile(ortools) + "\n")
except (AttributeError, Exception):
print_ (wrong_version(ortools, "ortools", current_ortools_version))
raise SystemExit
#check protobuf version
#print_(cmp(minimum_protobuf_version, google.protobuf.__version__) + "\n")
try:
if minimum_protobuf_version > google.protobuf.__version__:
raise Exception
print_ ("protobuf version : " + google.protobuf.__version__)
print_ (inspect.getfile(google.protobuf) + "\n")
except (AttributeError, Exception):
print_ (wrong_version(google.protobuf, "protobuf", minimum_protobuf_version))
raise SystemExit

2
tools/or-tools.nuspec
View File

@@ -11,7 +11,7 @@
<copyright>Copyright 2016 Google</copyright>
<tags>OperationsResearch MathProgramming LinearProgramming ConstraintProgramming .NET</tags>
<dependencies>
<dependency id="Google.Protobuf" version="3.0.0-beta3" />
<dependency id="Google.Protobuf" version="PROTOBUF_TAG" />
</dependencies>
</metadata>
<files>

15
tools/setup.py
View File

@@ -1,4 +1,15 @@
from setuptools import setup, Extension
from sys import executable
setuptools_import_error_message = """setuptools is not installed for """ + executable + """
Please follow this link for installing instructions :
https://pypi.python.org/pypi/setuptools
make sure you use \"""" + sys.executable + """\" during the installation"""
try:
from setuptools import setup, Extension
except ImportError:
raise ImportError(setuptools_import_error_message)
from os.path import join as pjoin
from os.path import dirname
@@ -25,7 +36,7 @@ setup(
'ortools.linear_solver',],
ext_modules = [dummy_module],
install_requires = [
'protobuf >= 3.0.0'],
'protobuf >= PROTOBUF_TAG'],
package_data = {
'ortools.constraint_solver' : ['_pywrapcp.dll'],
'ortools.linear_solver' : ['_pywraplp.dll'],

13
tools/setup_data.py
View File

@@ -1,4 +1,15 @@
from setuptools import setup, Extension
from sys import executable
setuptools_import_error_message = """setuptools is not installed for """ + executable + """
Please follow this link for installing instructions :
https://pypi.python.org/pypi/setuptools
make sure you use \"""" + sys.executable + """\" during the installation"""
try:
from setuptools import setup, Extension
except ImportError:
raise ImportError(setuptools_import_error_message)
from os.path import join as pjoin
from os.path import dirname
from sys import version_info

14
tools/setup_py3.py
View File

@@ -1,4 +1,14 @@
from setuptools import setup, Extension
from sys import executable
setuptools_import_error_message = """setuptools is not installed for """ + executable + """
Please follow this link for installing instructions :
https://pypi.python.org/pypi/setuptools"""
try:
from setuptools import setup, Extension
except ImportError:
raise ImportError(setuptools_import_error_message)
from os.path import join as pjoin
from os.path import dirname
@@ -25,7 +35,7 @@ setup(
'ortools.linear_solver',],
ext_modules = [dummy_module],
install_requires = [
'protobuf >= 3.0.0'],
'protobuf >= PROTOBUF_TAG'],
package_data = {
'ortools.constraint_solver' : ['_pywrapcp.dll'],
'ortools.linear_solver' : ['_pywraplp.dll'],