Skip to content

Commit ae50251

Browse files
authored
Remove conda pipeline and notebook (#159)
1 parent 13d9594 commit ae50251

File tree

12 files changed

+233
-595
lines changed

12 files changed

+233
-595
lines changed

.github/workflows/main.yml

Lines changed: 10 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -86,71 +86,27 @@ jobs:
8686
matrix:
8787
os: [ubuntu-18.04, windows-2019]
8888
python-version: [3.7, 3.8, 3.9]
89-
exclude:
90-
- os: ubuntu-18.04
91-
python-version: 3.7
92-
timeout-minutes: 20
89+
timeout-minutes: 15
9390

9491
steps:
9592
- uses: actions/checkout@v2
9693

94+
- name: Setup Python 3.x
95+
uses: actions/setup-python@v2
96+
with:
97+
python-version: ${{ matrix.python-version }}
98+
architecture: 'x64'
99+
97100
- name: Download python package
98101
uses: actions/download-artifact@v1
99102
with:
100103
name: python-wheel
101104

102-
- name: Setup Python ${{ matrix.python-version }}
103-
uses: conda-incubator/setup-miniconda@v2
104-
with:
105-
auto-update-conda: true
106-
python-version: ${{ matrix.python-version }}
107-
108105
- name: Run the Tests
109106
run: |
110-
conda activate test
111-
# Install test dependencies - update environment.yml if they changed
112-
conda env update --name=test --file=environment.yml
107+
pip install -r requirements.txt
113108
cd python-wheel
114-
python -m pip install pythonfmu*.whl
115-
python -m pytest --pyargs pythonfmu
109+
pip install pythonfmu*.whl
110+
pytest --pyargs pythonfmu
116111
cd ..
117112
shell: bash -l {0}
118-
119-
test-notebook:
120-
runs-on: ubuntu-latest
121-
122-
steps:
123-
- uses: actions/checkout@v2
124-
125-
- name: Cache conda packages for Linux
126-
if: startsWith(runner.os, 'Linux')
127-
uses: actions/cache@v2
128-
with:
129-
path: /usr/share/miniconda/pkgs
130-
key: ${{ runner.os }}-test-nb-cache-conda-pkgs-${{ hashFiles('binder/environment.yml') }}
131-
restore-keys: |
132-
${{ runner.os }}-test-nb-cache-conda-pkgs-
133-
${{ runner.os }}-test-nb-
134-
135-
- name: Setup Python
136-
uses: conda-incubator/setup-miniconda@v2
137-
with:
138-
auto-update-conda: true
139-
140-
- name: Run the Tests
141-
run: |
142-
conda activate test
143-
# Install binder dependencies - update binder/environment.yml if they changed
144-
cp binder/* .
145-
conda env update --name=test --file=environment.yml
146-
bash ./postBuild
147-
cd ./examples
148-
jupyter nbconvert --to notebook --execute demo.ipynb
149-
cd ..
150-
shell: bash -l {0}
151-
152-
- name: Archive executed notbook
153-
uses: actions/upload-artifact@v2
154-
with:
155-
name: nb-examples
156-
path: examples

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,6 @@ In this example a python class named `PythonSlave` that extends `Fmi2Slave` is d
126126
where `myproject` is an optional folder containing additional project files required by the python script.
127127
Project folders such as this will be recursively copied into the FMU. Multiple project files/folders may be added.
128128

129-
### Test it online
130-
131-
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/NTNU-IHB/PythonFMU/master?urlpath=lab/tree/examples/demo.ipynb)
132-
133129
### Note
134130

135131
PythonFMU does not bundle Python, which makes it a tool coupling solution.

binder/environment.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

binder/postBuild

Lines changed: 0 additions & 6 deletions
This file was deleted.

environment.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ channels:
22
- conda-forge
33
dependencies:
44
- fmpy
5-
- pyfmi
65
- pytest

examples/demo.ipynb

Lines changed: 0 additions & 427 deletions
This file was deleted.

pythonfmu/tests/test_csvslave.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33

44
from pythonfmu.csvbuilder import CsvFmuBuilder
55

6+
fmpy = pytest.importorskip(
7+
"fmpy", reason="fmpy is not available for testing the produced FMU"
8+
)
9+
610
EPS = 1e-7
711

812

913
def test_csvslave(tmp_path):
10-
fmpy = pytest.importorskip(
11-
"fmpy", reason="fmpy is not available for testing the produced FMU"
12-
)
1314

1415
csv_file = Path(__file__).parent / "data/csvdemo.csv"
1516

0 commit comments

Comments
 (0)