From 3077ff775de5fb472ceb26f46fbb0239d19f6d6b Mon Sep 17 00:00:00 2001 From: "Collin J. Doering" Date: Mon, 27 Dec 2021 21:14:51 -0500 Subject: [PATCH] rekahsoft-gnu: Update awscliv2 * rekahsoft-gnu/packages/python-xyz.scm (awscliv2): Update awscliv2 2.2.37 -> 2.4.7 (awscliv2): Move propagated-inputs to native-inputs, as python applications should not propagate libraries (awscliv2): Remove explicit setting of PYTHONPATH, as this is no longer required as of recent versions of guix (python-distro-1.5): Now required for awscliv2 (python-ruamel.yaml-0.15): Required for awscliv2 (python-cryptography-3.3.2): Required for awscliv2 (python-s3transfer-0.4): Removed as this hack is no longer required now that I understand python applications should not propagate their library inputs (python-botocore-2.0.0dev155): Update botocore for awscliv2 update --- rekahsoft-gnu/packages/python-xyz.scm | 187 +++++++++++--------------- 1 file changed, 78 insertions(+), 109 deletions(-) diff --git a/rekahsoft-gnu/packages/python-xyz.scm b/rekahsoft-gnu/packages/python-xyz.scm index c8f83b0..071cc2f 100644 --- a/rekahsoft-gnu/packages/python-xyz.scm +++ b/rekahsoft-gnu/packages/python-xyz.scm @@ -218,7 +218,7 @@ bindings for Python 3.") (package (inherit awscli) (name "awscliv2") - (version "2.2.37") + (version "2.4.7") (source (origin (method git-fetch) @@ -227,26 +227,40 @@ bindings for Python 3.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1z9gwf4rgn52h4l0ik258raswyh7i06f4k3d5616jcm6c3mh9jc9")))) + (base32 "1b7f8vwd90wpbzb7i4a4mdficzqaa41jfa2k6mm3i4cas48fklkk")))) (native-inputs - `(("python-distro" ,python-distro-1.5))) + `(("python-distro" ,python-distro-1.5) + ("python-docutils" ,python-docutils-0.15) + ("python-s3transfer" ,python-s3transfer) + ("python-awscrt" ,python-awscrt) + ("python-prompt-toolkit" ,python-prompt-toolkit-2) + ("python-ruamel.yaml" ,python-ruamel.yaml-0.15) + ("python-cryptography" ,python-cryptography-3.3.2) + ("python-botocore" ,python-botocore-2.0.0dev155))) (propagated-inputs `(,@(fold alist-delete (package-propagated-inputs awscli) - '("python-s3transfer" "python-colorama" - "python-botocore" "python-docutils")) - ("python-awscrt" ,python-awscrt-0.11-awscliv2) - ("python-prompt-toolkit" ,python-prompt-toolkit-2) - ("python-ruamel.yaml" ,python-ruamel.yaml) - ("python-s3transfer" ,python-s3transfer-0.4-awscliv2) - ("python-cryptography" ,python-cryptography) - ("python-docutils" ,python-docutils-0.15) - ("python-colorama" ,python-colorama-0.4.3) - ("python-botocore" ,python-botocore-2.0.0dev145))) + '("python-botocore")))) (arguments `(#:phases (modify-phases %standard-phases - (delete 'fix-reference-to-groff) + (add-before 'build 'removed-vendored + (lambda* _ + (for-each delete-file-recursively + '("awscli/botocore" "awscli/s3transfer")) + (symlink (string-append + (assoc-ref %build-inputs "python-botocore") + "/lib/python" + (python-version (assoc-ref %build-inputs "python")) + "/site-packages/botocore") + "awscli/botocore") + (symlink (string-append + (assoc-ref %build-inputs "python-s3transfer") + "/lib/python" + (python-version (assoc-ref %build-inputs "python")) + "/site-packages/s3transfer") + "awscli/s3transfer") + #t)) (add-after 'install 'generate-completions (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -260,7 +274,6 @@ bindings for Python 3.") (mkdir-p data) (add-installed-pythonpath inputs outputs) - (setenv "PYTHONPATH" (string-append ".:" (getenv "PYTHONPATH"))) (invoke "python" "scripts/gen-ac-index" "--index-location" (string-append data "/ac.index")) @@ -268,10 +281,11 @@ bindings for Python 3.") (call-with-output-file (string-append bash-completion "/aws") (lambda (port) - (format port - (string-join - (list - "complete" "-C" (string-append out "/bin/aws_completer") "aws"))))) + (format + port + (string-join + (list + "complete" "-C" (string-append out "/bin/aws_completer") "aws"))))) (mkdir-p zsh-site-functions) (rename-file (string-append out "/bin/aws_zsh_completer.sh") @@ -283,56 +297,6 @@ bindings for Python 3.") (description "AWS CLI v2 provides a unified command line interface to the Amazon Web Services (AWS) API."))) -(define-public python-awscrt - (package - (name "python-awscrt") - (version "0.12.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "awscrt" version)) - (sha256 - (base32 - "1z6hyazw5zz0xjx7wjfxi7i2blg4535a1zq70c356d46kqhbyhc0")))) - (build-system python-build-system) - (native-inputs - `(("cmake" ,cmake))) - (propagated-inputs - `(("python-boto3" ,python-boto3))) - (home-page - "https://github.com/awslabs/aws-crt-python") - (synopsis - "Common runtime for AWS Python projects") - (description - "Common runtime for AWS Python projects") - (license license:asl2.0))) - -(define-public python-awscrt-0.11 - (package - (inherit python-awscrt) - (version "0.11.24") - (source - (origin - (method url-fetch) - (uri (pypi-uri "awscrt" version)) - (sha256 - (base32 - "1zv2043mxzmbb449n3rwirz1zl22npsyyw05ps2h1gq4ljy6iamq")))))) - -(define-public python-awscrt-0.11-awscliv2 - (package - (inherit python-awscrt-0.11) - (version "0.11.24-awscliv2") - ;; FIXME: Remove python-s3transfer from propagated inputs because awscliv2 - ;; requires >=0.4.2,<0.5.0 but boto3 requires <0.4.0 - (native-inputs - `(,@(package-native-inputs python-awscrt-0.11) - ("python-s3transfer" ,python-s3transfer) - ("python-boto3" ,python-boto3))) - (propagated-inputs - `(,@(alist-delete "python-boto3" - (package-propagated-inputs python-awscrt-0.11)))))) - (define-public python-distro-1.5 (package (inherit python-distro) @@ -345,61 +309,63 @@ Amazon Web Services (AWS) API."))) (base32 "14nz51cqlnxmgfqqilxyvjwwa5xfivdvlm0d0b1qzgcgwdm7an0f")))))) -(define-public python-s3transfer-0.4 +(define-public python-ruamel.yaml-0.15 (package - (inherit python-s3transfer) - (version "0.4.2") - (source (origin - (method url-fetch) - (uri (pypi-uri "s3transfer" version)) - (sha256 - (base32 - "1cp169vz9rvng7dwbn33fgdbl3b014zpsdqsnfxxw7jm2r5jy0nb")))))) - -(define-public python-s3transfer-0.4-awscliv2 - (package - (inherit python-s3transfer-0.4) - (version "0.4.2-awscliv2") - (propagated-inputs - `(,@(alist-delete "python-botocore" - (package-propagated-inputs python-s3transfer-0.4)) - ("python-botocore" ,python-botocore-2.0.0dev145) - ("python-awscrt" ,python-awscrt-0.11-awscliv2))))) - -(define-public python-docutils-0.15 - (package - (inherit python-docutils) - (version "0.15.2") + (inherit python-ruamel.yaml) + (name "python-ruamel.yaml") + (version "0.15.100") (source (origin (method url-fetch) - (uri (pypi-uri "docutils" version)) + (uri (pypi-uri "ruamel.yaml" version)) (sha256 (base32 - "168s5v7bff5ar9jspr6wn823q1sbn0jhnbp9clk41nl8j09fmbm2")))) - (arguments - `(,@(package-arguments python-docutils) - ;; TODO: fixme - #:tests? #f)))) + "1r5j9n2jdq48z0k4bdia1f7krn8f2x3y49i9ba9iks2rg83g6hlf")))))) -(define-public python-colorama-0.4.3 +(define-public python-cryptography-3.3.2 (package - (inherit python-colorama) - (version "0.4.3") + (inherit python-cryptography) + (name "python-cryptography") + (version "3.3.2") (source (origin (method url-fetch) - (uri (pypi-uri "colorama" version)) + (uri (pypi-uri "cryptography" version)) (sha256 - (base32 "189n8hpijy14jfan4ha9f5n06mnl33cxz7ay92wjqgkr639s0vg9")))))) + (base32 + "1vcvw4lkw1spiq322pm1256kail8nck6bbgpdxx3pqa905wd6q2s")))))) -(define-public python-botocore-2.0.0dev145 - (let ((commit "981292a6fe9826c0675ae61c025dd93039e30aa6") - (revision "1")) +(define-public python-awscrt + (package + (name "python-awscrt") + (version "0.12.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "awscrt" version)) + (sha256 + (base32 + "1cmfkcv2zzirxsb989vx1hvna9nv24pghcvypl0zaxsjphv97mka")))) + (build-system python-build-system) + (native-inputs + `(("cmake" ,cmake))) + (propagated-inputs + `(("python-boto3" ,python-boto3))) + (home-page + "https://github.com/awslabs/aws-crt-python") + (synopsis + "Common runtime for AWS Python projects") + (description + "Common runtime for AWS Python projects") + (license license:asl2.0))) + +(define-public python-botocore-2.0.0dev155 + (let ((commit "7083e5c204e139dc41f646e0ad85286b5e7c0c23") + (revision "2")) (package (inherit python-botocore) (name "python-botocore") - (version "2.0.0dev145") + (version "2.0.0dev155") (source (origin (method git-fetch) @@ -409,7 +375,10 @@ Amazon Web Services (AWS) API."))) (file-name (git-file-name name version)) (sha256 (base32 - "161blyxa7cg3k7f9hk6bs8hdmchg6gd1wjn1gnw21sxpch5b3wzi"))))))) + "0lr98h80fgs6kplv52y92pcf1ba4041zq26wdfsfjkg84py9q83a")))) + (propagated-inputs + `(("python-awscrt" ,python-awscrt) + ,@(package-propagated-inputs python-awscrt)))))) (define-public python-htmlark (package