[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#70855] [PATCH 22/92] gnu: conda: Reindent.
From: |
Nicolas Graves |
Subject: |
[bug#70855] [PATCH 22/92] gnu: conda: Reindent. |
Date: |
Fri, 10 May 2024 00:53:17 +0200 |
* gnu/packages/package-management.scm (conda): Reindent.
Change-Id: I954ec137b4dc39cd561da9ed0e583991bb3de1db
---
gnu/packages/package-management.scm | 112 ++++++++++++++--------------
1 file changed, 56 insertions(+), 56 deletions(-)
diff --git a/gnu/packages/package-management.scm
b/gnu/packages/package-management.scm
index 8a47135ad02..a01c9faab13 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1164,8 +1164,8 @@ (define-public conda
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/conda/conda")
- (commit version)))
+ (url "https://github.com/conda/conda")
+ (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
@@ -1212,60 +1212,60 @@ (define-public conda
"test_make_entry_point")
" and not ")))
#:phases
- #~(modify-phases %standard-phases
- ;; The default version of pytest does not support these options.
- (add-after 'unpack 'use-older-pytest
- (lambda _
- (substitute* "setup.cfg"
- (("--xdoctest-.*") ""))))
- (add-after 'unpack 'fix-ruamel-yaml-dependency
- (lambda _
- (substitute* "setup.py"
- (("ruamel_yaml_conda") "ruamel.yaml"))))
- (add-after 'unpack 'correct-python-executable-name
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((python (assoc-ref inputs "python-wrapper")))
- (substitute* "conda/core/initialize.py"
- (("python_exe = join")
- (format #f "python_exe = \"~a/bin/python\" #"
- python))))))
- (add-after 'unpack 'do-not-use-python-root-as-prefix
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (python (assoc-ref inputs "python-wrapper")))
- (substitute* "tests/core/test_initialize.py"
- (("\"\"\"\\) % conda_prefix")
- (format #f "\"\"\") % ~s" python))
- (("CONDA_PYTHON_EXE \"%s\"' % join\\(conda_prefix")
- (format #f "CONDA_PYTHON_EXE \"%s\"' % join(~s"
- python))
- (("conda_prefix = abspath\\(sys.prefix\\)")
- (format #f "conda_prefix = abspath(~s)" out)))
- (substitute* "conda/base/context.py"
- (("os.chdir\\(sys.prefix\\)")
- (format #f "os.chdir(~s)" out))
- (("sys.prefix, '.condarc'")
- (format #f "~s, '.condarc'" out))
- (("return abspath\\(sys.prefix\\)")
- (format #f "return abspath(~s)" out))
- (("os.path.join\\(sys.prefix, bin_dir, exe\\)")
- (format #f "\"~a/bin/conda\"" out))
- (("'CONDA_EXE', sys.executable")
- (format #f "'CONDA_EXE', \"~a/bin/conda\"" out))))))
- (add-before 'build 'create-version-file
- (lambda _
- (with-output-to-file "conda/.version"
- (lambda () (display #$version)))))
- (add-after 'create-entrypoints 'init
- ;; This writes a whole bunch of shell initialization files to the
- ;; prefix directory. Many features of conda can only be used after
- ;; running "conda init".
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (add-installed-pythonpath inputs outputs)
- (setenv "HOME" "/tmp")
- (invoke (string-append (assoc-ref outputs "out")
- "/bin/conda")
- "init"))))))
+ #~(modify-phases %standard-phases
+ ;; The default version of pytest does not support these options.
+ (add-after 'unpack 'use-older-pytest
+ (lambda _
+ (substitute* "setup.cfg"
+ (("--xdoctest-.*") ""))))
+ (add-after 'unpack 'fix-ruamel-yaml-dependency
+ (lambda _
+ (substitute* "setup.py"
+ (("ruamel_yaml_conda") "ruamel.yaml"))))
+ (add-after 'unpack 'correct-python-executable-name
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((python (assoc-ref inputs "python-wrapper")))
+ (substitute* "conda/core/initialize.py"
+ (("python_exe = join")
+ (format #f "python_exe = \"~a/bin/python\" #"
+ python))))))
+ (add-after 'unpack 'do-not-use-python-root-as-prefix
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (python (assoc-ref inputs "python-wrapper")))
+ (substitute* "tests/core/test_initialize.py"
+ (("\"\"\"\\) % conda_prefix")
+ (format #f "\"\"\") % ~s" python))
+ (("CONDA_PYTHON_EXE \"%s\"' % join\\(conda_prefix")
+ (format #f "CONDA_PYTHON_EXE \"%s\"' % join(~s"
+ python))
+ (("conda_prefix = abspath\\(sys.prefix\\)")
+ (format #f "conda_prefix = abspath(~s)" out)))
+ (substitute* "conda/base/context.py"
+ (("os.chdir\\(sys.prefix\\)")
+ (format #f "os.chdir(~s)" out))
+ (("sys.prefix, '.condarc'")
+ (format #f "~s, '.condarc'" out))
+ (("return abspath\\(sys.prefix\\)")
+ (format #f "return abspath(~s)" out))
+ (("os.path.join\\(sys.prefix, bin_dir, exe\\)")
+ (format #f "\"~a/bin/conda\"" out))
+ (("'CONDA_EXE', sys.executable")
+ (format #f "'CONDA_EXE', \"~a/bin/conda\"" out))))))
+ (add-before 'build 'create-version-file
+ (lambda _
+ (with-output-to-file "conda/.version"
+ (lambda () (display #$version)))))
+ (add-after 'create-entrypoints 'init
+ ;; This writes a whole bunch of shell initialization files to the
+ ;; prefix directory. Many features of conda can only be used after
+ ;; running "conda init".
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (add-installed-pythonpath inputs outputs)
+ (setenv "HOME" "/tmp")
+ (invoke (string-append (assoc-ref outputs "out")
+ "/bin/conda")
+ "init"))))))
(inputs
(list python-wrapper))
(propagated-inputs
--
2.41.0
- [bug#70855] [PATCH 11/92] gnu: python-django-localflavor: Move to pyproject-build-system., (continued)
- [bug#70855] [PATCH 11/92] gnu: python-django-localflavor: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 31/92] gnu: python-nbval: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 33/92] gnu: python-pytest-runner: Improve package style., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 38/92] gnu: behave: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 34/92] gnu: gunicorn: Update to 21.2.0., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 35/92] gnu: python-unidecode: Update to 1.3.8., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 37/92] gnu: python-tinycss: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 14/92] gnu: Add ghc-language-python., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 15/92] gnu: python-xcffib: Move to (gnu packages xorg)., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 20/92] gnu: python-alembic: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 22/92] gnu: conda: Reindent.,
Nicolas Graves <=
- [bug#70855] [PATCH 27/92] gnu: dynaconf: Improve package style., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 28/92] gnu: zulip-term: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 36/92] gnu: python-cbor2: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 23/92] gnu: python-conda-package-handling: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 25/92] gnu: gunicorn: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 26/92] gnu: python-arrow: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 39/92] gnu: python-cucumber-tag-expressions: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 40/92] gnu: python-flask-login: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 41/92] gnu: python-parse-type: Move to pyproject-build-system., Nicolas Graves, 2024/05/09
- [bug#70855] [PATCH 42/92] gnu: python-amqp: Move to pyproject-build-system., Nicolas Graves, 2024/05/09