From 7da757abfbe3b745e5ee3e028b22db5364ed5f20 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 4 Apr 2016 12:13:06 +0200 Subject: [PATCH 1/9] pythonPackages.ColanderAlchemy: 0.2.0 -> 0.3.3 --- pkgs/top-level/python-packages.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d99977c54b5..4d5787159d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3383,18 +3383,16 @@ in modules // { ColanderAlchemy = buildPythonPackage rec { - name = "ColanderAlchemy-0.2.0"; + name = "ColanderAlchemy-${version}"; + version = "0.3.3"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/C/ColanderAlchemy/${name}.tar.gz"; - sha256 = "d10e97b5f4648dcdc38c5e5c9f9b77fe39c8fa7f594d89d558b0d82e5631bfd7"; + sha256 = "11wcni2xmfmy001rj62q2pwf305vvngkrfm5c4zlwvgbvlsrvnnw"; }; buildInputs = with self; [ unittest2 ]; - propagatedBuildInputs = with self; [ colander sqlalchemy9 ]; - - # string: argument name cannot be overridden via info kwarg. - doCheck = false; + propagatedBuildInputs = with self; [ colander sqlalchemy ]; meta = { description = "Autogenerate Colander schemas based on SQLAlchemy models"; From 3d7d1c4d73c72e029a4447ebece70ca4cc687ee2 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 4 Apr 2016 13:53:06 +0200 Subject: [PATCH 2/9] pythonPackages.pymysqlsa: update sqlalchemy dependency --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4d5787159d2..0976ff3dc26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12438,7 +12438,7 @@ in modules // { name = "pymysqlsa-${version}"; version = "1.0"; - propagatedBuildInputs = with self; [ pymysql sqlalchemy9 ]; + propagatedBuildInputs = with self; [ pymysql sqlalchemy ]; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pymysql_sa/pymysql_sa-1.0.tar.gz"; From 4aea84b26f422edca359f2608b174b4a0e9960d3 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 4 Apr 2016 13:59:27 +0200 Subject: [PATCH 3/9] zope.sqlalchemy: 0.7.5 -> 0.7.6 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0976ff3dc26..451358b3b69 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23362,17 +23362,17 @@ in modules // { zope_sqlalchemy = buildPythonPackage rec { - name = "zope.sqlalchemy-0.7.5"; + name = "zope.sqlalchemy-0.7.6"; doCheck = !isPyPy; # https://github.com/zopefoundation/zope.sqlalchemy/issues/12 src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.sqlalchemy/${name}.zip"; - sha256 = "e196d1b2cf796f46e2c6127717e359ddd35d8d084a8ba059f0f0fabff245b9e1"; + sha256 = "0vxhpdvzihsmg63aralmc7hx62lzrsnlxvskvlcr4mkwzwb22haj"; }; buildInputs = with self; [ zope_testing zope_interface ]; - propagatedBuildInputs = with self; [ sqlalchemy9 transaction ]; + propagatedBuildInputs = with self; [ sqlalchemy transaction ]; meta = { maintainers = with maintainers; [ garbas iElectric ]; From 4f39e03d61d128c3473711a79e5e28df1546d784 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 4 Apr 2016 14:09:56 +0200 Subject: [PATCH 4/9] pythonPackages.flexget: bump sqlalchemy dependency --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 451358b3b69..603daf6446a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9179,7 +9179,7 @@ in modules // { doCheck = false; buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ paver feedparser sqlalchemy9 pyyaml rpyc + propagatedBuildInputs = with self; [ paver feedparser sqlalchemy pyyaml rpyc beautifulsoup_4_1_3 html5lib pyrss2gen pynzb progressbar jinja2 flask cherrypy requests dateutil_2_1 jsonschema python_tvrage tmdb3 guessit pathpy apscheduler ] From f5a86eaf31cb65e8f687fff82b1a7b26b4e47e05 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 4 Apr 2016 14:10:43 +0200 Subject: [PATCH 5/9] pythonPackages.apscheduler: bump sqlalchemy dependency --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 603daf6446a..2abcb7a0f7e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -875,7 +875,7 @@ in modules // { buildInputs = with self; [ pytest - sqlalchemy9 + sqlalchemy tornado twisted mock From 24269a9b0fdc66bb3ace4bdf922652c1f28e8a74 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 4 Apr 2016 14:11:22 +0200 Subject: [PATCH 6/9] pythonPackages.docker_registry: bump sqlalchemy dependency --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2abcb7a0f7e..f1e1be3da35 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4992,7 +4992,7 @@ in modules // { doCheck = false; # requires redis server propagatedBuildInputs = with self; [ setuptools docker_registry_core blinker flask gevent gunicorn pyyaml - requests2 rsa sqlalchemy9 setuptools backports_lzma m2crypto + requests2 rsa sqlalchemy setuptools backports_lzma m2crypto ]; patchPhase = "> requirements/main.txt"; From 2b4f951f5efe2013508e10dcac4dc737e6d0f52b Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 4 Apr 2016 14:14:41 +0200 Subject: [PATCH 7/9] pythonPackages.serversyncstorage: 1.5.11 -> 1.5.13 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f1e1be3da35..0e1dc705868 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -24849,17 +24849,17 @@ in modules // { serversyncstorage = buildPythonPackage rec { name = "serversyncstorage-${version}"; - version = "1.5.11"; + version = "1.5.13"; disabled = !isPy27; src = pkgs.fetchgit { url = https://github.com/mozilla-services/server-syncstorage.git; rev = "refs/tags/${version}"; - sha256 = "1byq2k2f36f1jli9599ygfm2qsb4adl9140sxjpgfjbznb74q90q"; + sha256 = "06ss88j2gkgqchwd51fwynf2i41ssazs2xwiin8g7p8bc517ywmq"; }; propagatedBuildInputs = with self; [ - pyramid sqlalchemy9 simplejson mozsvc cornice pyramid_hawkauth pymysql + pyramid sqlalchemy simplejson mozsvc cornice pyramid_hawkauth pymysql pymysqlsa umemcache WSGIProxy requests pybrowserid ]; buildInputs = with self; [ testfixtures unittest2 ]; From 43c60d6c7c0863c580c22566bb320a4806920f65 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 4 Apr 2016 14:15:58 +0200 Subject: [PATCH 8/9] pythonPackages.syncserver: 1.5.0 -> 1.5.2 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0e1dc705868..bf5a857ca6a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -24826,18 +24826,18 @@ in modules // { syncserver = buildPythonPackage rec { name = "syncserver-${version}"; - version = "1.5.0"; + version = "1.5.2"; disabled = ! isPy27; src = pkgs.fetchgit { url = https://github.com/mozilla-services/syncserver.git; rev = "refs/tags/${version}"; - sha256 = "1xljylycxg7351hmqh7aa6fvvsjg06zvd4r7hcjqyd0k0sxvk7y6"; + sha256 = "002if8wk3bhz70zycggvp5qfvr1n2c6i27wnzj317wlkkjmcknx7"; }; buildInputs = with self; [ unittest2 ]; propagatedBuildInputs = with self; [ - cornice gunicorn pyramid requests simplejson sqlalchemy9 mozsvc tokenserver + cornice gunicorn pyramid requests simplejson sqlalchemy mozsvc tokenserver serversyncstorage configparser ]; From a540d2b3a1e17b407b0b908424b8956835c31285 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 4 Apr 2016 14:16:22 +0200 Subject: [PATCH 9/9] pythonPackages.sqlalchemy9: drop --- pkgs/top-level/python-packages.nix | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bf5a857ca6a..578be04bf87 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20727,32 +20727,6 @@ in modules // { }; }; - sqlalchemy9 = buildPythonPackage rec { - name = "SQLAlchemy-0.9.9"; - - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; - sha256 = "14az6hhrz4bgnicz4q373z119zmaf7j5zxl1jfbfl5lix5m1z9bj"; - }; - - 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"; - }; - }; - sqlalchemy = buildPythonPackage rec { name = "SQLAlchemy-${version}"; version = "1.0.12";