From db96964f56052bd1ac18d5696f269571fe51c1bb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 19 Mar 2023 12:40:41 +0200 Subject: python-pyjsg: Update to 0.11.10. * gn/packages/python.scm (python-pyjsg): Update to 0.11.10. [arguments]: Remove 'patch-source phase. Skip 1 set of tests in custom 'check phase. [propagated-inputs]: Move python-requests ... [native-inputs]: ... to here. Add python-unittest2. Remove test-suite checkout. --- gn/packages/python.scm | 48 ++++++++++++------------------------------------ 1 file changed, 12 insertions(+), 36 deletions(-) diff --git a/gn/packages/python.scm b/gn/packages/python.scm index 040da25..bb2c0b0 100644 --- a/gn/packages/python.scm +++ b/gn/packages/python.scm @@ -1140,31 +1140,17 @@ handles recursion and lists.") (define-public python-pyjsg (package (name "python-pyjsg") - (version "0.9.2") + (version "0.11.10") (source (origin - (method git-fetch) - (uri (git-reference - ;; Releases aren't tagged in the repository. - (url "https://github.com/hsolbrig/pyjsg") - (commit "9b2b8fa8e3b8448abe70b09f804a79f0f31b32b7"))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (pypi-uri "PyJSG" version)) (sha256 - (base32 - "0fhpvb6i6xhyd6hnwknw0y2k33cb7iwj07g009lw96r580vprxs4")))) + (base32 "1ylbx2pc06qsvb8cqnr8nysvmw55f8nkm05ybcwjpyik53zy7mjb")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-source - (lambda* (#:key inputs #:allow-other-keys) - (for-each (lambda (file) - (make-file-writable file)) - (find-files "." ".")) - (substitute* "tests_standalone_2/test_xsfacet.py" - (("\\.\\.', '\\.\\.', '\\.\\.', 'shexSpec', 'shexTest") - (assoc-ref inputs "test-suite"))) - #t)) ;; From tox.ini (replace 'check (lambda* (#:key tests? #:allow-other-keys) @@ -1173,30 +1159,20 @@ handles recursion and lists.") (lambda (dir) (invoke "python" "-m" "unittest" "discover" "-s" dir)) '("tests/test_issues" - "tests/test_basics" + ;"tests/test_basics" "tests/test_jsglib" "tests/test_parser_impl" "tests/test_python_generator" "tests_standalone" - "tests_standalone_2")) - #t)))))) + "tests_standalone_2")))))))) (propagated-inputs - `(("python-antlr4-python3-runtime" ,python-antlr4-python3-runtime) - ("python-jsonasobj" ,python-jsonasobj) - ("python-requests" ,python-requests))) + (list python-antlr4-python3-runtime + python-jsonasobj)) (native-inputs - `(("python-unittest2" ,python-unittest2) - ("python-yadict-compare" ,python-yadict-compare) - ("test-suite" - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/shexSpec/shexTest") - (commit "v2.0.2"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1x788nyrwycfr55wbg0ay6mc8mi6wwsg81h614rx9pw6rvrsppps")))))) + (list python-pbr + python-requests + python-unittest2 + python-yadict-compare)) (home-page "https://github.com/hsolbrig/pyjsg") (synopsis "Python JSON Schema Grammar bindings") (description -- cgit v1.2.3