Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/MilanSkocic/iapws into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
MilanSkocic committed Nov 20, 2023
2 parents 3ed25d2 + 885a044 commit d072d2b
Show file tree
Hide file tree
Showing 4 changed files with 81 additions and 3 deletions.
73 changes: 73 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
name: CI

on:
push:
branches: [ "main", "dev" ]
pull_request:
branches: [ "main", "dev" ]

jobs:
linux:
runs-on: ubuntu-latest
steps:
- name: Gfortran
run: |
sudo update-alternatives \
--install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \
--slave /usr/bin/gfortran gfortran /usr/bin/gfortran-10 \
--slave /usr/bin/gcov gcov /usr/bin/gcov-10
- name: Set FPM
uses: fortran-lang/setup-fpm@v5
with:
fpm-version: "v0.9.0"
- name: Gfortran version
run : gfortran --version
- name: Checkout
uses: actions/checkout@v4
- name: Compile
run: |
. ./configure.sh
make
macos:
runs-on: macos-latest
steps:
- name: Gfortran
run: |
brew reinstall gcc@10 gcc@13
- name: Set FPM
uses: fortran-lang/setup-fpm@v5
with:
fpm-version: "v0.9.0"
- name: Gfortran version
run : gfortran --version
- name: Checkout
uses: actions/checkout@v4
- name: Compile
run: |
. ./configure.sh
make
windows:
runs-on: windows-latest
defaults:
run:
shell: msys2 {0}
steps:
- name: MSYS2, Gfortran, fpm
uses: msys2/setup-msys2@v2
with:
msystem: MINGW64
install: >-
mingw-w64-x86_64-gcc-fortran
mingw-w64-x86_64-fpm
git
make
- name: Gfortran version
run : gfortran --version
- name: Checkout
uses: actions/checkout@v4
- name: Compile
run: |
. ./configure.sh
make
7 changes: 6 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
.. |cidev| image:: https://github.com/MilanSkocic/iapws/actions/workflows/ci.yml/badge.svg?branch=dev
.. |cimain| image:: https://github.com/MilanSkocic/iapws/actions/workflows/ci.yml/badge.svg?branch=main

dev |cidev| / main |cimain|

Introduction
================

.. image:: ./media/logo-iapws.png
:width: 200

.. readme_inclusion_start
`ipaws` is a Fortran library providing the formulas for computing light and heavy water properties.
Expand Down
2 changes: 1 addition & 1 deletion documentation/sphinx/source/api/iapws.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Fortran
.. literalinclude:: ../../../../src/iapws_g704.f90
:language: Fortran

* `iapws_g704.f90`: C API for the IAPWS module.
* `iapws_g704_capi.f90`: C API for the IAPWS module.

.. literalinclude:: ../../../../src/iapws_g704_capi.f90
:language: Fortran
Expand Down
2 changes: 1 addition & 1 deletion pywrapper/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ Source = "https://github.com/MilanSkocic/iapws"
where = ["."]

[tool.setuptools.package-data]
pycodata = ["libiapws.*"]
pyiapws = ["libiapws.*"]

0 comments on commit d072d2b

Please sign in to comment.