CI tests: run all tests from yaml directly
Change-Id: If4ed8bc03f43f833cff14311b4dbc5a7f11de439
diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index 75b59c3..cb95190 100644
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -81,7 +81,12 @@
- name: Test with pytest on Windows
if: runner.os == 'Windows'
run: |
- ./scripts/R_run.bat setup.py test
+ pip install pytest
+ pytest KorAPClient/tests --junitxml=junit/test-results-${{ matrix.python-version }}.xml
+ env:
+ R_HOME: "c:/R"
+ R_USER: "c:/R"
+ PATH: "${{ env.PATH }};C:/R/bin/x64;c:/R/bin/i386;c:/R;c:/R/bin"
- name: Upload check results
if: failure()
uses: actions/upload-artifact@master
diff --git a/scripts/R_run.bat b/scripts/R_run.bat
deleted file mode 100755
index d10b1da..0000000
--- a/scripts/R_run.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-Rscript -e '.libPaths()'
-set R_USER=C:\R
-set R_HOME=C:\R
-set PATH=%R_HOME%\bin\i386;%PATH%
-set PATH=%R_HOME%\bin;%PATH%
-set PATH=%R_HOME%\bin\x64;%PATH%
-set PATH=%R_HOME%;%PATH%
-echo %PATH%
-set
-python %1 %2 %3 %4 %5 %6
-
-
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
deleted file mode 100755
index 15a73d2..0000000
--- a/scripts/run_tests.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-pytest \
- --cov-append \
- KorAPClient/tests