jenkins-job-builder: fix build #363535
Closed
jenkins-job-builder: fix build #363535
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes the build. And transitively fixes building jenkins-job-builder.
Or else Jenkins stops the built-in node due to lack of disk space (when using the default 1 GiB).
…packaging' Now it runs!
github-actions
bot
added
6.topic: python
6.topic: nixos
13 tasks
|
Result of 4 packages marked as broken and skipped:
14 packages failed to build:
170 packages built:
|
No regressions; they fail also on the base branch. |
Bot-wxt1221
reviewed
Dec 9, 2024
Correct. I wasn't sure what to put there, because the individual commits touch various parts of the tree. So whatever pattern I chose for the PR title I felt it was "wrong". But OK, I can update it to match the guidelines. |
Bot-wxt1221
approved these changes
Dec 9, 2024
|
@ofborg test jenkins |
SuperSandro2000
requested changes
Dec 9, 2024
| @@ -29,6 +27,7 @@ buildPythonPackage rec { | |||
| build-system = [ setuptools ]; | |||
|
|
|||
| dependencies = [ | |||
| distutils | |||
There was a problem hiding this comment.
This is wrong. distutils should go to pbr like I did in #362467 because openstackdocstheme has no direct dependency on it and this likely also fixes other packages which I didn't explicitly tested https://github.com/search?q=repo%3Aopenstack%2Fopenstackdocstheme%20distutils%20&type=code
| @@ -14,9 +15,6 @@ buildPythonPackage rec { | |||
| version = "3.4.0"; | |||
| pyproject = true; | |||
|
|
|||
| # breaks on import due to distutils import through pbr.packaging | |||
| disabled = pythonAtLeast "3.12"; | |||
There was a problem hiding this comment.
openstack is very picky about versions and generally there is usually something that breaks in pbr or maybe in other parts up to openstackclient-full and I am pretty confident that 3.13 will most likely break some dependency again.
| @@ -39,6 +41,7 @@ buildPythonPackage rec { | |||
| ''; | |||
|
|
|||
| dependencies = [ | |||
| packaging | |||
There was a problem hiding this comment.
This is only required from version 6.4.2 and onwards https://opendev.org/jjb/jenkins-job-builder/commit/7bf0dacd80d6da7b8562db05f9187140e42947c8
wegank
added
the
12.approvals: 1
ofborg
bot
requested review from
anthonyroussel,
Bot-wxt1221,
Vinetos and
SuperSandro2000
wegank
added
the
12.approved-by: package-maintainer
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Things done
Fix building/running jenkins-job-builder and make nixosTests.jenkins pass.
Commits:
Fixes #362054.
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.