From f10fe979cecf8c779e73cc05397a75bea086babd Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Wed, 12 Apr 2023 10:35:48 +0300 Subject: [PATCH 1/4] Separated lint and test to 2 files --- .github/workflows/lint.yml | 25 +++++++++++++++++++++++++ .github/workflows/test.yml | 4 ++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/lint.yml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..41df0de --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,25 @@ +name: Lint +on: + - push + - pull_request +jobs: + lint: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest] + python-version: ["3.10"] + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements_dev.txt + - name: Lint with mypy + run: mypy FOSSDB_web + - name: Lint with flake8 + run: flake8 FOSSDB_web diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b1a1554..365ee12 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,6 +18,6 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install tox tox-gh-actions + pip install -r requirements.txt - name: Test with tox - run: tox + run: python manage.py test From 623c5e22aed5c1c552b08d52345f234539479c03 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Wed, 12 Apr 2023 10:45:21 +0300 Subject: [PATCH 2/4] Fix tests --- .github/workflows/lint.yml | 4 ++-- .github/workflows/test.yml | 4 ++-- FOSSDB_web/apps/fossdb/admin.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 41df0de..521effb 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,7 +3,7 @@ on: - push - pull_request jobs: - lint: + test: runs-on: ${{ matrix.os }} strategy: matrix: @@ -18,7 +18,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -r requirements_dev.txt + pip install mypy flake8 - name: Lint with mypy run: mypy FOSSDB_web - name: Lint with flake8 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 365ee12..a410855 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,6 +18,6 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -r requirements.txt - - name: Test with tox + pip install django + - name: Test with django test run: python manage.py test diff --git a/FOSSDB_web/apps/fossdb/admin.py b/FOSSDB_web/apps/fossdb/admin.py index 4730425..ea74c31 100644 --- a/FOSSDB_web/apps/fossdb/admin.py +++ b/FOSSDB_web/apps/fossdb/admin.py @@ -1,4 +1,4 @@ -# from django.contrib import admin +from django.contrib import admin from .host.models import HostingPlatform, ProjectHostingPlatform from .language.models import ProgrammingLanguage, ProjectProgrammingLanguage From 4509ee531328e3fc13156cd9c7e4278b53b696ab Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Wed, 12 Apr 2023 10:46:57 +0300 Subject: [PATCH 3/4] Install requirements for tests --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a410855..88ecea3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,6 +18,6 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install django + pip install -r requirements.txt - name: Test with django test run: python manage.py test From 8439fa56bc14aecf23a6e8ee09859b1a1e79af86 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Wed, 12 Apr 2023 10:47:54 +0300 Subject: [PATCH 4/4] Added lint to README --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 208f8d4..3772914 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # FOSSDB -[![License](https://img.shields.io/badge/license-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html) -![Tests](https://github.com/kristoferssolo/FOSSDB-Web/actions/workflows/test.yml/badge.svg) +[![License](https://img.shields.io/badge/license-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html) +![Tests](https://github.com/kristoferssolo/FOSSDB-Web/actions/workflows/test.yml/badge.svg) +![Lint](https://github.com/kristoferssolo/FOSSDB-Web/actions/workflows/lint.yml/badge.svg) FOSSDB is an open-source web application that helps users find, contribute, and collaborate on free and open-source software (FOSS) projects.