From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39168) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddoZT-0005iG-RN for guix-patches@gnu.org; Fri, 04 Aug 2017 22:12:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddoZQ-0005bK-HH for guix-patches@gnu.org; Fri, 04 Aug 2017 22:12:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:39626) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ddoZQ-0005bC-EY for guix-patches@gnu.org; Fri, 04 Aug 2017 22:12:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ddoZQ-00020w-93 for guix-patches@gnu.org; Fri, 04 Aug 2017 22:12:04 -0400 Subject: [bug#27961] [PATCH 5/5] gnu: python-orator: Move to (gnu packages databases). Resent-Message-ID: From: Ben Woodcroft Date: Sat, 5 Aug 2017 12:10:00 +1000 Message-Id: <20170805021000.18020-5-donttrustben@gmail.com> In-Reply-To: <20170805021000.18020-1-donttrustben@gmail.com> References: <20170805021000.18020-1-donttrustben@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 27961@debbugs.gnu.org * gnu/packages/python.scm: Remove (gnu packages time) import. (python-orator, python2-orator): Move from here ... * gnu/packages/databases.scm: ... to here. --- gnu/packages/databases.scm | 38 ++++++++++++++++++++++++++++++++++++++ gnu/packages/python.scm | 37 ------------------------------------- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 13efc5edc..bb2c3eeec 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017 Ben Woodcroft ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,6 +52,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) + #:use-module (gnu packages time) #:use-module (gnu packages jemalloc) #:use-module (gnu packages language) #:use-module (gnu packages libevent) @@ -1619,3 +1621,39 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.") (define-public python2-lmdb (package-with-python2 python-lmdb)) + +(define-public python-orator + (package + (name "python-orator") + (version "0.9.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "orator" version)) + (sha256 + (base32 + "14r58z64fdp76ixnvmi4lni762b405ynmsx6chr1qihs3yl9zn6c")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; no tests + (propagated-inputs + `(("python-backpack" ,python-backpack) + ("python-blinker" ,python-blinker) + ("python-cleo" ,python-cleo) + ("python-faker" ,python-faker) + ("python-inflection" ,python-inflection) + ("python-lazy-object-proxy" ,python-lazy-object-proxy) + ("python-pendulum" ,python-pendulum) + ("python-pyaml" ,python-pyaml) + ("python-pygments" ,python-pygments) + ("python-simplejson" ,python-simplejson) + ("python-six" ,python-six) + ("python-wrapt" ,python-wrapt))) + (home-page "https://orator-orm.com/") + (synopsis "ActiveRecord ORM for Python") + (description + "Orator provides a simple ActiveRecord-like Object Relational Mapping +implementation for Python.") + (license license:expat) + (properties `((python2-variant . ,(delay python2-orator)))))) + +(define-public python2-orator + (package-with-python2 (strip-python2-variant python-orator))) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2375578d8..46691c7fe 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -107,7 +107,6 @@ #:use-module (gnu packages statistics) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) - #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages video) @@ -11988,42 +11987,6 @@ mocks, stubs and fakes.") (define-public python2-flexmock (package-with-python2 python-flexmock)) -(define-public python-orator - (package - (name "python-orator") - (version "0.9.7") - (source (origin - (method url-fetch) - (uri (pypi-uri "orator" version)) - (sha256 - (base32 - "14r58z64fdp76ixnvmi4lni762b405ynmsx6chr1qihs3yl9zn6c")))) - (build-system python-build-system) - (arguments '(#:tests? #f)) ; no tests - (propagated-inputs - `(("python-backpack" ,python-backpack) - ("python-blinker" ,python-blinker) - ("python-cleo" ,python-cleo) - ("python-faker" ,python-faker) - ("python-inflection" ,python-inflection) - ("python-lazy-object-proxy" ,python-lazy-object-proxy) - ("python-pendulum" ,python-pendulum) - ("python-pyaml" ,python-pyaml) - ("python-pygments" ,python-pygments) - ("python-simplejson" ,python-simplejson) - ("python-six" ,python-six) - ("python-wrapt" ,python-wrapt))) - (home-page "https://orator-orm.com/") - (synopsis "ActiveRecord ORM for Python") - (description - "Orator provides a simple ActiveRecord-like Object Relational Mapping -implementation for Python.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-orator)))))) - -(define-public python2-orator - (package-with-python2 (strip-python2-variant python-orator))) - (define-public python-prompt-toolkit (package (name "python-prompt-toolkit") -- 2.13.4