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

[staging] python3Packages.virtualenv: 20.2.1 -> 20.3.1 #109930

Merged
merged 2 commits into from Jan 19, 2021
Merged

[staging] python3Packages.virtualenv: 20.2.1 -> 20.3.1 #109930

merged 2 commits into from Jan 19, 2021

Conversation

fabaff
Copy link
Member

@fabaff fabaff commented Jan 19, 2021

Motivation for this change

Update to latest upstream release 20.3.1

Change log: https://virtualenv.pypa.io/en/latest/changelog.html#bugfixes-20-3-1

This PR also enables the tests.

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.

@ofborg ofborg bot requested a review from cillianderoiste January 19, 2021 10:01
@fabaff
Copy link
Member Author

fabaff commented Jan 19, 2021

/rebase-staging

@fabaff fabaff changed the title python3Packages.virtualenv: 20.2.1 -> 20.3.1 [staging] python3Packages.virtualenv: 20.2.1 -> 20.3.1 Jan 19, 2021
@jonringer
Copy link
Contributor

@GrahamcOfBorg build python3Packages.tox

jonringer
jonringer approved these changes Jan 19, 2021
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.

diff LGTM

@jonringer jonringer merged commit c030d1b into NixOS:master Jan 19, 2021
@dotlambda
Copy link
Member

Why was this merged into master?
python37Packages.virtualenv fails to build now.
We should revert.

@dotlambda
Copy link
Member

dotlambda commented Jan 19, 2021 •
edited

The problem on python 3.7 is that xonsh is not packaged as a module (pythonPackages.xonsh does not exist) and is therefore not picked up by the interpreter. I'm not sure if xonsh is supposed to be packaged as a module too.

@jonringer
Copy link
Contributor

-_-... I saw that [staging] title and didnt' even check the target branch

@jonringer
Copy link
Contributor

reverted in c98d6ce 135a14f

@jonringer
Copy link
Contributor

the python37 fix is easy enough, as that's not built by hydra, just need to pin the version for python<3.8

@fabaff fabaff deleted the virtualvenv branch January 19, 2021 19:16
@fabaff
Copy link
Member Author

fabaff commented Jan 19, 2021

I'm too slow...in #109994 I got the error:

error: --- Error ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- nix
builder for '/nix/store/3han1yi5k9xlnpggxmikdfksn6bjncdw-python3.7-virtualenv-20.3.1.drv' failed with exit code 1; last 10 log lines:
  SKIPPED [1] tests/unit/activation/conftest.py:249: PowerShell(
  version=FileNotFoundError(2, "No such file or directory: 'pwsh'"),
  creator=CPython3Posix(dest=/build/pytest-of-nixbld/pytest-0/activation-tester-env3/e-$ èрт🚒♞中片-j, clear=False, no_vcs_ignore=False, global=False),
  interpreter=PythonInfo(spec=CPython3.7.9.final.0-64, exe=/nix/store/q5hdqw6bcp3mfzg8l9m2qhra3y892xwm-python3-3.7.9/bin/python3.7, platform=linux, version='3.7.9 (default, Aug 15 2020, 06:36:35) \n[GCC 10.2.0]', encoding_fs_io=utf-8-UTF-8)) is not available due [Errno 2] No such file or directory: 'pwsh': 'pwsh'
  SKIPPED [1] tests/integration/test_run_int.py: need --int option to run
  SKIPPED [1] tests/integration/test_zipapp.py: need --int option to run
  SKIPPED [2] tests/integration/test_zipapp.py:95: need --int option to run
  FAILED tests/unit/activation/test_xonsh.py::test_xonsh[with_prompt] - IndexEr...
  FAILED tests/unit/activation/test_xonsh.py::test_xonsh[no_prompt] - IndexErro...
  ===== 2 failed, 209 passed, 15 skipped, 2 deselected, 1 warning in 17.42s ======

@dotlambda dotlambda mentioned this pull request Jan 20, 2021
Merged
10 tasks
@dotlambda
Copy link
Member

the python37 fix is easy enough, as that's not built by hydra, just need to pin the version for python<3.8

If we use xonsh.override { python3Packages = python.pkgs } in virtualenv, that would only work for Python versions for which we can build xonsh, which excludes Python 2.7.
Hence I suggest simply adding disabledTests = [ "test_xonsh" ]; and removing xonsh from checkInputs.

@dotlambda dotlambda mentioned this pull request Jan 22, 2021
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@cillianderoiste cillianderoiste Awaiting requested review from cillianderoiste

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@fabaff @jonringer @dotlambda