Skip to content

Commit cb791af

Browse files
committed
Change README.rst version specifiers, Windows build instructions
Specify minimum scikit-build version. Updated Windows build instructions for Python 3.7, 3.8, and to use pytest.
1 parent 976b332 commit cb791af

1 file changed

Lines changed: 21 additions & 13 deletions

File tree

README.rst

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ following dependencies:
3232

3333
- Python 2.7, 3.5+
3434
- NumPy
35-
- scikit-build
35+
- scikit-build >= 0.10.0
3636
- CMake
3737
- C compiler (e.g. gcc, MS Visual C++)
3838
- FORTRAN compiler (e.g. gfortran, ifort, flang)
@@ -108,22 +108,30 @@ A similar method can be used for Linux and macOS, but is detailed here
108108
for Windows. This method uses conda and conda-forge to get most build
109109
dependencies, *except* for the C compiler.
110110

111-
First, install the appropriate Visual Studio compiler (see
112-
https://wiki.python.org/moin/WindowsCompilers ).
111+
This procedure has been tested on Python 3.7 and 3.8.
113112

114-
In the unpacked Slycot source directory, run the following commands.
115-
This example is for Python 3.5; adapt as required.
113+
First, install the `correct Visual Studio compiler for the Python
114+
version`_ you wish to build for.
116115

117-
conda create --channel conda-forge --name build-slycot-py35 python=3.5 scikit-build flang numpy scipy
118-
activate build-slycot-py35
116+
.. _correct Visual Studio compiler for the Python version: https://wiki.python.org/moin/WindowsCompilers
119117

120-
REM you won't need this if conda installs f2py.exe rather than f2py.cmd or f2py.bat
121-
where f2py > %TMP%\F2PYPATH.txt
122-
set /P F2PYPATH=< %TMP%\F2PYPATH.txt
118+
To build, you'll need a command shell setup for both conda and the
119+
Visual Studio build tools. See `conda activation`_ and `Microsoft
120+
Visual Studio setup`_ for information on this.
123121

124-
python setup.py install -- -DF2PY_EXECUTABLE=%F2PYPATH%
125-
cd slycot\tests
126-
python -m unittest -v
122+
.. _conda activation: https://docs.conda.io/projects/conda/en/latest/user-guide/troubleshooting.html#windows-environment-has-not-been-activated
123+
.. _Microsoft Visual Studio setup: https://docs.microsoft.com/en-us/cpp/build/setting-the-path-and-environment-variables-for-command-line-builds?view=vs-2019
124+
125+
In such a command shell, run the following commands to build and
126+
install Slycot (this example creates a Python 3.8 environment)::
127+
128+
conda create --channel conda-forge --name build-slycot python=3.8 numpy scipy libblas=*=*netlib liblapack=*=*netlib scikit-build flang pytest
129+
conda activate build-slycot
130+
131+
python setup.py install
132+
pytest
133+
134+
The final ``pytest`` command is optional; it runs the Slycot unit tests.
127135

128136
General notes on compiling
129137
~~~~~~~~~~~~~~~~~~~~~~~~~~

0 commit comments

Comments
 (0)