mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00
Code Issues Wiki Activity

Merge pull request #13448 from lancelotsix/use_recent_sqlalchemy_as_default

Browse source 
pythonPackages.sqlalchemy: follows upstream, use "sqlalchemy7" for lecagy
This commit is contained in:
Frederik Rietdijk 2016-03-05 11:07:50 -05:00
parent 0865d19ccd 0467a17858
commit 36506df7fe
8 changed files with 72 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/virtualization/openstack/glance.nix
View file

@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
# https://github.com/openstack/glance/blob/stable/liberty/requirements.txt
propagatedBuildInputs = with pythonPackages; [
pbr sqlalchemy_1_0 anyjson eventlet PasteDeploy routes webob sqlalchemy_migrate
pbr sqlalchemy anyjson eventlet PasteDeploy routes webob sqlalchemy_migrate
httplib2 pycrypto iso8601 stevedore futurist keystonemiddleware paste
jsonschema keystoneclient pyopenssl six retrying semantic-version qpid-python
WSME osprofiler glance_store castellan taskflow cryptography xattr pysendfile

2
pkgs/applications/virtualization/openstack/keystone.nix
View file

@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
# https://github.com/openstack/keystone/blob/stable/liberty/requirements.txt
propagatedBuildInputs = with pythonPackages; [
pbr webob eventlet greenlet PasteDeploy paste routes cryptography six
sqlalchemy_1_0 sqlalchemy_migrate stevedore passlib keystoneclient memcached
sqlalchemy sqlalchemy_migrate stevedore passlib keystoneclient memcached
keystonemiddleware oauthlib pysaml2 dogpile_cache jsonschema pycadf msgpack
xmlsec MySQL_python

2
pkgs/applications/virtualization/openstack/neutron.nix
View file

@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
# https://github.com/openstack/neutron/blob/stable/liberty/requirements.txt
propagatedBuildInputs = with pythonPackages; [
pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests2
jinja2 keystonemiddleware netaddr retrying sqlalchemy_1_0 webob alembic six
jinja2 keystonemiddleware netaddr retrying sqlalchemy webob alembic six
stevedore pecan ryu networking-hyperv MySQL_python
# clients

2
pkgs/applications/virtualization/openstack/nova.nix
View file

@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
# https://github.com/openstack/nova/blob/stable/liberty/requirements.txt
propagatedBuildInputs = with pythonPackages; [
pbr sqlalchemy_1_0 boto decorator eventlet jinja2 lxml routes cryptography
pbr sqlalchemy boto decorator eventlet jinja2 lxml routes cryptography
webob greenlet PasteDeploy paste prettytable sqlalchemy_migrate netaddr
netifaces paramiko Babel iso8601 jsonschema keystoneclient requests2 six
stevedore websockify rfc3986 os-brick psutil_1 alembic psycopg2 pymysql

2
pkgs/applications/virtualization/virtinst/default.nix
View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
pythonPath = with pythonPackages;
[ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes
[ setuptools eventlet greenlet gflags netaddr sqlalchemy7 carrot routes
PasteDeploy m2crypto ipy twisted sqlalchemy_migrate
distutils_extra simplejson readline glanceclient cheetah lockfile httplib2
# !!! should libvirt be a build-time dependency? Note that

2
pkgs/development/tools/build-managers/buildbot/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, buildPythonApplication, fetchurl, twisted, dateutil, jinja2
, sqlalchemy , sqlalchemy_migrate_0_7
, sqlalchemy_migrate_0_7
, enableDebugClient ? false, pygobject ? null, pyGtkGlade ? null
}:

2
pkgs/top-level/all-packages.nix
View file

@ -5765,7 +5765,7 @@ let
};
buildbot = callPackage ../development/tools/build-managers/buildbot {
inherit (pythonPackages) twisted jinja2 sqlalchemy sqlalchemy_migrate_0_7;
inherit (pythonPackages) twisted jinja2 sqlalchemy_migrate_0_7;
dateutil = pythonPackages.dateutil_1_5;
};

83
pkgs/top-level/python-packages.nix
View file

@ -235,7 +235,7 @@ in modules // {
sha256 = "1ywimbisgb5g7xl9nrfwcm7dv3j8fsrjfp7bxb3l58zbsrzj6z2s";
};
propagatedBuildInputs = with self; [ appdirs colorama dateutil requests2 requests_toolbelt sqlalchemy ];
propagatedBuildInputs = with self; [ appdirs colorama dateutil requests2 requests_toolbelt sqlalchemy7 ];
makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${pkgs.fuse}/lib/libfuse.so" ];
@ -480,7 +480,7 @@ in modules // {
};
buildInputs = with self; [ pytest pytestcov mock coverage ];
propagatedBuildInputs = with self; [ Mako sqlalchemy_1_0 python-editor ];
propagatedBuildInputs = with self; [ Mako sqlalchemy python-editor ];
meta = {
homepage = http://bitbucket.org/zzzeek/alembic;
@ -1628,7 +1628,7 @@ in modules // {
};
buildInputs =
[ self.sqlalchemy
[ self.sqlalchemy7
self.pycryptopp
self.nose
self.mock
@ -2154,7 +2154,7 @@ in modules // {
pymongo
pyyaml
requests2
sqlalchemy_1_0
sqlalchemy
tables
toolz
];
@ -3241,7 +3241,7 @@ in modules // {
sed -i '/distribute/d' setup.py
'';
buildInputs = with self; [ self.coverage self.sqlalchemy ];
buildInputs = with self; [ self.coverage self.sqlalchemy7 ];
# ValueError: Could not parse auth file:
# /tmp/nix-build-.../CoilMQ-0.6.1/coilmq/tests/resources/auth.ini
@ -7101,7 +7101,7 @@ in modules // {
propagatedBuildInputs = with self; [
flup
ldap
sqlalchemy
sqlalchemy7
];
doCheck = true;
@ -8908,7 +8908,7 @@ in modules // {
sha256 = "1i9ps5d5snih9xlqhrvmi3qfiygkmqzxh92n25kj4pf89kj4s965";
};
propagatedBuildInputs = with self ; [ flask sqlalchemy_1_0 ];
propagatedBuildInputs = with self ; [ flask sqlalchemy ];
meta = {
description = "SQLAlchemy extension for Flask";
@ -13720,7 +13720,7 @@ in modules // {
};
propagatedBuildInputs = with self; [
six stevedore sqlalchemy_migrate sqlalchemy_1_0 oslo-utils oslo-context
six stevedore sqlalchemy_migrate sqlalchemy oslo-utils oslo-context
oslo-config oslo-i18n iso8601 Babel alembic pbr psycopg2
];
buildInputs = with self; [
@ -13865,7 +13865,7 @@ in modules // {
singledispatch logutils
];
buildInputs = with self; [
webtest Mako genshi Kajiki sqlalchemy_1_0 gunicorn jinja2 virtualenv
webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv
];
meta = with stdenv.lib; {
@ -14588,7 +14588,7 @@ in modules // {
pytz
xlrd
bottleneck
sqlalchemy_1_0
sqlalchemy
lxml
# Disabling this because an upstream dependency, pep8, is broken on v3.5.
(if isPy35 then null else html5lib)
@ -20165,7 +20165,7 @@ in modules // {
rope = if isPy3k then null else self.rope;
};
sqlalchemy = self.sqlalchemy9.override rec {
sqlalchemy7 = buildPythonPackage rec {
name = "SQLAlchemy-0.7.10";
disabled = isPy34 || isPy35;
doCheck = !isPyPy;
@ -20174,17 +20174,32 @@ in modules // {
url = "http://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
sha256 = "0rhxgr85xdhjn467qfs0dkyj8x46zxcv6ad3dfx3w14xbkb3kakp";
};
patches = [
# see https://groups.google.com/forum/#!searchin/sqlalchemy/module$20logging$20handlers/sqlalchemy/ukuGhmQ2p6g/2_dOpBEYdDYJ
# waiting for 0.7.11 release
../development/python-modules/sqlalchemy-0.7.10-test-failures.patch
];
preConfigure = optionalString isPy3k ''
python3 sa2to3.py --no-diffs -w lib test examples
'';
buildInputs = with self; [ nose mock ]
++ stdenv.lib.optional doCheck pysqlite;
propagatedBuildInputs = with self; [ modules.sqlite3 ];
checkPhase = ''
${python.executable} sqla_nose.py
'';
meta = {
homepage = http://www.sqlalchemy.org/;
description = "A Python SQL toolkit and Object Relational Mapper";
};
};
sqlalchemy8 = self.sqlalchemy9.override rec {
sqlalchemy8 = buildPythonPackage rec {
name = "SQLAlchemy-0.8.7";
disabled = isPy34 || isPy35;
doCheck = !isPyPy;
@ -20193,9 +20208,23 @@ in modules // {
url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
md5 = "4f3377306309e46739696721b1785335";
};
preConfigure = optionalString isPy3k ''
python3 sa2to3.py --no-diffs -w lib test examples
'';
buildInputs = with self; [ nose mock ]
++ stdenv.lib.optional doCheck pysqlite;
propagatedBuildInputs = with self; [ modules.sqlite3 ];
checkPhase = ''
${python.executable} sqla_nose.py
'';
meta = {
homepage = http://www.sqlalchemy.org/;
description = "A Python SQL toolkit and Object Relational Mapper";
};
};
sqlalchemy9 = buildPythonPackage rec {
@ -20224,14 +20253,32 @@ in modules // {
};
};
sqlalchemy_1_0 = self.sqlalchemy9.override rec {
name = "SQLAlchemy-1.0.10";
doCheck = !isPyPy; # lots of tests fail
sqlalchemy = buildPythonPackage rec {
name = "SQLAlchemy-${version}";
version = "1.0.10";
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
sha256 = "963415bf4ea4fa13698893464bc6917d291331e0e8202dddd0ebfed2864ef7e3";
};
buildInputs = with self; [ nose mock ]
++ stdenv.lib.optional doCheck pysqlite;
propagatedBuildInputs = with self; [ modules.sqlite3 ];
# Test-only dependency pysqlite doesn't build on Python 3. This isn't an
# acceptable reason to make all dependents unavailable on Python 3 as well
doCheck = !(isPyPy || isPy3k);
checkPhase = ''
${python.executable} sqla_nose.py
'';
meta = {
homepage = http://www.sqlalchemy.org/;
description = "A Python SQL toolkit and Object Relational Mapper";
license = licenses.mit;
};
};
sqlalchemy_imageattach = buildPythonPackage rec {
@ -20294,8 +20341,8 @@ in modules // {
};
};
sqlalchemy_migrate = self.sqlalchemy_migrate_func self.sqlalchemy_1_0;
sqlalchemy_migrate_0_7 = self.sqlalchemy_migrate_func self.sqlalchemy;
sqlalchemy_migrate = self.sqlalchemy_migrate_func self.sqlalchemy;
sqlalchemy_migrate_0_7 = self.sqlalchemy_migrate_func self.sqlalchemy7;
sqlparse = buildPythonPackage rec {
name = "sqlparse-${version}";
@ -24860,7 +24907,7 @@ in modules // {
thrift
beautifulsoup4
markdown2
sqlalchemy
sqlalchemy7
html2text
evernote
];