me
/
guix
Archived
1
0
Fork 0
Code

gnu: python-django: Add 4.0. 

* gnu/packages/django.scm (python-django): Rename to ...
(python-django-4.0): ... this.  Update to 4.0.
[propagated-inputs]: Remove PYTHON-PYTZ.
(python-django-3.2): New variable.
(python-django-2.2): Inherit from it.
(python-django): Define as alias for PYTHON-DJANGO-3.2.
master
Marius Bakke 2021-12-17 14:26:27 +01:00
parent 71d56cfa99
commit 76f87b01ad
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gnu/packages/django.scm
View File

@ -47,16 +47,16 @@
#:use-module (gnu packages time) #:use-module (gnu packages time)
#:use-module (gnu packages xml)) #:use-module (gnu packages xml))
(define-public python-django (define-public python-django-4.0
(package (package
(name "python-django") (name "python-django")
(version "3.2.10") (version "4.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Django" version)) (uri (pypi-uri "Django" version))
(sha256 (sha256
(base32 (base32
"1i6my7qrivj0ag9dq22lg0lq6maxapbdqrwy6v1cs2mlnhc8hkh7")))) "0xgf2d8j54kicaz8f6ailzlgcvq5zs6wgn74gqivka0rm16s3a6m"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -110,7 +110,6 @@
python-tblib)) python-tblib))
(propagated-inputs (propagated-inputs
(list python-asgiref (list python-asgiref
python-pytz
python-sqlparse python-sqlparse
;; Optional dependencies. ;; Optional dependencies.
python-argon2-cffi python-argon2-cffi
@ -128,9 +127,24 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
(license license:bsd-3) (license license:bsd-3)
(properties `((cpe-name . "django"))))) (properties `((cpe-name . "django")))))
(define-public python-django-3.2
(package
(inherit python-django-4.0)
(version "3.2.10")
(source (origin
(method url-fetch)
(uri (pypi-uri "Django" version))
(sha256
(base32
"1i6my7qrivj0ag9dq22lg0lq6maxapbdqrwy6v1cs2mlnhc8hkh7"))))
(propagated-inputs
(modify-inputs (package-propagated-inputs python-django-4.0)
;; Django 4.0 deprecated pytz in favor of Pythons built-in zoneinfo.
(append python-pytz)))))
(define-public python-django-2.2 (define-public python-django-2.2
(package (package
(inherit python-django) (inherit python-django-3.2)
(version "2.2.25") (version "2.2.25")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -139,10 +153,13 @@ to the @dfn{don't repeat yourself} (DRY) principle.")
(base32 (base32
"171ll8m1wp684z1r0lz93l377jc6jyq63q5p7sqx8iqk6ypmxrmi")))) "171ll8m1wp684z1r0lz93l377jc6jyq63q5p7sqx8iqk6ypmxrmi"))))
(native-inputs (native-inputs
(modify-inputs (package-native-inputs python-django) (modify-inputs (package-native-inputs python-django-3.2)
(prepend ;; 2.2 requires Selenium for the test suite. (prepend ;; 2.2 requires Selenium for the test suite.
python-selenium))))) python-selenium)))))
;; Use 3.2 LTS as the default until packages gain support for 4.x.
(define-public python-django python-django-3.2)
(define-public python-django-extensions (define-public python-django-extensions
(package (package
(name "python-django-extensions") (name "python-django-extensions")