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.

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

bpython: fix build #120909

Merged
merged 3 commits into from
May 9, 2021
Merged

bpython: fix build #120909

merged 3 commits into from
May 9, 2021

Conversation

eduardosm
Copy link
Contributor

@eduardosm eduardosm commented Apr 27, 2021 •
edited
Loading

Motivation for this change
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.

@eduardosm
Copy link
Contributor Author

Result of nixpkgs-review pr 120909 run on x86_64-linux 1

6 packages built:
  • python38Packages.bpython
  • python38Packages.curtsies
  • python38Packages.cwcwidth
  • python39Packages.bpython
  • python39Packages.curtsies
  • python39Packages.cwcwidth

@ofborg ofborg bot requested a review from flokli April 27, 2021 18:10
@r-rmcgibbo
Copy link

r-rmcgibbo commented Apr 27, 2021 •
edited
Loading

Result of nixpkgs-review pr 120909 at acc297bb run on aarch64-linux 1

6 packages built successfully:
  • python38Packages.bpython
  • python38Packages.curtsies
  • python38Packages.cwcwidth
  • python39Packages.bpython
  • python39Packages.curtsies
  • python39Packages.cwcwidth
3 suggestions:
  • warning: python-include-tests

    Consider adding a checkPhase for tests, or if not feasible, pythonImportsCheck.

    Near pkgs/development/python-modules/bpython/default.nix:42:0:

       |
42 |     description = "A fancy curses interface to the Python interactive interpreter";
   | ^
  • warning: unused-argument

    Unused argument: fetchpatch.
    Near pkgs/development/python-modules/curtsies/default.nix:1:39:

      |
1 | { lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, cwcwidth, typing ? null}:
  |                                       ^
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/development/python-modules/bpython/default.nix:24:15:

       |
24 |   patches = [ (substituteAll {
   |               ^

Result of nixpkgs-review pr 120909 at 1524b3dd run on x86_64-linux 1

6 packages built successfully:
  • python38Packages.bpython
  • python38Packages.curtsies
  • python38Packages.cwcwidth
  • python39Packages.bpython
  • python39Packages.curtsies
  • python39Packages.cwcwidth
1 suggestion:
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/development/python-modules/bpython/default.nix:24:15:

       |
24 |   patches = [ (substituteAll {
   |               ^

@eduardosm
Copy link
Contributor Author 

* Consider adding a `checkPhase` for tests, or if not feasible, `pythonImportsCheck`.

Done

warning: unused-argument

Done

* Please add a comment on the line above, explaining the purpose of this patch.

Not part of this PR

drewrisinger
drewrisinger suggested changes Apr 27, 2021
View reviewed changes
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 mostly LGTM. Could use small improvements to cwcwidth.
  • Commits: could squash the two bpython commits.
  • Builds via nix-review on x86-64-linux
6 packages built:
python38Packages.bpython python38Packages.curtsies python38Packages.cwcwidth python39Packages.bpython python39Packages.curtsies python39Packages.cwcwidth

pkgs/development/python-modules/bpython/default.nix Outdated
@@ -24,7 +26,7 @@ buildPythonPackage rec {
which = "${which}/bin/which";
})];

propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ];
propagatedBuildInputs = [ curtsies greenlet pygments requests urwid pyxdg ];
Copy link
Contributor

Choose a reason for hiding this comment

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

These could be sorted alphabetically on separate lines.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

pkgs/development/python-modules/cwcwidth/default.nix Outdated
Comment on lines 15 to 31
description = "Python bindings for wc(s)width";
homepage = "https://github.com/sebastinas/cwcwidth";
license = licenses.mit;
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
description = "Python bindings for wc(s)width";
homepage = "https://github.com/sebastinas/cwcwidth";
license = licenses.mit;
description = "Python bindings for wc(s)width";
homepage = "https://github.com/sebastinas/cwcwidth";
changelog = "https://github.com/sebastinas/cwcwidth/blob/main/CHANGELOG.md";
license = licenses.mit;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

pkgs/development/python-modules/cwcwidth/default.nix

buildPythonPackage rec {
pname = "cwcwidth";
version = "0.1.4";
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
version = "0.1.4";
version = "0.1.4";
format = "pyproject";

https://github.com/sebastinas/cwcwidth/blob/v0.1.4/pyproject.toml

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What's the advantage over setuptools?

Copy link
Contributor

Choose a reason for hiding this comment

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

pyproject is likely to be the more supported use case moving forward

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changed then

pkgs/development/python-modules/cwcwidth/default.nix Show resolved Hide resolved
@drewrisinger drewrisinger mentioned this pull request Apr 27, 2021
Merged
10 tasks
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/515

@eduardosm
Copy link
Contributor Author

ZHF: #122042

@symphorien symphorien merged commit 9be4c79 into NixOS:master May 9, 2021
@eduardosm eduardosm deleted the bpython branch May 9, 2021 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drewrisinger drewrisinger drewrisinger requested changes

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@flokli flokli Awaiting requested review from flokli

Assignees
No one assigned
Labels
6.topic: python 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@eduardosm @r-rmcgibbo @nixos-discourse @jonringer @drewrisinger @symphorien