summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2023-04-13 15:51:05 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2023-04-13 15:56:41 -0400
commit97ed675718b948319e6f6e51f2d577971bea1176 (patch)
tree7611633ba7ffbb20ea067c44e0cf7b1556f713a0
parent0cc9950863bf0970b4822f7e305887eaf2f72a44 (diff)
gnu: python-pytest-fork: Update to 1.6.0.
* gnu/packages/check.scm (python-pytest-fork): Update to 1.6.0. [build-system]: Use pyproject-build-system. [arguments]: Replace disable-setuptools-scm phase with pretend-version. [native-inputs]: Remove input labels. Add python-setuptools-scm. (python-pytest-forked-next): Delete variable. (python-pytest-xdist-next): Replace python-pytest-forked-next with python-pytest-forked.
-rw-r--r--gnu/packages/check.scm49
1 files changed, 13 insertions, 36 deletions
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 990c6d52df..96450b47bd 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1693,7 +1693,7 @@ result back.")
(base32
"1psf5dqxvc38qzxvc305mkg5xpdmdkbkkfiyqlmdnkgh7z5dx025"))))
(propagated-inputs (list python-execnet python-pytest
- python-pytest-forked-next))))
+ python-pytest-forked))))
(define-public python-pytest-timeout
(package
@@ -1728,7 +1728,7 @@ timeout has been exceeded.")
(define-public python-pytest-forked
(package
(name "python-pytest-forked")
- (version "1.3.0")
+ (version "1.6.0")
(source
(origin
(method git-fetch) ;for tests
@@ -1738,29 +1738,23 @@ timeout has been exceeded.")
(file-name (git-file-name name version))
(sha256
(base32
- "1aip4kx50ynvykl7kq2mlbsi82vx701dvb8mm64lhp69bbv105rc"))))
- (build-system python-build-system)
+ "1y93q914gwf0nshql1qix6sj826q163b04vw17zmwhsnbv00c2d3"))))
+ (build-system pyproject-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'disable-setuptools-scm
- (lambda _
- (substitute* "setup.py"
- (("use_scm_version=True")
- (format #f "version=~s" ,version))
- (("setup_requires=\\['setuptools_scm'\\],.*")
- ""))))
- (replace 'check
- (lambda* (#:key inputs outputs tests? #:allow-other-keys)
- (when tests?
- (add-installed-pythonpath inputs outputs)
- (invoke "pytest" "-vv")))))))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'pretend-version
+ ;; The version string is usually derived via setuptools-scm,
+ ;; but without the git metadata available, the version string
+ ;; is set to '0.0.0'.
+ (lambda _
+ (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version))))))
(native-inputs
;; XXX: The bootstrap variant of Pytest is used to ensure the
;; 'hypothesis' plugin is not in the environment (due to
;; <http://issues.guix.gnu.org/25235>), which would cause the test suite
;; to fail (see: https://github.com/pytest-dev/pytest-forked/issues/54).
- `(("python-pytest" ,python-pytest-bootstrap)))
+ (list python-pytest-bootstrap python-setuptools-scm))
(home-page "https://github.com/pytest-dev/pytest-forked")
(synopsis "Pytest plugin to run tests in isolated forked subprocesses")
(description "This package provides a Pytest plugin which enables running
@@ -1769,23 +1763,6 @@ can be useful to isolate tests against undesirable global environment
side-effects (such as setting environment variables).")
(license license:expat)))
-(define-public python-pytest-forked-next
- (package
- (inherit python-pytest-forked)
- (name "python-pytest-forked")
- (version "1.4.0")
- (source
- (origin
- (method git-fetch) ;for tests
- (uri (git-reference
- (url "https://github.com/pytest-dev/pytest-forked")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0j9bbjny7h3b4fig6l26f26c697r67mm62fzdd9m9rqyy2bmnqjs"))))
- (native-inputs (list python-pytest-bootstrap python-setuptools-scm))))
-
(define-public python-scripttest
(package
(name "python-scripttest")