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

jinja2: fix dependencies #96385

Merged
merged 1 commit into from Aug 26, 2020
Merged

jinja2: fix dependencies #96385

merged 1 commit into from Aug 26, 2020

Conversation

GovanifY
Copy link
Member

Motivation for this change

Jinja2 had a missing dependency on setuptools, uncovered while trying to use llvm-cov+gcovr with meson:

Traceback (most recent call last):
  File "/nix/store/zg111qhdg44rhahz51ixd6dfrwafsasz-python3.8-gcovr-4.2/bin/.gcovr-wrapped", line 9, in <module>
    sys.exit(main())
  File "/nix/store/zg111qhdg44rhahz51ixd6dfrwafsasz-python3.8-gcovr-4.2/lib/python3.8/site-packages/gcovr/__main__.py", line 253, in main
    print_reports(covdata, options, logger)
  File "/nix/store/zg111qhdg44rhahz51ixd6dfrwafsasz-python3.8-gcovr-4.2/lib/python3.8/site-packages/gcovr/__main__.py", line 368, in print_reports
    generator(covdata, output.value, options)
  File "/nix/store/zg111qhdg44rhahz51ixd6dfrwafsasz-python3.8-gcovr-4.2/lib/python3.8/site-packages/gcovr/html_generator.py", line 107, in print_html_report
    data['CSS'] = templates().get_template('style.css').render(
  File "/nix/store/zg111qhdg44rhahz51ixd6dfrwafsasz-python3.8-gcovr-4.2/lib/python3.8/site-packages/gcovr/html_generator.py", line 36, in __call__
    return self.get()
  File "/nix/store/zg111qhdg44rhahz51ixd6dfrwafsasz-python3.8-gcovr-4.2/lib/python3.8/site-packages/gcovr/html_generator.py", line 25, in load
    result = fn()
  File "/nix/store/zg111qhdg44rhahz51ixd6dfrwafsasz-python3.8-gcovr-4.2/lib/python3.8/site-packages/gcovr/html_generator.py", line 46, in templates
    loader=PackageLoader('gcovr'),
  File "/nix/store/2qix64mfl3mw7n76z5ii7plrmms51x2g-python3.8-Jinja2-2.11.2/lib/python3.8/site-packages/jinja2/loaders.py", line 233, in __init__
    from pkg_resources import DefaultProvider
ModuleNotFoundError: No module named 'pkg_resources'
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.

Originally PR #96381, rebased it on staging in this one.

jonringer
jonringer reviewed Aug 26, 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.

To comply with CONTRIBUTING.md please have the commit message name be of the format

<pkg-name>: <subject-line>

for more examples, please look at https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#submitting-changes

in your case, the commit message should be:

python3Packages.jinja2: fix dependencies

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

Fixed the commit name

jonringer
jonringer reviewed Aug 26, 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.

since this change causes over 5000 rebuilds, do you mind targeting the staging branch

git rebase --onto=staging HEAD~1
git push .. ... --force

then change the base branch in the github PR from master -> staging

See https://nixos.org/nixpkgs/manual/#submitting-changes-staging-branch for more details on staging branch

@GovanifY
Copy link
Member Author

@jonringer It is already targeting the staging branch

@jonringer
Copy link
Contributor

sorry, didn't see that

@jonringer jonringer merged commit deced30 into NixOS:staging Aug 26, 2020
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

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@GovanifY @jonringer