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

Update bpython to 0.17 #30922

Merged
merged 4 commits into from Oct 29, 2017
Merged

Update bpython to 0.17 #30922

merged 4 commits into from Oct 29, 2017

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Oct 29, 2017 •
edited

Motivation for this change

As mentioned by @adisbladis, pythonPackages is a mess and needs to be cleaned up.

I bumped the bpython package to 0.17, cleaned it up, and added curtsies and pyte, which are both dependencies of bpython (at least now)

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
    • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@flokli flokli requested a review from FRidh as a code owner October 29, 2017 10:32
FRidh
FRidh reviewed Oct 29, 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.

platforms is set by buildPythonPackage.

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

propagatedBuildInputs = [ wcwidth ];

buildInputs = [ pytest pytestrunner ];
Copy link
Member

Choose a reason for hiding this comment

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

checkInputs

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/bpython/default.nix Outdated
sha256 = "13fyyx06645ikvmj9zmkixr12kzk1c3a3f9s9i2rvaczjycn82lz";
};

buildInputs = [ mock ];
Copy link
Member

Choose a reason for hiding this comment

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

checkInputs

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/bpython/default.nix
name = "${pname}-${version}";

# 0.17 is still missing on PyPI, https://github.com/bpython/bpython/issues/706
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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

0.17 is not released to PyPI yet, thats why fetchUrl is used. Issue is linked above.

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

propagatedBuildInputs = [ blessings wcwidth pyte ];

buildInputs = [ nose mock pytest ];
Copy link
Member

Choose a reason for hiding this comment

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

checkInputs

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/bpython/default.nix Outdated
homepage = "https://bpython-interpreter.org/";
license = licenses.mit;
maintainers = with maintainers; [ flokli ];
platforms = platforms.all;
Copy link
Member

Choose a reason for hiding this comment

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

platforms needs to be removed.

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/curtsies/default.nix Outdated
homepage = https://pypi.python.org/pypi/curtsies;
license = licenses.mit;
maintainers = with maintainers; [ flokli ];
platforms = platforms.all;
Copy link
Member

Choose a reason for hiding this comment

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

platforms needs to be removed.

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/pyte/default.nix Outdated
homepage = https://github.com/selectel/pyte;
license = licenses.lgpl3;
maintainers = with maintainers; [ flokli ];
platforms = platforms.all;
Copy link
Member

Choose a reason for hiding this comment

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

platforms needs to be removed.

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

@flokli flokli force-pushed the bpython branch 3 times, most recently from 136ebd2 to a1761f0 Compare October 29, 2017 11:21
@flokli
Copy link
Contributor Author

flokli commented Oct 29, 2017 •
edited

@FRidh Thanks for your review. I addressed all the problems mentioned.
bpython-gtk was removed since 0.14, and urwid is already in nixpkgs, so I added it as propagatedBuildInput.

@flokli flokli changed the title WIP: Update bpython to 0.17 Update bpython to 0.17 Oct 29, 2017
@FRidh
Copy link
Member

FRidh commented Oct 29, 2017

@GrahamcOfBorg python3.pkgs.bpython

@adisbladis adisbladis mentioned this pull request Oct 29, 2017
Merged
8 tasks
@FRidh FRidh merged commit d653271 into NixOS:master Oct 29, 2017
@flokli flokli deleted the bpython branch October 29, 2017 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh FRidh left review comments

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@flokli @FRidh @GrahamcOfBorg