Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
node-version: '16'

- name: Install python dependecies
run: pip install cffi numba pytest
run: pip install cffi numba pytest charset-normalizer
- name: Install JS dependecies
run: cd $GITHUB_WORKSPACE/tests/js && npm install

Expand Down
2 changes: 1 addition & 1 deletion DEVELOP.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ PsychroLib is automatically tested at each commit using continuous integration.
There are a number of dependencies required to run the tests that need to be installed first. From you command prompt, navigate to the `psychrolib` folder and type the following (I assume that pip and python are for version 3.6 or greater):

```
pip install numpy m2r cffi pytest
pip install numpy m2r cffi pytest charset-normalizer
cd tests/js && npm install
cd ../..
```
Expand Down
7 changes: 3 additions & 4 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from pathlib import Path

import pytest
import numpy.f2py as f2py
import subprocess
import cffi


Expand All @@ -21,9 +21,8 @@
# Compile and import Fortran library
#########################################################
PATH_TO_LIB = Path(__file__).parents[1] / 'src' / 'fortran' / 'psychrolib.f90'
with open(str(PATH_TO_LIB), 'rb') as fid:
source = fid.read()
f2py.compile(source , modulename='psychrolib_fortran', extension='.f90')
subprocess.run(['f2py', '-c', '-m', 'psychrolib_fortran', str(PATH_TO_LIB)], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)

import psychrolib_fortran
psyf = psychrolib_fortran.psychrolib

Expand Down