use pytest for running tests

sergioteula · Oct 8, 2024 · 63f6002 · 63f6002
1 parent 0f27d27
commit 63f6002
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml
@@ -39,9 +39,9 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v4
     - name: Install dependencies
-      run: pip install -e .
+      run: pip install -e . && pip install pytest
     - name: Run tests
-      run: python -m unittest
+      run: python -m pytest
 
   test-py38:
     runs-on: ubuntu-latest
@@ -51,9 +51,9 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v4
     - name: Install dependencies
-      run: pip install -e .
+      run: pip install -e . && pip install pytest
     - name: Run tests
-      run: python -m unittest
+      run: python -m pytest
 
   test-py39:
     runs-on: ubuntu-latest
@@ -63,9 +63,9 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v4
     - name: Install dependencies
-      run: pip install -e .
+      run: pip install -e . && pip install pytest
     - name: Run tests
-      run: python -m unittest
+      run: python -m pytest
 
   test-py310:
     runs-on: ubuntu-latest
@@ -75,9 +75,9 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v4
     - name: Install dependencies
-      run: pip install -e .
+      run: pip install -e . && pip install pytest
     - name: Run tests
-      run: python -m unittest
+      run: python -m pytest
 
   test-py311:
     runs-on: ubuntu-latest
@@ -87,9 +87,9 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v4
     - name: Install dependencies
-      run: pip install -e .
+      run: pip install -e . && pip install pytest
     - name: Run tests
-      run: python -m unittest
+      run: python -m pytest
 
 
   test-py312:
@@ -100,9 +100,9 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v4
     - name: Install dependencies
-      run: pip install coverage certifi six python_dateutil setuptools urllib3
+      run: pip install -e . && pip install pytest
     - name: Run tests
-      run: coverage run -m unittest && coverage xml && coverage report
+      run: coverage run -m pytest && coverage xml && coverage report
     - name: Save code coverage file
       uses: actions/upload-artifact@v4
       with:

diff --git a/Dockerfile b/Dockerfile
@@ -19,6 +19,7 @@ RUN pip install --no-cache-dir \
     coverage \
     mypy \
     pre-commit \
+    pytest \
     ruff
 
 COPY setup.py setup.py

diff --git a/Makefile b/Makefile
@@ -11,16 +11,16 @@ build:
 	@docker build --build-arg TAG="3.12" --build-arg UID="${UID}" --build-arg GID="${GID}" -t python-amazon-paapi .
 
 test: build
-	@docker run --rm -u "${UID}:${GID}" -v "${PWD}:/code" python-amazon-paapi -c "python -m unittest"
+	@docker run -t --rm -u "${UID}:${GID}" -v "${PWD}:/code" python-amazon-paapi -c "python -m pytest"
 
 test-all-python-tags:
 	@for tag in $$PYTHON_TAGS; do \
 		docker build --build-arg TAG="$$tag" --build-arg UID="${UID}" --build-arg GID="${GID}" -t python-amazon-paapi .; \
-		docker run --rm -u "${UID}:${GID}" -v "${PWD}:/code" python-amazon-paapi -c "python -m unittest"; \
+		docker run -t --rm -u "${UID}:${GID}" -v "${PWD}:/code" python-amazon-paapi -c "python -m unittest"; \
 	done
 
 lint: build
-	@docker run --rm -u "${UID}:${GID}" -v "${PWD}:/code" python-amazon-paapi -c "python -m pre_commit run -a"
+	@docker run --rm -t -u "${UID}:${GID}" -v "${PWD}:/code" python-amazon-paapi -c "python -m pre_commit run -a"
 
 pre-commit:
 	@./.githooks/pre-commit