diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-03-01 18:04:12 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-03-01 18:04:12 +0100 |
commit | 86990eeda2a85acd3640059c0b681f1eddbacba0 (patch) | |
tree | df0d4f0b86dad2b260b7354d451993c141dde5e7 /gnu/packages/databases.scm | |
parent | 6d796220c417a34100c282a7fa1f9afb6ac00339 (diff) | |
parent | 52fb59ef253d9550ca4cfa095c2c0c2360d79095 (diff) | |
download | patches-86990eeda2a85acd3640059c0b681f1eddbacba0.tar patches-86990eeda2a85acd3640059c0b681f1eddbacba0.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/databases.scm')
-rw-r--r-- | gnu/packages/databases.scm | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 29b6ca1698..56984af6e2 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2240,17 +2240,21 @@ SQLAlchemy Database Toolkit for Python.") (define-public python-pickleshare (package (name "python-pickleshare") - (version "0.5") + (version "0.7.4") (source (origin (method url-fetch) - (uri (string-append "https://pypi.python.org/packages/source/p/" - "pickleshare/pickleshare-" version ".tar.gz")) + (uri (pypi-uri "pickleshare" version)) (sha256 - (base32 "11ljr90j3p6qswdrbl7p4cjb2i93f6vn0vx9anzpshsx0d2mggn0")))) + (base32 "0yvk14dzxk7g6qpr7iw23vzqbsr0dh4ij4xynkhnzpfz4xr2bac4")))) (build-system python-build-system) - (propagated-inputs - `(("python-pathpy" ,python-pathpy))) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "pytest")))))) + (native-inputs + `(("python-pytest" ,python-pytest))) (home-page "https://github.com/vivainio/pickleshare") (synopsis "Tiny key value database with concurrency support") (description @@ -2261,10 +2265,15 @@ value in database is immediately visible to other processes accessing the same database. Concurrency is possible because the values are stored in separate files. Hence the “database” is a directory where all files are governed by PickleShare.") + (properties `((python2-variant . ,(delay python2-pickleshare)))) (license license:expat))) (define-public python2-pickleshare - (package-with-python2 python-pickleshare)) + (let ((pickleshare (package-with-python2 + (strip-python2-variant python-pickleshare)))) + (package (inherit pickleshare) + (propagated-inputs `(("python2-pathlib2" ,python2-pathlib2) + ,@(package-propagated-inputs pickleshare)))))) (define-public python-apsw (package |