From 525aad8c6640bc0538c64a7128f13c6733fd9729 Mon Sep 17 00:00:00 2001 From: Matthias Schulte-Althoff Date: Mon, 24 Jun 2024 11:51:36 +0200 Subject: [PATCH 1/4] model fix --- inflammation/models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/inflammation/models.py b/inflammation/models.py index 5169ac42d..0d7effa84 100644 --- a/inflammation/models.py +++ b/inflammation/models.py @@ -10,6 +10,7 @@ import numpy as np + def load_csv(filename): """Load a Numpy array from a CSV From 299d49c9d2bb33326f85e28fb6b32a26889bfe11 Mon Sep 17 00:00:00 2001 From: Matthias Schulte-Althoff Date: Thu, 4 Jul 2024 13:27:38 +0200 Subject: [PATCH 2/4] Add Pylint autotest --- .github/workflows/main.yml | 39 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 000000000..917014b98 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,39 @@ + +# Same key-value pairs as in "Defining Our Workflow" section +name: CI +on: push +jobs: + build: + + # Here we add the matrices definition: + strategy: + matrix: + os: ["ubuntu-latest", "macos-latest", "windows-latest"] + python-version: ["3.10", "3.11"] + + # Here we add the reference to the os matrix values + runs-on: ${{ matrix.os }} + + # Same key-value pairs as in "Defining Our Workflow" section + steps: + + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up Python + uses: actions/setup-python@v4 + with: + # Here we add the reference to the python-version matrix values + python-version: ${{ matrix.python-version }} + # Same steps as in "Defining Our Workflow" section + - name: Install Python dependencies + run: | + python3 -m pip install --upgrade pip + python3 -m pip install -r requirements.txt + - name: Test with PyTest + run: | + python3 -m pytest --cov=catchment.models tests/test_models.py + + - name: Check style with Pylint + run: | + python3 -m pylint --fail-under=0 --reports=y inflammation From 86918f0378021ece8ccb4ca4fc3331ea6a1ff6f2 Mon Sep 17 00:00:00 2001 From: Matthias Schulte-Althoff Date: Thu, 4 Jul 2024 13:30:17 +0200 Subject: [PATCH 3/4] Add Pylint autotest2 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 917014b98..0c818e8a6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,7 @@ jobs: python3 -m pip install -r requirements.txt - name: Test with PyTest run: | - python3 -m pytest --cov=catchment.models tests/test_models.py + python3 -m pytest --cov=inflammation.models tests/test_models.py - name: Check style with Pylint run: | From 0387bfd8cfe05c1986edc8426345556fc5e6b4b3 Mon Sep 17 00:00:00 2001 From: Matthias Schulte-Althoff Date: Thu, 4 Jul 2024 13:31:54 +0200 Subject: [PATCH 4/4] Change req --- requirements.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/requirements.txt b/requirements.txt index 8ec797e19..f6aa28154 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,18 +1,31 @@ +astroid==3.2.2 contourpy==1.2.1 +coverage==7.5.4 cycler==0.12.1 +dill==0.3.8 exceptiongroup==1.2.1 fonttools==4.53.0 importlib_resources==6.4.0 iniconfig==2.0.0 +isort==5.13.2 kiwisolver==1.4.5 matplotlib==3.9.0 +mccabe==0.7.0 numpy==2.0.0 packaging==24.1 +pandas==2.2.2 pillow==10.3.0 +platformdirs==4.2.2 pluggy==1.5.0 +pylint==3.2.3 pyparsing==3.1.2 pytest==8.2.2 +pytest-cov==5.0.0 python-dateutil==2.9.0.post0 +pytz==2024.1 six==1.16.0 tomli==2.0.1 +tomlkit==0.12.5 +typing_extensions==4.12.2 +tzdata==2024.1 zipp==3.19.2