Skip to content
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.

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

pythonPackages.netaddr: 0.7.19 -> 0.8.0 #98151

Merged
merged 1 commit into from Sep 20, 2020

Conversation

thefloweringash
Copy link
Member

Updating to >= 0.7.20 fixes tests on macOS Catalina and newer:

        #   inet_pton has to be different on Mac OSX *sigh*
        assert IPAddress('010.000.000.001', flags=INET_PTON) == IPAddress('10.0.0.1')
>       assert int_to_str(0xffff) == '::0.0.255.255'
E       AssertionError: assert '::ffff' == '::0.0.255.255'
E         - ::0.0.255.255
E         + ::ffff
Motivation for this change

Package update and fixing tests on newer macOS versions.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Copy link
Contributor

@drewrisinger drewrisinger left a comment

Choose a reason for hiding this comment

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

  • Diff needs a bit of work, could update some meta attributes
  • Commits LgTM
  • Haven't tested nix-review

pkgs/development/python-modules/netaddr/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/netaddr/default.nix Outdated Show resolved Hide resolved
})
];
checkInputs = [ glibcLocales pytest ]
++ stdenv.lib.optionals (pythonOlder "3.7") [ importlib-resources ] ;

meta = with stdenv.lib; {
homepage = "https://github.com/drkjam/netaddr/";
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
homepage = "https://github.com/drkjam/netaddr/";
homepage = "https://netaddr.readthedocs.io/en/latest/";
changelog = "https://netaddr.readthedocs.io/en/latest/changes.html";

That github repo is out of date.

Would you consider adding yourself as maintainer as well, since this package doesn't have a maintainer?

Copy link
Member Author

Choose a reason for hiding this comment

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

I updated the homepage to point to the netaddr/netaddr GitHub repo, which seems to be the new home.

I'd prefer not to add myself as a maintainer. I don't know much about this package other than it's in my nix-darwin system closure and doesn't build on current macOS without an update.

Copy link
Contributor

Choose a reason for hiding this comment

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

I generally prefer to point the homepage to what would make the most sense for users, not maintainers (i.e. documentation, not the repository), under the assumption that maintainers can find the repository themselves (though to be fair that's mostly for packages using fetchFromGitHub, so the GitHub is obvious).

The nixpkgs manual also hints at this, by showing the GNU manual in homepage. There's a not-used-enough meta.downloadPage attribute that the GitHub link would best fit in:
downloadPage = "https://github.com/netaddr/netaddr/releases";

Copy link
Member Author

Choose a reason for hiding this comment

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

I generally prefer to point the homepage to what would make the most sense for users, not maintainers

Seems reasonable to me, I wasn’t aware of this convention but I do see a number of usages in the python part of nixpkgs. Updated to have the recommended homepage and downloadPage

pkgs/development/python-modules/netaddr/default.nix Outdated Show resolved Hide resolved
@thefloweringash
Copy link
Member Author

Result of nixpkgs-review pr 98151 1

4 packages marked as broken and skipped:
  • linuxPackages_hardkernel_4_14.bcc
  • linuxPackages_hardkernel_4_14.bpftrace
  • linuxPackages_hardkernel_latest.bcc
  • linuxPackages_hardkernel_latest.bpftrace
6 packages failed to build:
  • python27Packages.junos-eznc
  • python37Packages.WSME
  • python37Packages.junos-eznc
  • python38Packages.WSME
  • python38Packages.junos-eznc
  • terraform-compliance
79 packages built:
  • ansible (ansible_2_10)
  • ansible-lint (python38Packages.ansible-lint)
  • ansible_2_8
  • ansible_2_9 (python38Packages.ansible)
  • dnsrecon
  • kargo
  • linuxPackages-libre.bcc
  • linuxPackages-libre.bpftrace
  • linuxPackages-libre.oci-seccomp-bpf-hook
  • linuxPackages.bcc (linuxPackages_5_4.bcc)
  • linuxPackages.bpftrace (linuxPackages_5_4.bpftrace)
  • linuxPackages.oci-seccomp-bpf-hook (linuxPackages_5_4.oci-seccomp-bpf-hook)
  • linuxPackages_4_14.bcc
  • linuxPackages_4_14.bpftrace
  • linuxPackages_4_19.bcc
  • linuxPackages_4_19.bpftrace
  • linuxPackages_4_4.bcc
  • linuxPackages_4_4.bpftrace
  • linuxPackages_4_9.bcc
  • linuxPackages_4_9.bpftrace
  • linuxPackages_5_7.bcc
  • linuxPackages_5_7.bpftrace
  • linuxPackages_5_7.oci-seccomp-bpf-hook
  • linuxPackages_5_8.bcc (linuxPackages_latest.bcc)
  • linuxPackages_5_8.bpftrace (linuxPackages_latest.bpftrace)
  • linuxPackages_5_8.oci-seccomp-bpf-hook (linuxPackages_latest.oci-seccomp-bpf-hook)
  • linuxPackages_hardened.bcc
  • linuxPackages_hardened.bpftrace
  • linuxPackages_hardened.oci-seccomp-bpf-hook
  • linuxPackages_latest-libre.bcc
  • linuxPackages_latest-libre.bpftrace
  • linuxPackages_latest-libre.oci-seccomp-bpf-hook
  • linuxPackages_latest_hardened.bcc
  • linuxPackages_latest_hardened.bpftrace
  • linuxPackages_latest_hardened.oci-seccomp-bpf-hook
  • linuxPackages_latest_xen_dom0.bcc
  • linuxPackages_latest_xen_dom0.bpftrace
  • linuxPackages_latest_xen_dom0.oci-seccomp-bpf-hook
  • linuxPackages_latest_xen_dom0_hardened.bcc
  • linuxPackages_latest_xen_dom0_hardened.bpftrace
  • linuxPackages_latest_xen_dom0_hardened.oci-seccomp-bpf-hook
  • linuxPackages_testing_bcachefs.bcc
  • linuxPackages_testing_bcachefs.bpftrace
  • linuxPackages_testing_bcachefs.oci-seccomp-bpf-hook
  • linuxPackages_xen_dom0.bcc
  • linuxPackages_xen_dom0.bpftrace
  • linuxPackages_xen_dom0.oci-seccomp-bpf-hook
  • linuxPackages_xen_dom0_hardened.bcc
  • linuxPackages_xen_dom0_hardened.bpftrace
  • linuxPackages_xen_dom0_hardened.oci-seccomp-bpf-hook
  • linuxPackages_zen.bcc
  • linuxPackages_zen.bpftrace
  • linuxPackages_zen.oci-seccomp-bpf-hook
  • matrix-synapse
  • octoprint
  • python27Packages.ansible
  • python27Packages.netaddr
  • python27Packages.pyrad
  • python27Packages.pytest-ansible
  • python27Packages.wfuzz
  • python37Packages.ansible
  • python37Packages.ansible-kernel
  • python37Packages.ansible-lint
  • python37Packages.ansible-runner
  • python37Packages.django-postgresql-netfields
  • python37Packages.netaddr
  • python37Packages.privacyidea
  • python37Packages.pyrad
  • python37Packages.pytest-ansible
  • python37Packages.wfuzz
  • python38Packages.ansible-kernel
  • python38Packages.ansible-runner
  • python38Packages.django-postgresql-netfields
  • python38Packages.netaddr
  • python38Packages.privacyidea
  • python38Packages.pyrad
  • python38Packages.pytest-ansible
  • wfuzz (python38Packages.wfuzz)
  • theharvester

Updating to >= 0.7.20 fixes tests on macOS Catalina and newer:

        #   inet_pton has to be different on Mac OSX *sigh*
        assert IPAddress('010.000.000.001', flags=INET_PTON) == IPAddress('10.0.0.1')
>       assert int_to_str(0xffff) == '::0.0.255.255'
E       AssertionError: assert '::ffff' == '::0.0.255.255'
E         - ::0.0.255.255
E         + ::ffff
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

failures are broken on target branch

https://github.com/NixOS/nixpkgs/pull/98151
5 packages marked as broken and skipped:
linuxPackages_hardkernel_4_14.bcc linuxPackages_hardkernel_4_14.bpftrace linuxPackages_hardkernel_latest.bcc linuxPackages_hardkernel_latest.bpftrace python27Packages.junos-eznc

3 packages failed to build:
python37Packages.WSME python38Packages.WSME terraform-compliance

81 packages built:
ansible ansible-lint ansible_2_8 ansible_2_9 dnsrecon kargo linuxPackages-libre.bcc linuxPackages-libre.bpftrace linuxPackages-libre.oci-seccomp-bpf-hook linuxPackages.bcc linuxPackages.bpftrace linuxPackages.oci-seccomp-bpf-hook linuxPackages_4_14.bcc linuxPackages_4_14.bpftrace linuxPackages_4_19.bcc linuxPackages_4_19.bpftrace linuxPackages_4_4.bcc linuxPackages_4_4.bpftrace linuxPackages_4_9.bcc linuxPackages_4_9.bpftrace linuxPackages_5_7.bcc linuxPackages_5_7.bpftrace linuxPackages_5_7.oci-seccomp-bpf-hook linuxPackages_5_8.bcc linuxPackages_5_8.bpftrace linuxPackages_5_8.oci-seccomp-bpf-hook linuxPackages_hardened.bcc linuxPackages_hardened.bpftrace linuxPackages_hardened.oci-seccomp-bpf-hook linuxPackages_latest-libre.bcc linuxPackages_latest-libre.bpftrace linuxPackages_latest-libre.oci-seccomp-bpf-hook linuxPackages_latest_hardened.bcc linuxPackages_latest_hardened.bpftrace linuxPackages_latest_hardened.oci-seccomp-bpf-hook linuxPackages_latest_xen_dom0.bcc linuxPackages_latest_xen_dom0.bpftrace linuxPackages_latest_xen_dom0.oci-seccomp-bpf-hook linuxPackages_latest_xen_dom0_hardened.bcc linuxPackages_latest_xen_dom0_hardened.bpftrace linuxPackages_latest_xen_dom0_hardened.oci-seccomp-bpf-hook linuxPackages_testing_bcachefs.bcc linuxPackages_testing_bcachefs.bpftrace linuxPackages_testing_bcachefs.oci-seccomp-bpf-hook linuxPackages_xen_dom0.bcc linuxPackages_xen_dom0.bpftrace linuxPackages_xen_dom0.oci-seccomp-bpf-hook linuxPackages_xen_dom0_hardened.bcc linuxPackages_xen_dom0_hardened.bpftrace linuxPackages_xen_dom0_hardened.oci-seccomp-bpf-hook linuxPackages_zen.bcc linuxPackages_zen.bpftrace linuxPackages_zen.oci-seccomp-bpf-hook matrix-synapse octoprint python27Packages.ansible python27Packages.netaddr python27Packages.pyrad python27Packages.pytest-ansible python27Packages.wfuzz python37Packages.ansible python37Packages.ansible-kernel python37Packages.ansible-lint python37Packages.ansible-runner python37Packages.django-postgresql-netfields python37Packages.junos-eznc python37Packages.netaddr python37Packages.privacyidea python37Packages.pyrad python37Packages.pytest-ansible python37Packages.wfuzz python38Packages.ansible-kernel python38Packages.ansible-runner python38Packages.django-postgresql-netfields python38Packages.junos-eznc python38Packages.netaddr python38Packages.privacyidea python38Packages.pyrad python38Packages.pytest-ansible wfuzz theharvester

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants