From 22d7360b1660faeae42ca382b3dc3f999a56d3ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 16 Dec 2016 00:54:48 +0100 Subject: gnu: Remove python-dateutil@1.5. * gnu/packages/python.scm (python-dateutil-2, python2-dateutil-2): Rename to ... (python-dateutil, python2-dateutil): ... this. Remove 1.5 version. (python-tzlocal, python2-tzlocal): Adjust variable name. (python-rst.linker, python2-rst.linker): Likewise. (pelican): Likewise. (python-matplotlib, python2-matplotlib): Likewise. (python-sqlalchemy-utils, python2-sqlalchemy-utils): Likewise. (python-icalendar, python2-icalendar): Likewise. (python-botocore, python2-botocore): Likewise. (python-vobject, python2-vobject): Likewise. (python-arrow, python2-arrow): Likewise. (python-fake-factory, python2-fake-factory): Likewise. (python-freezegun, python2-freezegun): Likewise. (python-aniso8601, python2-aniso8601): Likewise. * gnu/packages/jrnl.scm (jrnl): Likewise. * gnu/packages/calendar.scm (limnoria): Likewise. --- gnu/packages/calendar.scm | 2 +- gnu/packages/jrnl.scm | 2 +- gnu/packages/python.scm | 49 +++++++++++++---------------------------------- 3 files changed, 15 insertions(+), 38 deletions(-) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 447dcd698e..00e908109b 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -125,7 +125,7 @@ (define-public khal `(("sqlite" ,sqlite))) (propagated-inputs `(("python-configobj" ,python-configobj) - ("python-dateutil-2" ,python-dateutil-2) + ("python-dateutil" ,python-dateutil) ("python-icalendar" ,python-icalendar) ("python-tzlocal" ,python-tzlocal) ("python-urwid" ,python-urwid) diff --git a/gnu/packages/jrnl.scm b/gnu/packages/jrnl.scm index ef1f52956c..f26de0d4ab 100644 --- a/gnu/packages/jrnl.scm +++ b/gnu/packages/jrnl.scm @@ -48,7 +48,7 @@ (define-public jrnl ("python-pytz" ,python-pytz) ("python-tzlocal" ,python-tzlocal) ("python-six" ,python-six) - ("python-dateutil" , python-dateutil-2) + ("python-dateutil" ,python-dateutil) ("python-parsedatetime" ,python-parsedatetime))) (home-page "http://maebert.github.io/jrnl/") (synopsis "Personal journal application") diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 91cee71d62..57275ac5d2 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -973,7 +973,7 @@ (define-public python-six (define-public python2-six (package-with-python2 python-six)) -(define-public python-dateutil-2 +(define-public python-dateutil (package (name "python-dateutil") (version "2.5.2") @@ -994,29 +994,6 @@ (define-public python-dateutil-2 datetime module, available in Python 2.3+.") (license license:bsd-3))) -(define-public python2-dateutil-2 - (package-with-python2 python-dateutil-2)) - -(define-public python-dateutil - (package - (name "python-dateutil") - (version "1.5") ; last version for python < 3 - (source - (origin - (method url-fetch) - (uri (string-append "http://labix.org/download/python-dateutil/" - "python-dateutil-" version ".tar.gz")) - (sha256 - (base32 - "0fqfglhy5khbvsipr3x7m6bcaqljh8xl5cw33vbfxy7qhmywm2n0")))) - (build-system python-build-system) - (home-page "https://dateutil.readthedocs.io/en/stable/") - (synopsis "Extensions to the standard datetime module") - (description - "The dateutil module provides powerful extensions to the standard -datetime module, available in Python 2.3+.") - (license license:psfl))) - (define-public python2-dateutil (package-with-python2 python-dateutil)) @@ -1062,7 +1039,7 @@ (define-public python-pandas (propagated-inputs `(("python-numpy" ,python-numpy) ("python-pytz" ,python-pytz) - ("python-dateutil" ,python-dateutil-2))) + ("python-dateutil" ,python-dateutil))) (native-inputs `(("python-nose" ,python-nose) ("python-cython" ,python-cython))) @@ -2908,7 +2885,7 @@ (define-public python-rst.linker "0bh4lnj2p1nh0wf5pgxgfbrp27xhb1rinahkb5j7s3qprq6qn0sr")))) (build-system python-build-system) (propagated-inputs - `(("python-dateutil" ,python-dateutil-2) + `(("python-dateutil" ,python-dateutil) ("python-six" ,python-six))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) @@ -3002,7 +2979,7 @@ (define-public pelican ("python-blinker" ,python-blinker) ("python-unidecode" ,python-unidecode) ("python-six" ,python-six) - ("python-dateutil-2" ,python-dateutil-2))) + ("python-dateutil" ,python-dateutil))) (home-page "http://getpelican.com/") (arguments `(;; XXX Requires a lot more packages to do unit tests :P @@ -3530,7 +3507,7 @@ (define-public python-matplotlib ("python-pygobject" ,python-pygobject) ("gobject-introspection" ,gobject-introspection) ("python-tkinter" ,python "tk") - ("python-dateutil" ,python-dateutil-2) + ("python-dateutil" ,python-dateutil) ("python-numpy" ,python-numpy-bootstrap) ("python-pillow" ,python-pillow) ("python-pytz" ,python-pytz) @@ -4029,7 +4006,7 @@ (define-public python-sqlalchemy-utils `(("python-six" ,python-six) ("python-sqlalchemy" ,python-sqlalchemy))) (native-inputs - `(("python-dateutil" ,python-dateutil-2) + `(("python-dateutil" ,python-dateutil) ("python-flexmock" ,python-flexmock) ("python-psycopg2" ,python-psycopg2) ("python-pytest" ,python-pytest) @@ -8140,7 +8117,7 @@ (define-public python-icalendar "01v2f3swd5s72x65cdihw83dx1z799b4i49a6ncg7vqmcm20wapd")))) (build-system python-build-system) (propagated-inputs - `(("python-dateutil-2" ,python-dateutil-2) + `(("python-dateutil" ,python-dateutil) ("python-pytz" ,python-pytz))) (synopsis "Python library for parsing iCalendar files") (description "The icalendar package is a parser/generator of iCalendar @@ -8588,7 +8565,7 @@ (define-public python-botocore ;; FIXME: Many tests are failing. '(#:tests? #f)) (propagated-inputs - `(("python-dateutil" ,python-dateutil-2) + `(("python-dateutil" ,python-dateutil) ("python-docutils" ,python-docutils) ("python-jmespath" ,python-jmespath))) (native-inputs @@ -9352,7 +9329,7 @@ (define-public python-vobject '(;; The test suite relies on some non-portable Windows interfaces. #:tests? #f)) (propagated-inputs - `(("python-dateutil-2" ,python-dateutil-2) + `(("python-dateutil" ,python-dateutil) ("python-pyicu" ,python-pyicu))) (synopsis "Parse and generate vCard and vCalendar files") (description "Vobject is intended to be a full featured Python package for @@ -10392,7 +10369,7 @@ (define-public python-arrow ("python-chai" ,python-chai) ("python-simplejson" ,python-simplejson))) (propagated-inputs - `(("python-dateutil" ,python-dateutil-2))) + `(("python-dateutil" ,python-dateutil))) (home-page "https://github.com/crsmithdev/arrow/") (synopsis "Dates and times for Python") (description @@ -10597,7 +10574,7 @@ (define-public python-fake-factory ("python-mock" ,python-mock) ("python-ukpostcodeparser" ,python-ukpostcodeparser))) (propagated-inputs - `(("python-dateutil" ,python-dateutil-2) + `(("python-dateutil" ,python-dateutil) ("python-six" ,python-six))) (home-page "https://github.com/joke2k/faker") (synopsis "Python package that generates fake data") @@ -11202,7 +11179,7 @@ (define-public python-freezegun ("python-coverage" ,python-coverage))) (propagated-inputs `(("python-six" ,python-six) - ("python-dateutil-2" ,python-dateutil-2))) + ("python-dateutil" ,python-dateutil))) (arguments `(#:phases (modify-phases %standard-phases ;; The tests are normally executed via `make test`, but the PyPi @@ -11785,7 +11762,7 @@ (define-public python-aniso8601 "1k5mjg9iqbjfslb5prrsfz7dhlvi6s35p1jxq8dm87w1b7dn5i2g")))) (build-system python-build-system) (propagated-inputs - `(("python-dateutil-2" ,python-dateutil-2))) + `(("python-dateutil" ,python-dateutil))) (home-page "https://bitbucket.org/nielsenb/aniso8601") (synopsis -- cgit v1.2.3