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
14 changes: 9 additions & 5 deletions .github/workflows/ci_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,29 @@ jobs:
runs-on: ubuntu-latest
strategy:
max-parallel: 5
matrix:
python-version: [ "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v3
- uses: conda-incubator/setup-miniconda@v2
- name: Checkout github repo
uses: actions/checkout@v4
- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
python-version: 3.8
python-version: ${{ matrix.python-version }}
miniforge-version: latest
- name: Conda info
shell: bash -el {0}
run: conda info
- name: Install python and gcc
shell: bash -el {0}
run: |
conda install -c conda-forge python=3.8
conda install -c conda-forge gcc=12.1.0
- name: Install gdal and pcraster
shell: bash -el {0}
run: |
conda install -c conda-forge "gdal<=3.5.3" pcraster
conda install -c conda-forge gdal pcraster
- name: Install dependencies
shell: bash -el {0}
run: |
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
European Union Public Licence V. 1.2

EUPL © the European Union 2007, 2016
EUPL © the European Union 2007, 2026

This European Union Public Licence (the ‘EUPL’) applies to the Work (as
defined below) which is provided under the terms of this Licence. Any use of
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ You can use conda environment to easily install dependencies.
* Create a conda env named "lisflood" and install dependencies:

```bash
conda create --name lisflood python=3.8 -c conda-forge
conda create --name lisflood "python>=3.10" -c conda-forge
conda activate lisflood
conda install -c conda-forge pcraster "gdal<=3.5.3"
conda install -c conda-forge pcraster gdal
```

* Install lisflood-model pypi package
Expand All @@ -51,9 +51,9 @@ git clone --single-branch --branch master https://github.com/ec-jrc/lisflood-cod
* **Install requirements into a python 3 conda env**

```bash
conda create --name lisflood python=3.8 -c conda-forge
conda create --name lisflood "python>=3.10" -c conda-forge
conda activate lisflood
conda install -c conda-forge pcraster "gdal<=3.5.3"
conda install -c conda-forge pcraster gdal
cd lisflood-code
pip install -r requirements.txt
```
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.3.1.505
4.3.1.5052
4 changes: 2 additions & 2 deletions docs/3_step2_installation/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ Follow this instruction for a basic test (some sample catchments are included in
2. **Install requirements into a python 3 conda env**

```bash
conda create --name lisflood python=3.8 -c conda-forge
conda create --name lisflood python=3.10 -c conda-forge
conda activate lisflood
conda install -c conda-forge pcraster "gdal<=3.5.3"
conda install -c conda-forge pcraster gdal
cd lisflood-code
pip install -r requirements.txt
```
Expand Down
4 changes: 2 additions & 2 deletions envflex.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: lisflood
channels:
- conda-forge
dependencies:
- python=3.8
- python>=3.10
- pcraster
- gdal<=3.5.3
- gdal
- pip
Loading
Loading