Merge pull request #91390 from eadwu/buku/4.4

buku: 4.3 -> 4.4
This commit is contained in:
Maximilian Bosch 2020-06-24 19:03:44 +02:00 committed by GitHub
commit 0c47a81419
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 5 deletions

View file

@ -1,14 +1,14 @@
{ stdenv, python3, fetchFromGitHub }: { stdenv, python3, fetchFromGitHub }:
with python3.pkgs; buildPythonApplication rec { with python3.pkgs; buildPythonApplication rec {
version = "4.3"; version = "4.4";
pname = "buku"; pname = "buku";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jarun"; owner = "jarun";
repo = "buku"; repo = "buku";
rev = "v${version}"; rev = "v${version}";
sha256 = "1cq508ymak3g5fhi1n4bdiiqkc86s2l3k4dvzw842vv2x0441cac"; sha256 = "10r5f1n0vcxxmqqqsgmlvibwg1xffijrr2id6r140rgiyhprz556";
}; };
checkInputs = [ checkInputs = [
@ -38,6 +38,7 @@ with python3.pkgs; buildPythonApplication rec {
click click
html5lib html5lib
vcrpy vcrpy
toml
]; ];
postPatch = '' postPatch = ''

View file

@ -8,12 +8,16 @@
, wtf-peewee , wtf-peewee
, sqlalchemy , sqlalchemy
, sqlalchemy-citext , sqlalchemy-citext
, sqlalchemy-utils
, flask-mongoengine , flask-mongoengine
, flask_sqlalchemy , flask_sqlalchemy
, flask-babelex , flask-babelex
, shapely , shapely
, geoalchemy2 , geoalchemy2
, psycopg2 , psycopg2
, arrow
, colour
, email_validator
, flask , flask
, wtforms , wtforms
, isPy27 , isPy27
@ -22,12 +26,12 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "flask-admin"; pname = "flask-admin";
version = "1.5.3"; version = "1.5.6";
src = fetchPypi { src = fetchPypi {
pname = "Flask-Admin"; pname = "Flask-Admin";
inherit version; inherit version;
sha256 = "ca0be6ec11a6913b73f656c65c444ae5be416c57c75638dd3199376ce6bc7422"; sha256 = "1f31vzc0p2xni5mh1wvjk9jxf4ddlx2fj4r0f3vv2n9db3c63iv8";
}; };
checkInputs = [ checkInputs = [
@ -38,12 +42,16 @@ buildPythonPackage rec {
wtf-peewee wtf-peewee
sqlalchemy sqlalchemy
sqlalchemy-citext sqlalchemy-citext
sqlalchemy-utils
flask-mongoengine flask-mongoengine
flask_sqlalchemy flask_sqlalchemy
flask-babelex flask-babelex
shapely shapely
geoalchemy2 geoalchemy2
psycopg2 psycopg2
arrow
colour
email_validator
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -52,13 +60,14 @@ buildPythonPackage rec {
] ++ lib.optionals isPy27 [ enum34 ]; ] ++ lib.optionals isPy27 [ enum34 ];
checkPhase = '' checkPhase = ''
# disable tests that require mongodb, postresql # disable tests that require mongodb, postresql, or network
nosetests \ nosetests \
-e "mongoengine" \ -e "mongoengine" \
-e "pymongo" \ -e "pymongo" \
-e "test_form_upload" \ -e "test_form_upload" \
-e "test_postgres" \ -e "test_postgres" \
-e "geoa" \ -e "geoa" \
-e "test_ajax_fk" \
flask_admin/tests flask_admin/tests
''; '';

View file

@ -3,6 +3,7 @@
, fetchFromGitHub , fetchFromGitHub
, isPy3k , isPy3k
, flask , flask
, werkzeug
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -20,8 +21,13 @@ buildPythonPackage rec {
disabled = !isPy3k; disabled = !isPy3k;
postPatch = ''
sed -i 's@werkzeug.contrib.fixers@werkzeug.middleware.proxy_fix@g' flask_reverse_proxy_fix/middleware/__init__.py
'';
propagatedBuildInputs = [ propagatedBuildInputs = [
flask flask
werkzeug
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View file

@ -3,6 +3,8 @@
, fetchPypi , fetchPypi
, sqlalchemy , sqlalchemy
, shapely , shapely
, setuptools_scm
, pytest
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -14,8 +16,12 @@ buildPythonPackage rec {
sha256 = "a5a2444d90ce7f2c6b2d7bd7346c8aed16fd32c3e190e631576a51814e8f7ee9"; sha256 = "a5a2444d90ce7f2c6b2d7bd7346c8aed16fd32c3e190e631576a51814e8f7ee9";
}; };
nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ sqlalchemy shapely ]; propagatedBuildInputs = [ sqlalchemy shapely ];
# https://github.com/geoalchemy/geoalchemy2/blob/e05a676350b11f0e73609379dae5625c5de2e868/TEST.rst
doCheck = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://geoalchemy.org/"; homepage = "http://geoalchemy.org/";
license = licenses.mit; license = licenses.mit;