From b30a7eb3e64d063766847ff9734d3aa4dbc9f321 Mon Sep 17 00:00:00 2001 From: iamashwin99 <ashwin-kumar.karnad@mpsd.mpg.de> Date: Thu, 22 Jun 2023 11:03:26 +0200 Subject: [PATCH 1/3] switch the ci to use precommit --- .gitlab-ci.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c7020b0..9a51d51 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ stages: - ls -l - pip install -U pip - pip --version - - pip install pytest black ruff pydocstyle + - pip install pytest black ruff pydocstyle pre-commit rstcheck - pytest --version - cat /etc/issue @@ -75,15 +75,7 @@ style: image: python:latest script: - *prepare_style - - black --version - - ruff --version - - pydocstyle --version - - ruff . - - black --check --diff . - - pydocstyle src/mpsd_software_manager/mpsd_software.py - - pydocstyle tests/test_mpsd_software.py - # we could also use `ruff --select D` for pycodestyle. But the behaviour is not exactly the same. - - src/mpsd_software_manager/mpsd_software.py --version + - pre-commit run --all-files test-bullseye: -- GitLab From 43ef9951f7245568403e4d35fe0d3c7bdd43494f Mon Sep 17 00:00:00 2001 From: iamashwin99 <ashwin-kumar.karnad@mpsd.mpg.de> Date: Thu, 22 Jun 2023 11:05:34 +0200 Subject: [PATCH 2/3] test removal of rstcheck from dependencies --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a51d51..8df8c74 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ stages: - ls -l - pip install -U pip - pip --version - - pip install pytest black ruff pydocstyle pre-commit rstcheck + - pip install pytest black ruff pydocstyle pre-commit - pytest --version - cat /etc/issue -- GitLab From 207f6d95d565b95905302cae88406d5cffbad78d Mon Sep 17 00:00:00 2001 From: iamashwin99 <ashwin-kumar.karnad@mpsd.mpg.de> Date: Thu, 22 Jun 2023 17:33:18 +0200 Subject: [PATCH 3/3] ci: install deps from pyproject.toml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8df8c74..7499244 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ stages: - ls -l - pip install -U pip - pip --version - - pip install pytest black ruff pydocstyle pre-commit + - pip install .[dev] - pytest --version - cat /etc/issue -- GitLab