Commit graph

37 commits

Author SHA1 Message Date
Ray Speth
e94ec95988 [Python] Specify python executable to be used in shebang line for scripts
This fixes a bug in the Windows installer where the path to python.exe on the
machine where the installer is built is used, and also allows us generate
different shebang lines for the Python 2 and Python 3 modules.

Fixes Issue 247.
2015-01-06 23:37:30 +00:00
Ray Speth
da35e24151 [SCons] Re-cythonize after changes to header files 2014-10-29 15:36:28 +00:00
Bryan W. Weber
eeab08d683 Allow auto conversion of Python examples on Windows
3to2 cannot be called as an executable on Windows, but it can be called
as a script. Assume that the 3to2 script is installed in
PYTHONROOT\Scripts, which is the default for installation by pip.
2014-08-25 18:41:56 +00:00
Ray Speth
4f3dd0624f [SCons] Fix build errors when path to Python contains spaces 2014-07-25 18:32:54 +00:00
Ray Speth
217b396ec5 [Python] Fix to conversion of samples from Python 3 to Python 2
Some calls to the print function weren't being converted to print statements
correctly by 3to2, so now we use the alternative fix, which is to use the
backported print function.

Fixes Issue 216.
2014-05-23 22:46:59 +00:00
Ray Speth
c621d5f9db [SCons] Fix dependency resolution for some Python files 2014-05-07 21:56:57 +00:00
Ray Speth
6e72f8930f [SCons] Fix Cython module compilation with MinGW 2014-02-24 03:25:30 +00:00
Ray Speth
3e073aae27 [SCons] Force relink of Python extension when necessary 2014-02-21 19:07:58 +00:00
Ray Speth
aad284cce7 [SCons] Fix library linking issues under Cygwin 2014-02-20 03:01:01 +00:00
Ray Speth
eaceaf7b86 [SCons] Use SCons to compile the Cython extension
Fixes issues with mismatched compilers between the Cython extension and the
cantera library, especially on OS X. Improves build dependency resolution to
eliminate unnecessary recompilation of _cantera.cpp.
2014-01-31 23:15:17 +00:00
Ray Speth
d4a9ca0847 [SCons] Fix simultaneous compilation of Python 2 and Python 3 modules
Use separate SCons Environments so the 'py_include_dirs' variable (which
contains the Numpy include directory) can be distinct for each Python module.
2014-01-30 00:48:03 +00:00
Ray Speth
b5e540c903 [Python] Remove the legacy Python module 2013-12-09 01:35:08 +00:00
Ray Speth
6d5b7999de [SCons] Use specified 'python_compiler' to link Python module
Fixes Issue 179.
2013-10-15 17:06:35 +00:00
Ray Speth
f871dd8cf0 [SCons] Add 'python_compiler' option for Cython module compilation 2013-10-15 14:59:31 +00:00
Ray Speth
2de0ae6350 [SCons/Cython] Fix library_dirs to include BLAS/LAPACK directory 2013-09-30 01:54:12 +00:00
Ray Speth
1cedf904df [Doc] Add all Python examples to the Sphinx docs 2013-08-22 21:46:27 +00:00
Ray Speth
32ea4fd924 [SCons] Fix to skip Python startup messages
This fixes an issue when the Python interpreter prints startup messages that
appear before the expected output lines. Known to be a problem with the Anaconda
Python distribution.
2013-08-16 17:25:04 +00:00
Ray Speth
a22ceda566 [Scons] Fix build order dependencies for python modules 2013-08-14 17:55:51 +00:00
Ray Speth
f320290c51 [SCons] Fix Python module path in setup_cantera and post-install message
In particular, this fixes paths for Linux distros that put Python modules in
'lib64/pythonX.Y/site-packages'.

Also fixes the reported installation path for the Python module on Windows.
2013-07-29 01:37:57 +00:00
Ray Speth
a616d4f55f [Test] Fix dependencies so Cython tests run after rebuilding 2013-07-16 22:09:53 +00:00
Ray Speth
4591159cd9 [SCons] Install script for running MixMaster with new Python module 2013-06-21 20:59:00 +00:00
Ray Speth
440bf4a8d1 Add current version of MixMaster to the Cython package
Note that this currently doesn't work at all, due to both Python 3 compatibility
issues as well as the changes to the Cantera Python API
2013-06-21 20:58:22 +00:00
Ray Speth
84aaec1417 [Cython] Install ck2cti.py and wrapper script 2013-06-21 20:58:15 +00:00
Ray Speth
9e9fe849bc Install ctml_writer with Cython module 2013-06-08 02:01:18 +00:00
Ray Speth
c084148b0e [SCons] Python module can be installed to user's site-packages directory
Setting the scons options 'python_prefix=USER' or 'python3_prefix=USER' will
pass the '--user' flag to setup.py, causing the Python module to be installed to
a platform-specific directory on the user's module path.
2013-03-04 17:31:08 +00:00
Ray Speth
1bdf50625d [Cython] Fixed specification of the Accelerate framework on OS X 2013-02-07 23:40:28 +00:00
Ray Speth
89406c2410 [SCons] Udated coverage testing to include the Cython module
Also, exclude the code in the 'test' and 'test_problems' directories from the
coverage statistics.
2013-01-11 22:56:52 +00:00
Ray Speth
a852400384 [SCons] Build the Cython module with debug symbols when requested 2012-12-26 23:56:01 +00:00
Ray Speth
4991ada305 [SCons] Refactored configuration/compilation of the Cython module 2012-12-26 23:55:48 +00:00
Ray Speth
dafcc9e024 [SCons] Specify the compiler to use for the Cython module
This fixes problems encountered when using EPD on Windows, where the
default compiler for Python is MinGW.
2012-12-26 23:55:46 +00:00
Ray Speth
b277818347 [Cython] Added infrastructure for installing examples
This includes automatic conversion of the samples from Python 3 syntax to Python
2 syntax when building the Python 2 version of the module and the "3to2" script
is available.
2012-12-18 00:03:03 +00:00
Ray Speth
777d10ddb8 Fixed parsing Python configuration variables on Windows
str.splitlines() works on all types of newline characters
2012-09-06 19:59:54 +00:00
Ray Speth
c28a00be6e Changes to non-compiled files no longer require rebuilding the Cython extension 2012-09-06 19:59:14 +00:00
Ray Speth
f82c6e50c7 SCons runs the unit tests for the Cython module 2012-09-06 19:58:32 +00:00
Ray Speth
208b8edad8 SCons installs the new Python module 2012-09-06 19:58:26 +00:00
Ray Speth
a0fdaa9f8a SCons builds the new Python module with Python 2 and Python 3 simultaneously 2012-09-06 19:58:22 +00:00
Ray Speth
11fd72c26f SCons now builds the Cython-based Python 3 package 2012-09-06 19:58:03 +00:00