Skip to content

Commit

Permalink
add ninja prereqs
Browse files Browse the repository at this point in the history
  • Loading branch information
scivision committed Nov 12, 2019
1 parent 498c8d6 commit 7b9eaa7
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 19 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Install Prereqs
run: |
sudo apt update -yq
sudo apt install -yq --no-install-recommends ninja-build gfortran
sudo apt install -yq --no-install-recommends gfortran
- run: pip install .[tests,lint]
- run: flake8
- run: mypy .
Expand All @@ -37,7 +37,7 @@ jobs:
- uses: actions/setup-python@v1
with:
python-version: '3.x'
- run: brew install gcc ninja
- run: brew install gcc
- run: pip install .[tests]
- run: pytest
working-directory: tests
Expand All @@ -52,7 +52,6 @@ jobs:
- uses: actions/setup-python@v1
with:
python-version: '3.x'
- run: cinst -y ninja
- run: pip install .[tests]
- run: pytest
working-directory: tests
Expand Down
20 changes: 5 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ This process is used for the Python and [Matlab](#matlab) access to MSIS.
Any Fortran compiler should work.
Fortran compiler may be installed by

* MacOS / Homebrew: `brew install gcc ninja`
* Linux: `apt install gfortran ninja-build`
* [Windows](https://www.scivision.dev/windows-gcc-gfortran-cmake-make-install/) and extract [ninja](https://github.com/ninja-build/ninja/releases) to your PATH.
* MacOS / Homebrew: `brew install gcc`
* Linux: `apt install gfortran`
* [Windows](https://www.scivision.dev/windows-gcc-gfortran-cmake-make-install/)

Get MSISE00 and install Python package:

Expand All @@ -44,10 +44,8 @@ git clone https://github.com/space-physics/msise00
python -m pip install -e msise00
```

### Build on Run

The Fortran code will *automatically compile* on first `import msise00`.
This does not use setuptools and so is OS / Python distribution method agnostic.
This Python module uses our build-on-run technique.
The first time you use this Python module, you will see messages from the Meson build system.


## Examples
Expand Down Expand Up @@ -113,14 +111,6 @@ Optionally, verify Matlab is working by from the top `msise00/` directory in Ter
matlab -batch runtests('tests')
```

## Fortran source

The MSISE00 Fortran source code may also be used directly.
We have provided for easy code reuse in
[CMake](./CMakeLists.txt)
and
[Meson](./meson.build)
projects.

## Reference

Expand Down
3 changes: 2 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = msise00
version = 1.7.0
version = 1.7.1
description = Python API for Fortran MSISE-00 neutral atmosphere model.
author = Michael Hirsch, Ph.D.
author_email = scivision@users.noreply.github.com
Expand Down Expand Up @@ -31,6 +31,7 @@ include_package_data = True
zip_safe = False
install_requires =
meson
ninja
python-dateutil
numpy
xarray
Expand Down

0 comments on commit 7b9eaa7

Please sign in to comment.