191/361: gnu: python-pytest-enabler: Break dependency cycle.
andreas pushed a commit to branch python-team in repository guix. commit 25322336dc4641134dcfc4c605fa5c14c0493f4f Author: Nicolas Graves AuthorDate: Fri May 10 00:53:56 2024 +0200 gnu: python-pytest-enabler: Break dependency cycle. * gnu/packages/check.scm (python-pytest-enabler-bootstrap): Delete variable. (python-pytest-enabler): Redefine variable. * gnu/packages/python-xyz.scm (python-jaraco-classes)[native-inputs]: Remove python-pytest-enabler-bootstrap. (python-jaraco-context-bootstrap): Delete variable. (python-jaraco-context): Redefine variable. (python-jaraco-functools-bootstrap): Delete variable. (python-jaraco-functools): Redefine variable. Change-Id: I96649093009beb7a3d0e9716eced778d4fc800e2 Signed-off-by: Nicolas Goaziou --- gnu/packages/check.scm | 80 +--- gnu/packages/python-xyz.scm | 144 ++-- 2 files changed, 86 insertions(+), 138 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 83b9c4f29b..7bde8fba69 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2884,60 +2884,36 @@ style test suites, summarizing their results, and providing indication of failures.") (license license:ncsa))) -;;; This is marked as a bootstrap package because it propagates bootstrapped -;;; versions of jaraco-context and jaraco-functools. -(define-public python-pytest-enabler-bootstrap - (hidden-package - (package - (name "python-pytest-enabler-bootstrap") - (version "1.2.1") - (source - (origin -(method url-fetch) -(uri (pypi-uri "pytest-enabler" version)) -(sha256 - (base32 "023ymm0r2gpn5q7aikvx567s507j0zk46w41w6gxb69c688zgs73" - (build-system python-build-system) - (arguments (list #:tests? #f)) - (propagated-inputs - (list python-jaraco-context-bootstrap -python-jaraco-functools-bootstrap -python-toml)) - (native-inputs (list python-setuptools-scm)) - (home-page "https://github.com/jaraco/pytest-enabler";) - (synopsis "Enable installed pytest plugins") - (description "Enable installed pytest plugins") - (license license:expat - (define-public python-pytest-enabler - (package/inherit python-pytest-enabler-bootstrap -(arguments - (substitute-keyword-arguments - (strip-keyword-arguments - '(#:tests?) - (package-arguments python-pytest-enabler-bootstrap)) - ((#:phases phases #~%standard-phases) -#~(modify-phases #$phases -(replace 'check - (lambda* (#:key tests? #:allow-other-keys) -(when tests? - (invoke "python" "-m" "pytest" "-vv" "tests" + (package +(name "python-pytest-enabler") +(version "1.2.1") +(source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-enabler" version)) + (sha256 +(base32 "023ymm0r2gpn5q7aikvx567s507j0zk46w41w6gxb69c688zgs73" +(build-system pyproject-build-system) +(arguments (list #:tests? #f + #:test-flags '(list "tests"))) (propagated-inputs - (modify-inputs (package-propagated-inputs python-pytest-enabler-bootstrap) - (replace "python-jaraco-context-bootstrap" python-jaraco-context) - (replace "python-jaraco-functools-bootstrap" python-jaraco-functools))) -(native-inputs - (modify-inputs (package-native-inputs python-pytest-enabler-bootstrap) - (append python-pytest - python-pytest-black - python-pytest-checkdocs - python-pytest-cov - python-pytest-flake8 - python-pytest-mypy - python-types-toml))) -(properties (alist-delete 'hidden? - (package-properties - python-pytest-enabler-bootstrap) + (list python-jaraco-context + python-jaraco-functools + python-toml)) +(native-inputs (list python-pytest + python-pytest-black + python-pytest-checkdocs + python-pytest-cov + python-pytest-flake8 + python-pytest-mypy + python-setuptools + python-setuptools-scm + python-types-toml)) +(home-page "https://github.com/jaraco/pytest-enabler";) +(synopsis "Enable installed pytest plugins") +(description "Enable installed pytest plugins") +(license license:expat))) (define-public python-pytest-freezegun (package diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a9a05e6e2e..4a304b953c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12098,7 +12098,6 @@ enforced method signatures and consistent documentation.") python-pyt
191/361: gnu: python-pytest-enabler: Break dependency cycle.
sharlatan pushed a commit to branch python-team in repository guix. commit 326c0f3772fd1f5eeb9d7d5f75b3b8a2c73f379e Author: Nicolas Graves AuthorDate: Fri May 10 00:53:56 2024 +0200 gnu: python-pytest-enabler: Break dependency cycle. * gnu/packages/check.scm (python-pytest-enabler-bootstrap): Delete variable. (python-pytest-enabler): Redefine variable. * gnu/packages/python-xyz.scm (python-jaraco-classes)[native-inputs]: Remove python-pytest-enabler-bootstrap. (python-jaraco-context-bootstrap): Delete variable. (python-jaraco-context): Redefine variable. (python-jaraco-functools-bootstrap): Delete variable. (python-jaraco-functools): Redefine variable. Change-Id: I96649093009beb7a3d0e9716eced778d4fc800e2 Signed-off-by: Nicolas Goaziou --- gnu/packages/check.scm | 80 +--- gnu/packages/python-xyz.scm | 144 ++-- 2 files changed, 86 insertions(+), 138 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 83b9c4f29b..7bde8fba69 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2884,60 +2884,36 @@ style test suites, summarizing their results, and providing indication of failures.") (license license:ncsa))) -;;; This is marked as a bootstrap package because it propagates bootstrapped -;;; versions of jaraco-context and jaraco-functools. -(define-public python-pytest-enabler-bootstrap - (hidden-package - (package - (name "python-pytest-enabler-bootstrap") - (version "1.2.1") - (source - (origin -(method url-fetch) -(uri (pypi-uri "pytest-enabler" version)) -(sha256 - (base32 "023ymm0r2gpn5q7aikvx567s507j0zk46w41w6gxb69c688zgs73" - (build-system python-build-system) - (arguments (list #:tests? #f)) - (propagated-inputs - (list python-jaraco-context-bootstrap -python-jaraco-functools-bootstrap -python-toml)) - (native-inputs (list python-setuptools-scm)) - (home-page "https://github.com/jaraco/pytest-enabler";) - (synopsis "Enable installed pytest plugins") - (description "Enable installed pytest plugins") - (license license:expat - (define-public python-pytest-enabler - (package/inherit python-pytest-enabler-bootstrap -(arguments - (substitute-keyword-arguments - (strip-keyword-arguments - '(#:tests?) - (package-arguments python-pytest-enabler-bootstrap)) - ((#:phases phases #~%standard-phases) -#~(modify-phases #$phases -(replace 'check - (lambda* (#:key tests? #:allow-other-keys) -(when tests? - (invoke "python" "-m" "pytest" "-vv" "tests" + (package +(name "python-pytest-enabler") +(version "1.2.1") +(source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-enabler" version)) + (sha256 +(base32 "023ymm0r2gpn5q7aikvx567s507j0zk46w41w6gxb69c688zgs73" +(build-system pyproject-build-system) +(arguments (list #:tests? #f + #:test-flags '(list "tests"))) (propagated-inputs - (modify-inputs (package-propagated-inputs python-pytest-enabler-bootstrap) - (replace "python-jaraco-context-bootstrap" python-jaraco-context) - (replace "python-jaraco-functools-bootstrap" python-jaraco-functools))) -(native-inputs - (modify-inputs (package-native-inputs python-pytest-enabler-bootstrap) - (append python-pytest - python-pytest-black - python-pytest-checkdocs - python-pytest-cov - python-pytest-flake8 - python-pytest-mypy - python-types-toml))) -(properties (alist-delete 'hidden? - (package-properties - python-pytest-enabler-bootstrap) + (list python-jaraco-context + python-jaraco-functools + python-toml)) +(native-inputs (list python-pytest + python-pytest-black + python-pytest-checkdocs + python-pytest-cov + python-pytest-flake8 + python-pytest-mypy + python-setuptools + python-setuptools-scm + python-types-toml)) +(home-page "https://github.com/jaraco/pytest-enabler";) +(synopsis "Enable installed pytest plugins") +(description "Enable installed pytest plugins") +(license license:expat))) (define-public python-pytest-freezegun (package diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a9a05e6e2e..4a304b953c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12098,7 +12098,6 @@ enforced method signatures and consistent documentation.") python-p
