Skip to content

Bump Zope packages to support Python 3.6 #27351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Jul 19, 2017
Merged

Bump Zope packages to support Python 3.6 #27351

merged 3 commits into from
Jul 19, 2017
+99 −52

Conversation

adisbladis
Copy link
Member

pythonpackages.zope_testrunner: 4.4.10 -> 4.7.0
pythonpackages.zope_interface: 4.1.3 -> 4.4.2
pythonPackages.zconfig: 3.0.3 -> 3.2.0

Motivation for this change

This fixes build failures on Python 3.6

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@adisbladis adisbladis mentioned this pull request Jul 13, 2017
Merged
8 tasks
@FRidh
Copy link
Member

FRidh commented Jul 13, 2017

Please move the expressions into separate files as explained in the head of python-packages.nix.

@lsix
Copy link
Member

lsix commented Jul 13, 2017

Hi,

Could each update also be done in a separate commit (one for zope_testrunner, one for zope_interface and finally one for zconfig)?

@adisbladis
Copy link
Member Author

@FRidh I didn't want to do this for a simple version bump but sure, it has been done.
@lsix Done :)

FRidh
FRidh requested changes Jul 17, 2017
View reviewed changes
Copy link
Member

@FRidh FRidh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comments I made on the first package also apply to the other two.

pkgs/development/python-modules/zconfig/default.nix Outdated
name = "zconfig-${version}";
version = "3.2.0";

src = pkgs.fetchurl {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fetchPyPI

pkgs/development/python-modules/zconfig/default.nix Outdated
}:

buildPythonPackage rec {
name = "zconfig-${version}";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

pname = "ZConfig";
version = "3.2.0";
name = "${pname}-${version}";

We use the name as used on PyPI, so including uppercase.

pkgs/development/python-modules/zconfig/default.nix Outdated
@@ -0,0 +1,27 @@
{ stdenv
, pythonPackages
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pass in individual items, not the whole package set

pkgs/development/python-modules/zconfig/default.nix Outdated
{ stdenv
, pythonPackages
, buildPythonPackage
, pkgs
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pass in individual items, not the whole package set

pkgs/development/python-modules/zconfig/default.nix Outdated

propagatedBuildInputs = [ zope_testrunner ];

doCheck = false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please include a comment explaining why you disable tests.

pkgs/development/python-modules/zope_testrunner/default.nix Outdated
sha256 = "8ffcb4989829544a83d27e42b2eeb28f8fc134bd847d71ce8dca54f710526ef0";
};

propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ] ++ stdenv.lib.optional (!python.is_py3k or false) subunit;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isPy3k instead of python.is_py3k

@adisbladis adisbladis force-pushed the zope_bump branch 2 times, most recently from 8fb34cd to b258f2a Compare July 18, 2017 03:38
@adisbladis
Copy link
Member Author

@FRidh Ok, all packages updated.

FRidh
FRidh reviewed Jul 18, 2017
View reviewed changes
pkgs/development/python-modules/zope_testrunner/default.nix Outdated
name = "zope.testrunner-${version}";
version = "4.7.0";

src = fetchurl {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fetchPypi

@FRidh
Copy link
Member

FRidh commented Jul 18, 2017

cc maintainer @cillianderoiste

@FRidh FRidh merged commit 3a5735c into NixOS:master Jul 19, 2017
@FRidh
Copy link
Member

FRidh commented Jul 19, 2017

Turns out that this caused quite a rebuild on Hydra, probably due to zope.interface.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh

Assignees
No one assigned
Labels
6.topic: python
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@adisbladis @FRidh @lsix