Merge pull request #75 from bhosale2/74_reduce_poetry_redundancy

Refactor: remove poetry redundancies (#74)
GazzolaLab · Jul 20, 2022 · b5fdab0 · b5fdab0
2 parents 160697c + 3a61b07
commit b5fdab0
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 43 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -4,6 +4,8 @@ exclude_lines =
     # Don't complain if non-runnable code isn't run:
     if 0:
     if __name__ == __main__:
+fail_under = 40
+show_missing = true
 
 [run]
 branch = True

diff --git a/.github/workflows/ci-sphinx.yml b/.github/workflows/ci-sphinx.yml
@@ -22,11 +22,12 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3
-
-      - name: Poetry Setup
+      - name: Setup Poetry
+        uses: Gr1N/setup-poetry@v7
+        with:
+          poetry-preview: false
+      - name: Poetry install docs dependencies
         run: |
-            apt-get update -y && apt-get install curl
-            make poetry-download
             poetry --version
             poetry config virtualenvs.in-project false
             poetry config virtualenvs.create false

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -74,7 +74,7 @@ jobs:
       - name: Test MiV-OS using pytest
         if: startsWith(runner.os, 'macOS')
         run: |
-          poetry run pytest -c pyproject.toml --cov=miv --cov-report=xml
+          make test_ci
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v2
         with:

diff --git a/Makefile b/Makefile
@@ -35,11 +35,11 @@ formatting: codestyle
 #* Linting
 .PHONY: test
 test:
-	PYTHONPATH=$(PYTHONPATH) poetry run pytest -c pyproject.toml --cov-report=html --cov=miv tests/
+	poetry run pytest -c pyproject.toml --cov=miv
 
-.PHONY: coverage check
-coverage:
-	PYTHONPATH=$(PYTHONPATH) poetry run pytest -c pyproject.toml --cov=miv tests/
+.PHONY: test_ci
+test_ci:
+	poetry run pytest -c pyproject.toml --cov=miv --cov-report=xml
 
 .PHONY: check-codestyle
 check-codestyle:

diff --git a/docs/requirements.txt b/docs/requirements.txt
diff --git a/pyproject.toml b/pyproject.toml
@@ -168,16 +168,3 @@ addopts = [
 #  "--doctest-modules", TODO: Try to include pytest.doctest
 #  "--doctest-continue-on-failure",
 ]
-
-[tool.coverage.run]
-source = ["tests"]
-
-[coverage.paths]
-source = "miv"
-
-[coverage.run]
-branch = true
-
-[coverage.report]
-fail_under = 50
-show_missing = true
diff --git a/tests/requirements.txt b/tests/requirements.txt