# HG changeset patch # User Marcin Kuzminski # Date 2018-04-24 18:41:54 # Node ID cc9a2956e749b9a1f58288dbab1268af9547a252 # Parent bc8ddee6cdece5e7c27ef08484d74a71bda900cc dependencies: use all lowercase dependency names for better ordering of auto generated files. - allows easier diff of dependencies across projects. diff --git a/pkgs/python-packages-overrides.nix b/pkgs/python-packages-overrides.nix --- a/pkgs/python-packages-overrides.nix +++ b/pkgs/python-packages-overrides.nix @@ -12,7 +12,7 @@ in self: super: { - Beaker = super.Beaker.override (attrs: { + beaker = super.beaker.override (attrs: { patches = [ ./patch-beaker-lock-func-debug.diff ]; diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix --- a/pkgs/python-packages.nix +++ b/pkgs/python-packages.nix @@ -2,19 +2,6 @@ # See https://github.com/johbo/pip2nix { - Beaker = super.buildPythonPackage { - name = "Beaker-1.9.1"; - buildInputs = with self; []; - doCheck = false; - propagatedBuildInputs = with self; [funcsigs]; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/ca/14/a626188d0d0c7b55dd7cf1902046c2743bd392a7078bb53073e13280eb1e/Beaker-1.9.1.tar.gz"; - sha256 = "32276ed686ab7203baf60520452903e35d1c3515f632683ea4a5881c8cd55921"; - }; - meta = { - license = [ pkgs.lib.licenses.bsdOriginal ]; - }; - }; Mako = super.buildPythonPackage { name = "Mako-1.0.7"; buildInputs = with self; []; @@ -54,32 +41,6 @@ license = [ pkgs.lib.licenses.mit ]; }; }; - WebOb = super.buildPythonPackage { - name = "WebOb-1.7.4"; - buildInputs = with self; []; - doCheck = false; - propagatedBuildInputs = with self; []; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/75/34/731e23f52371852dfe7490a61644826ba7fe70fd52a377aaca0f4956ba7f/WebOb-1.7.4.tar.gz"; - sha256 = "8d10af182fda4b92193113ee1edeb687ab9dc44336b37d6804e413f0240d40d9"; - }; - meta = { - license = [ pkgs.lib.licenses.mit ]; - }; - }; - WebTest = super.buildPythonPackage { - name = "WebTest-2.0.29"; - buildInputs = with self; []; - doCheck = false; - propagatedBuildInputs = with self; [six WebOb waitress beautifulsoup4]; - src = fetchurl { - url = "https://files.pythonhosted.org/packages/94/de/8f94738be649997da99c47b104aa3c3984ecec51a1d8153ed09638253d56/WebTest-2.0.29.tar.gz"; - sha256 = "dbbccc15ac2465066c95dc3a7de0d30cde3791e886ccbd7e91d5d2a2580c922d"; - }; - meta = { - license = [ pkgs.lib.licenses.mit ]; - }; - }; backports.shutil-get-terminal-size = super.buildPythonPackage { name = "backports.shutil-get-terminal-size-1.0.0"; buildInputs = with self; []; @@ -93,6 +54,19 @@ license = [ pkgs.lib.licenses.mit ]; }; }; + beaker = super.buildPythonPackage { + name = "beaker-1.9.1"; + buildInputs = with self; []; + doCheck = false; + propagatedBuildInputs = with self; [funcsigs]; + src = fetchurl { + url = "https://files.pythonhosted.org/packages/ca/14/a626188d0d0c7b55dd7cf1902046c2743bd392a7078bb53073e13280eb1e/Beaker-1.9.1.tar.gz"; + sha256 = "32276ed686ab7203baf60520452903e35d1c3515f632683ea4a5881c8cd55921"; + }; + meta = { + license = [ pkgs.lib.licenses.bsdOriginal ]; + }; + }; beautifulsoup4 = super.buildPythonPackage { name = "beautifulsoup4-4.6.0"; buildInputs = with self; []; @@ -292,7 +266,7 @@ name = "infrae.cache-1.0.1"; buildInputs = with self; []; doCheck = false; - propagatedBuildInputs = with self; [Beaker repoze.lru]; + propagatedBuildInputs = with self; [beaker repoze.lru]; src = fetchurl { url = "https://files.pythonhosted.org/packages/bb/f0/e7d5e984cf6592fd2807dc7bc44a93f9d18e04e6a61f87fdfb2622422d74/infrae.cache-1.0.1.tar.gz"; sha256 = "844b1baa0ab7613159c7e2ee368a5ec4d574e409ff86963e1f45f08dacd478b7"; @@ -500,7 +474,7 @@ name = "pyramid-1.9.2"; buildInputs = with self; []; doCheck = false; - propagatedBuildInputs = with self; [setuptools WebOb repoze.lru zope.interface zope.deprecation venusian translationstring PasteDeploy plaster plaster-pastedeploy hupper]; + propagatedBuildInputs = with self; [setuptools webob repoze.lru zope.interface zope.deprecation venusian translationstring PasteDeploy plaster plaster-pastedeploy hupper]; src = fetchurl { url = "https://files.pythonhosted.org/packages/a0/c1/b321d07cfc4870541989ad131c86a1d593bfe802af0eca9718a0dadfb97a/pyramid-1.9.2.tar.gz"; sha256 = "cf89a48cb899291639686bf3d4a883b39e496151fa4871fb83cc1a3200d5b925"; @@ -628,9 +602,9 @@ }; rhodecode-vcsserver = super.buildPythonPackage { name = "rhodecode-vcsserver-4.13.0"; - buildInputs = with self; [pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage configobj]; + buildInputs = with self; [pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock webtest cov-core coverage configobj]; doCheck = true; - propagatedBuildInputs = with self; [Beaker configobj decorator dulwich hgsubversion hg-evolve infrae.cache mercurial msgpack-python pyramid pyramid-mako pygments pathlib2 repoze.lru simplejson subprocess32 subvertpy six translationstring WebOb wheel zope.deprecation zope.interface gevent greenlet gunicorn waitress ipdb ipython pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock WebTest cov-core coverage]; + propagatedBuildInputs = with self; [beaker configobj decorator dulwich hgsubversion hg-evolve infrae.cache mercurial msgpack-python pyramid pyramid-mako pygments pathlib2 repoze.lru simplejson subprocess32 subvertpy six translationstring webob wheel zope.deprecation zope.interface gevent greenlet gunicorn waitress ipdb ipython pytest py pytest-cov pytest-sugar pytest-runner pytest-catchlog pytest-profiling gprof2dot pytest-timeout mock webtest cov-core coverage]; src = ./.; meta = { license = [ { fullName = "GPL V3"; } { fullName = "GNU General Public License v3 or later (GPLv3+)"; } ]; @@ -805,6 +779,32 @@ license = [ pkgs.lib.licenses.mit ]; }; }; + webob = super.buildPythonPackage { + name = "webob-1.7.4"; + buildInputs = with self; []; + doCheck = false; + propagatedBuildInputs = with self; []; + src = fetchurl { + url = "https://files.pythonhosted.org/packages/75/34/731e23f52371852dfe7490a61644826ba7fe70fd52a377aaca0f4956ba7f/WebOb-1.7.4.tar.gz"; + sha256 = "8d10af182fda4b92193113ee1edeb687ab9dc44336b37d6804e413f0240d40d9"; + }; + meta = { + license = [ pkgs.lib.licenses.mit ]; + }; + }; + webtest = super.buildPythonPackage { + name = "webtest-2.0.29"; + buildInputs = with self; []; + doCheck = false; + propagatedBuildInputs = with self; [six webob waitress beautifulsoup4]; + src = fetchurl { + url = "https://files.pythonhosted.org/packages/94/de/8f94738be649997da99c47b104aa3c3984ecec51a1d8153ed09638253d56/WebTest-2.0.29.tar.gz"; + sha256 = "dbbccc15ac2465066c95dc3a7de0d30cde3791e886ccbd7e91d5d2a2580c922d"; + }; + meta = { + license = [ pkgs.lib.licenses.mit ]; + }; + }; wheel = super.buildPythonPackage { name = "wheel-0.29.0"; buildInputs = with self; []; diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ ## core setuptools==30.1.0 -Beaker==1.9.1 +beaker==1.9.1 configobj==5.0.6 decorator==4.1.2 dulwich==0.13.0 @@ -23,7 +23,7 @@ subvertpy==0.10.1 six==1.11.0 translationstring==1.3 -WebOb==1.7.4 +webob==1.7.4 wheel==0.29.0 zope.deprecation==4.3.0 zope.interface==4.4.3 diff --git a/requirements_test.txt b/requirements_test.txt --- a/requirements_test.txt +++ b/requirements_test.txt @@ -10,6 +10,6 @@ gprof2dot==2017.9.19 pytest-timeout==1.2.0 mock==1.0.1 -WebTest==2.0.29 +webtest==2.0.29 cov-core==1.15.0 coverage==3.7.1