Merge pull request #27351 from adisbladis/zope_bump

Bump Zope packages to support Python 3.6
This commit is contained in:
Frederik Rietdijk 2017-07-19 11:45:30 +02:00 committed by GitHub
commit 3a5735ca06
5 changed files with 99 additions and 52 deletions

View File

@ -0,0 +1,27 @@
{ stdenv
, fetchPypi
, buildPythonPackage
, zope_testrunner
}:
buildPythonPackage rec {
pname = "ZConfig";
version = "3.2.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "de0a802e5dfea3c0b3497ccdbe33a5023c4265f950f33e35dd4cf078d2a81b19";
};
patches = [ ./skip-broken-test.patch ];
propagatedBuildInputs = [ zope_testrunner ];
meta = with stdenv.lib; {
description = "Structured Configuration Library";
homepage = http://pypi.python.org/pypi/ZConfig;
license = licenses.zpt20;
maintainers = [ maintainers.goibhniu ];
};
}

View File

@ -0,0 +1,12 @@
diff --git a/ZConfig/tests/test_schema2html.py b/ZConfig/tests/test_schema2html.py
index 838cf7c..52daf4e 100644
--- a/ZConfig/tests/test_schema2html.py
+++ b/ZConfig/tests/test_schema2html.py
@@ -74,6 +74,7 @@ else:
class TestSchema2HTML(unittest.TestCase):
+ @unittest.skip('broken test (https://github.com/zopefoundation/ZConfig/issues/34)')
def test_no_schema(self):
self.assertRaises(SystemExit,
run_transform)

View File

@ -0,0 +1,25 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, zope_event
}:
buildPythonPackage rec {
pname = "zope.interface";
version = "4.4.2";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "4e59e427200201f69ef82956ddf9e527891becf5b7cde8ec3ce39e1d0e262eb0";
};
propagatedBuildInputs = [ zope_event ];
meta = with stdenv.lib; {
description = "Zope.Interface";
homepage = http://zope.org/Products/ZopeInterface;
license = licenses.zpt20;
maintainers = [ maintainers.goibhniu ];
};
}

View File

@ -0,0 +1,32 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy3k
, zope_interface
, zope_exceptions
, zope_testing
, six
, subunit
}:
buildPythonPackage rec {
pname = "zope.testrunner";
version = "4.7.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "8ffcb4989829544a83d27e42b2eeb28f8fc134bd847d71ce8dca54f710526ef0";
extension = "zip";
};
propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ] ++ stdenv.lib.optional (!isPy3k) subunit;
meta = with stdenv.lib; {
description = "A flexible test runner with layer support";
homepage = http://pypi.python.org/pypi/zope.testrunner;
license = licenses.zpt20;
maintainers = [ maintainers.goibhniu ];
};
}

View File

@ -25391,24 +25391,8 @@ EOF
};
});
zconfig = buildPythonPackage rec {
name = "zconfig-${version}";
version = "3.0.3";
src = pkgs.fetchurl {
url = "mirror://pypi/Z/ZConfig/ZConfig-${version}.tar.gz";
sha256 = "6577da957511d8c2f805fefd2e31cacc4117bb5c54aec03ad8ce374020c021f3";
};
propagatedBuildInputs = with self; [ zope_testrunner ];
meta = {
description = "Structured Configuration Library";
homepage = http://pypi.python.org/pypi/ZConfig;
license = licenses.zpt20;
maintainers = with maintainers; [ goibhniu ];
};
};
zconfig = callPackage ../development/python-modules/zconfig { };
zc_lockfile = buildPythonPackage rec {
@ -26008,25 +25992,7 @@ EOF
};
zope_testrunner = buildPythonPackage rec {
name = "zope.testrunner-${version}";
version = "4.4.10";
src = pkgs.fetchurl {
url = "mirror://pypi/z/zope.testrunner/${name}.zip";
sha256 = "1w09wbqiqmq6hvrammi4fzc7fr129v63gdnzlk4qi2b1xy5qpqab";
};
propagatedBuildInputs = with self; [ zope_interface zope_exceptions zope_testing six ] ++ optional (!python.is_py3k or false) subunit;
meta = {
description = "A flexible test runner with layer support";
homepage = http://pypi.python.org/pypi/zope.testrunner;
license = licenses.zpt20;
maintainers = with maintainers; [ goibhniu ];
};
};
zope_testrunner = callPackage ../development/python-modules/zope_testrunner { };
zope_traversing = buildPythonPackage rec {
name = "zope.traversing-4.0.0";
@ -26047,23 +26013,8 @@ EOF
};
zope_interface = buildPythonPackage rec {
name = "zope.interface-4.1.3";
zope_interface = callPackage ../development/python-modules/zope_interface { };
src = pkgs.fetchurl {
url = "mirror://pypi/z/zope.interface/${name}.tar.gz";
sha256 = "0ks8h73b2g4bkad821qbv0wzjppdrwys33i7ka45ik3wxjg1l8if";
};
propagatedBuildInputs = with self; [ zope_event ];
meta = {
description = "Zope.Interface";
homepage = http://zope.org/Products/ZopeInterface;
license = licenses.zpt20;
maintainers = with maintainers; [ goibhniu ];
};
};
hgsvn = buildPythonPackage rec {
name = "hgsvn-0.3.11";