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

jupyterhub, jupyter-telemetry: 1.0.0 -> 1.1.0, init at 0.1.0 #94866

Closed
wants to merge 2 commits into from
Closed

jupyterhub, jupyter-telemetry: 1.0.0 -> 1.1.0, init at 0.1.0 #94866

wants to merge 2 commits into from

Conversation

chiroptical
Copy link
Contributor

Resolve issue with jupyterhub 1.0.0 through upgrade, requires jupyter-telemetry as a dependency

Motivation for this change

Experienced an issue with JupyterHub 1.0.0 which is resolved by upgrading to 1.1.0. During the upgrade, determined that jupyter-telemetry is a build dependency.

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.
Unsure how to proceed (errors seem unrelated to change)
  • Command nix-shell -p nixpkgs-review --run "nixpkgs-review wip" fails with Python XML related error
  • Command nix path-info -S errors out

@ofborg ofborg bot requested review from cstrahan and ixxie August 7, 2020 13:47
jonringer
jonringer reviewed Aug 7, 2020
View reviewed changes
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.

should have two commits:

pythonPackages.jupyter-telemetry: init at 0.1.0
pythonPackages.jupyterhub: 1.0.0 -> 1.1.0

pkgs/development/python-modules/jupyter-telemetry/default.nix Show resolved Hide resolved
@jonringer
Copy link
Contributor

thanks for opening your first PR with nixpkgs :)

@jonringer
Copy link
Contributor

related: #94783

@chiroptical
Copy link
Contributor Author

related: #94783

Thanks for pointing this out! This will be huge for where I want to end up.

jonringer
jonringer reviewed Aug 7, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment •
edited

Choose a reason for hiding this comment

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

just realized this was made against release-20.03 please target master branch.

Backports to release branches only really happen if the application is unusable without the backport (E.g. Discord), or security patches.

Full explanation

When backporting changes, please follow https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes.

Namely, you should be doing git cherry-pick -x <rev> from a commit that has already landed in master. If the branches have diverged, you may alter the commit or add another commit to ensure that the package is able to still evaluate and build.

jonringer
jonringer reviewed Aug 7, 2020
View reviewed changes
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. 

  ERROR: Package 'jupyter-telemetry' requires a different Python: 2.7.18 not in '>=3.5'
  builder for '/nix/store/27242kazi4zb78481lhgxfxvhhd4j590-python2.7-jupyter_telemetry-0.1.0.drv' failed with exit code 1
cannot build derivation '/nix/store/0dsj3sfaaxq1jwpnxgplnj5il1566r7k-env.drv': 1 dependencies couldn't be built
[10 built (1 failed), 271 copied (570.2 MiB), 101.9 MiB DL]
error: build of '/nix/store/0dsj3sfaaxq1jwpnxgplnj5il1566r7k-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/94866
1 package failed to build:
python27Packages.jupyter-telemetry

pkgs/development/python-modules/jupyter-telemetry/default.nix

buildPythonPackage rec {
pname = "jupyter_telemetry";
version = "0.1.0";
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.0";
version = "0.1.0";
disabled = isPy27;

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I noticed two things: https://github.com/jupyter/telemetry/blob/341f34421d73f11ec5538da8b04a52eb632f7511/setup.py#L33

and

nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix

Line 57 in 84cf00f

disabled = pythonOlder "3.5";

It seems like these is more appropriate?

pkgs/development/python-modules/jupyter-telemetry/default.nix
@@ -0,0 +1,28 @@
{ stdenv
, buildPythonPackage
, fetchPypi
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
, fetchPypi
, fetchPypi
, isPy27

@chiroptical
Copy link
Contributor Author

just realized this was made against release-20.03 please target master branch.

Backports to release branches only really happen if the application is unusable without the backport (E.g. Discord), or security patches.

Can do. I think I misunderstood the documentation when reading it.

@chiroptical chiroptical closed this Aug 7, 2020
@jonringer
Copy link
Contributor

jonringer commented Aug 7, 2020 •
edited

@chiroptical you didn't have to close, you could have done:

git rebase --onto=origin/master HEAD^^
git push .. .. --force

then in github, go to "edit" and change target branch to master

@chiroptical
Copy link
Contributor Author 

git rebase --onto=origin/master HEAD^^
git push .. .. --force

Nice, I didn't realize I could do this. Will fix this up now.

@chiroptical chiroptical mentioned this pull request Aug 7, 2020
Merged
10 tasks
@chiroptical
Copy link
Contributor Author

chiroptical commented Aug 7, 2020 •
edited

Corrected in #94885, sorry for my naivety.

@jonringer
Copy link
Contributor

sorry for naivety.

don't apologize for being unaware. I didn't know either until a few months ago :)

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

@jonringer jonringer jonringer left review comments

@FRidh FRidh Awaiting requested review from FRidh FRidh is a code owner

@cstrahan cstrahan Awaiting requested review from cstrahan

@ixxie ixxie Awaiting requested review from ixxie

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@chiroptical @jonringer @Janik-Haag