Remove unused Dockerfile.tests and update tox.ini

.github/workflows/tests.yaml

@@ -50,10 +50,39 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           slug: tyutyutyu/msps
 
+  sonarcloud:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Update python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+          architecture: x64
+
+      - name: Install Poetry
+        run: curl -sSL curl -sSL https://install.python-poetry.org | python3 -
+
+      - name: Set env
+        run: echo "export PATH=${PATH}:$HOME/.poetry/bin" >> $GITHUB_ENV
+
+      - name: Checkout branch
+        uses: actions/checkout@v4
+        with:
+          # Disabling shallow clone is recommended for improving relevancy of reporting
+          fetch-depth: 0
+
+      - name: Install packages via Poetry
+        run: poetry install
+      - uses: actions/checkout@v4
+
       - name: Run tox
-        run: tox -e py
+        run: poetry run tox -e py
 
       - name: SonarCloud Scan
-        uses: SonarSource/sonarcloud-github-action@master
+        uses: sonarsource/sonarcloud-github-action@v2.1.1
         env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          JAVA_HOME: /opt/java/openjdk
+          SONAR_SCANNER_HOME: /opt/sonar-scanner

pyproject.toml

@@ -14,19 +14,24 @@ packages = [{ include = "msps", from = "src" }, { include = "tests" }]
 [tool.poetry.dependencies]
 python = ">=3.10"
 rich = "^13.7.0"
-typer = "^0.9.0"
-coverage = "^7.4.3"
-tox = "^4.13.0"
 
 [tool.poetry.group.test.dependencies]
 pytest = "^8.0.0"
+typer = "^0.9.0"
+coverage = "^7.4.3"
+tox = "^4.13.0"
 
 [tool.poetry.group.typing.dependencies]
 mypy = "^1.8.0"
 
 [tool.poetry.group.lint.dependencies]
 pylint = "^3.0.3"
 
+[tool.poetry.group.dev.dependencies]
+black = "^24.2.0"
+pytest-sugar = "^1.0.0"
+pytest-cov = "^4.1.0"
+
 [tool.poetry.scripts]
 msps = "msps.__main__:main"
 testui = "tests.manual_test_ui:main"
@@ -41,6 +46,3 @@ strict = true
 
 [tool.pytest.ini_options]
 pythonpath = ["src"]
-
-[tool.coverage.run]
-source = ["src/msps"]

sonar-project.properties

@@ -0,0 +1,9 @@
+sonar.projectKey=tyutyutyu_msps
+sonar.organization=tyutyutyu-1
+
+sonar.python.version=3
+sonar.sources=src
+sonar.dynamicAnalysis=reuseReports
+sonar.core.codeCoveragePlugin=coverage
+sonar.python.coverage.reportPaths=*coverage*.xml
+; sonar.python.xunit.reportPath=xunit-result*.xml

tox.ini

@@ -1,26 +1,24 @@
 [tox]
-requires =
-    tox>=4
-env_list = lint, type, py{310,311,312}
 
 [testenv]
 description = run unit tests
-deps =
-    pytest>=7
-    pytest-sugar
+skip_install = true
+allowlist_externals = poetry
+commands_pre =
+    poetry install
 commands =
-    pytest {posargs:tests}
+    poetry run pytest tests/ --import-mode importlib --cov=msps --cov-report=term-missing --cov-report=xml --cov-report=html
 
-[testenv:lint]
-description = run linters
-skip_install = true
-deps =
-    black==22.12
-commands = black {posargs:.}
+; [testenv:lint]
+; description = run linters
+; skip_install = true
+; deps =
+;     black==22.12
+; commands = black {posargs:.}
 
-[testenv:type]
-description = run type checks
-deps =
-    mypy>=0.991
-commands =
-    mypy {posargs:src tests}
+; [testenv:type]
+; description = run type checks
+; deps =
+;     mypy>=0.991
+; commands =
+;     mypy {posargs:src tests}