[Piuparts-devel] [Git][debian/piuparts][develop] 2 commits: remove dependency on python3-nose (Closes: #1018437)

[Nicolas Dandrimont (@olasd)]

Nicolas Dandrimont pushed to branch develop at Debian / piuparts


Commits:
a78eade7 by Alexandre Detiste at 2024-09-24T13:13:50+00:00
remove dependency on python3-nose (Closes: #1018437)

- - - - -
a78350cb by Nicolas Dandrimont at 2024-09-24T15:43:53+02:00
Make gitlab-ci use pytest too

- - - - -


5 changed files:

- .gitlab-ci/Dockerfile
- .gitlab-ci/test.yml
- Makefile
- debian/control
- − nosetests.cfg


Changes:

=====================================
.gitlab-ci/Dockerfile
=====================================
@@ -9,6 +9,7 @@ RUN apt-get update --allow-releaseinfo-change -qq \
           pip \
           python3-coverage \
           python3-dev \
+          python3-pytest-cov \
           python3-requests \
           python3-yaml \
     && groupadd --system --gid 1001 unprivileged \


=====================================
.gitlab-ci/test.yml
=====================================
@@ -1,17 +1,9 @@
 ---
 
-nosetests:
+pythontests:
   stage: test
   script:
-    - exit_code=0
-    - echo -e "\e[0Ksection_start:`date +%s`:nose_tests[collapsed=true]\r\e[0KNose test results"
-    - python3 -m coverage run -m nose -v --with-xunit --xunit-file=gitlab-ci-xunit.xml || exit_code=$?
-    - echo -e "\e[0Ksection_end:`date +%s`:nose_tests\r\e[0K"
-    - echo -e "\e[0Ksection_start:`date +%s`:coverage_results\r\e[0KCoverage results"
-    - python3 -m coverage report
-    - python3 -m coverage xml -o gitlab-ci-coverage.xml
-    - echo -e "\e[0Ksection_end:`date +%s`:coverage_results\r\e[0K"
-    - exit $exit_code
+    - python3 -m pytest -v --cov --cov-report=xml:gitlab-ci-coverage.xml --cov-report=term --junitxml=gitlab-ci-xunit.xml
   coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
   artifacts:
     when: always


=====================================
Makefile
=====================================
@@ -167,7 +167,7 @@ install: install-master install-slave
 
 
 check:
-	python3 -m nose --verbose
+	PYTHONPATH=. pytest
 
 clean:
 	rm -f build-stamp


=====================================
debian/control
=====================================
@@ -15,7 +15,7 @@ Build-Depends:
  python3-debian,
  python3-debianbts,
  python3-distro-info,
- python3-nose,
+ python3-pytest,
  python3-sphinx,
  python3-yaml,
  golang-any,


=====================================
nosetests.cfg deleted
=====================================
@@ -1,14 +0,0 @@
-[nosetests]
-# create test coverage report
-with-coverage=1
-with-coverage=1
-cover-html=1
-cover-html-dir=build/html
-cover-package=piupartslib,piuparts
-#cover-inclusive=1
-
-# run doctests
-with-doctest=1
-
-# catch all tests
-# all-modules=1



View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/ad5144fc73445e6815d57117416c87eed07ebe00...a78350cb98ef61a46eba62e73c06903dcece0860

-- 
View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/ad5144fc73445e6815d57117416c87eed07ebe00...a78350cb98ef61a46eba62e73c06903dcece0860
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/piuparts-devel/attachments/20240924/707f5cb0/attachment-0001.htm>