diff options
| author | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2016-09-15 22:07:29 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-09-19 23:41:23 +0900 |
| commit | dfdaea32e90fd226aa98028a196fca3d2d371a94 (patch) | |
| tree | fa62797875b16d747552923a91beab9d6256898d | |
| parent | 4a84a48742ab9e15d7d527c3d965f907ec40672c (diff) | |
| download | patches-dfdaea32e90fd226aa98028a196fca3d2d371a94.tar patches-dfdaea32e90fd226aa98028a196fca3d2d371a94.tar.gz | |
gnu: python-django, python2-django: Fix propagated- and native-inputs.
setuptools is a run-time dependency (sic!), all others are required
for testing only.
* gnu/packages/django.scm (python-django) [propagated-inputs,
native-inputs]: Exchange them. Move tzdata to new native-inputs.
Enhance comments.
(python2-django) [propagated-inputs] change into native-inputs.
Enhance comment.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | gnu/packages/django.scm | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 923c4e2f2b..8f0d2add9e 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -55,16 +55,17 @@ (string-append ".:" (getenv "PYTHONPATH"))) (zero? (system* "python" "tests/runtests.py"))))))) ;; TODO: Install extras/django_bash_completion. - (native-inputs + (propagated-inputs ;; Django uses 'pkg_resources' (part of setuptools) to locate templates ;; at run-time. - `(("python-setuptools" ,python-setuptools) - ("tzdata", tzdata))) - (propagated-inputs - `( ;; bcrypt and argon2-cffi are extra requirements not yet in guix + `(("python-setuptools" ,python-setuptools))) + (native-inputs + `(("tzdata", tzdata) + ;; bcrypt and argon2-cffi are extra requirements not yet in guix ;;("python-argon2-cffi" ,python-argon2-cffi) ; >= 16.1.0 ;;("python-bcrypt" ,python-bcrypt) ; not py-bcrypt! - ;; Taken from tests/requirements/py3.txt. + ;; Remaining packages are test requirements taken from + ;; tests/requirements/py3.txt ("python-docutils" ,python-docutils) ;; optional for tests: ("python-geoip2" ,python-geoip2) ("python-jinja2" ,python-jinja2) ; >= 2.7 @@ -90,8 +91,9 @@ to the @dfn{don't repeat yourself} (DRY) principle.") (let ((base (package-with-python2 (strip-python2-variant python-django)))) (package (inherit base) - (propagated-inputs - `(;; Required for Python 2: enum34 and mock. + (native-inputs + `(;; Test requirements for Python 2 taken from + ;; tests/requirements/py3.txt: enum34 and mock. ("python2-enum34" ,python2-enum34) ("python2-mock" ,python2-mock) ;; When adding memcached mind: for Python 2 memcached <= 1.53 is |