Skip to content

Fix builds for pythonPackages.azure-mgmt-*#52550

Merged
bendlas merged 3 commits intomasterfrom
fix-azure-mgmt
Mar 10, 2019
Merged

Fix builds for pythonPackages.azure-mgmt-*#52550
bendlas merged 3 commits intomasterfrom
fix-azure-mgmt

Conversation

@bendlas
Copy link
Copy Markdown
Contributor

@bendlas bendlas commented Dec 19, 2018 •
edited
Loading

Don't merge until nixops is updated!

EDIT Nixops has received a package-private, pinned version of azure-mgmt-*, so this can be merged at leisure

Motivation for this change

Followup to the reverts in #52547

Revert the reverted updates and apply some build fixes on top

With this, nixops still fails, because it can't work with these versions, so this will need to wait until nixops is updated:

Traceback (most recent call last):
  File "/nix/store/jsnrx8ggppa9q7iiry88s763y0p2qhb5-nixops-1.6.1pre2706_d5ad09c/bin/..nixops-wrapped-wrapped", line 5, in <module>
    from nixops import deployment
  File "/nix/store/jsnrx8ggppa9q7iiry88s763y0p2qhb5-nixops-1.6.1pre2706_d5ad09c/lib/python2.7/site-packages/nixops/deployment.py", line 1275, in <module>
    _load_modules_from("backends")
  File "/nix/store/jsnrx8ggppa9q7iiry88s763y0p2qhb5-nixops-1.6.1pre2706_d5ad09c/lib/python2.7/site-packages/nixops/deployment.py", line 1273, in _load_modules_from
    importlib.import_module("nixops." + dir + "." + module[:-3])
  File "/nix/store/w30zkhdjf6qp4ppx9xzffsh9dic31aq8-python-2.7.15/lib/python2.7/importlib/__init__.py", line 37, in import_module
    __import__(name)
  File "/nix/store/jsnrx8ggppa9q7iiry88s763y0p2qhb5-nixops-1.6.1pre2706_d5ad09c/lib/python2.7/site-packages/nixops/backends/azure_vm.py", line 23, in <module>
    from nixops.azure_common import ResourceDefinition, ResourceState, ResId, normalize_location
  File "/nix/store/jsnrx8ggppa9q7iiry88s763y0p2qhb5-nixops-1.6.1pre2706_d5ad09c/lib/python2.7/site-packages/nixops/azure_common.py", line 19, in <module>
    from azure.mgmt.network import NetworkResourceProviderClient
ImportError: cannot import name NetworkResourceProviderClient

cc @olcai @FRidh

@bendlas bendlas requested a review from FRidh as a code owner December 19, 2018 23:18
@GrahamcOfBorg GrahamcOfBorg added the 6.topic: python Python is a high-level, general-purpose programming language. label Dec 19, 2018
@bendlas bendlas mentioned this pull request Dec 19, 2018
Open
@GrahamcOfBorg GrahamcOfBorg added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Dec 19, 2018
@bendlas
Copy link
Copy Markdown
Contributor Author

bendlas commented Dec 19, 2018

btw, if you want to reproduce the error, please do so with nixopsUnstable. nixops still fails for a different reason NixOS/nixops#1050

@bendlas
Copy link
Copy Markdown
Contributor Author

bendlas commented Mar 3, 2019

these libraries have been updated in 3a49f98 2eb9ded 808e5d9 9f97782 7f80b2f

I'll pin the older versions in the nixops package, so that work on NixOS/nixops#1065 can progress independently.

@bendlas bendlas closed this Mar 3, 2019
bendlas added a commit to bendlas/nixpkgs that referenced this pull request Mar 3, 2019
@bendlas
azure-mgmt-*: re-init older versions for use with nixops
ce3bf48 
add pinned versions package-private

azure-mgmt-compute 0.20.1
azure-mgmt-network 0.20.1
azure-mgmt-nspkg 1.0.0
azure-mgmt-resource 0.20.1
azure-mgmt-storage 0.20.0

NixOS#52550
NixOS/nixops#1065
@bendlas bendlas mentioned this pull request Mar 3, 2019
Merged
10 tasks
@bendlas
Copy link
Copy Markdown
Contributor Author

bendlas commented Mar 3, 2019

It seems, the azure-mgmt-* builds are still failing: https://hydra.nixos.org/build/89652010 https://hydra.nixos.org/build/89671586

Haven't tested the fixes in this PR with the newer version, but should basically work ...

@bendlas bendlas reopened this Mar 3, 2019
@bendlas bendlas changed the title Update pythonPackages.azure-mgmt-* Fix builds for pythonPackages.azure-mgmt-* Mar 3, 2019
bendlas added a commit that referenced this pull request Mar 3, 2019
@bendlas
azure-mgmt-*: re-init older versions for use with nixops
0c4d750 
add pinned versions package-private

azure-mgmt-compute 0.20.1
azure-mgmt-network 0.20.1
azure-mgmt-nspkg 1.0.0
azure-mgmt-resource 0.20.1
azure-mgmt-storage 0.20.0

#52550
NixOS/nixops#1065
@GrahamcOfBorg GrahamcOfBorg added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 3, 2019
bendlas added a commit that referenced this pull request Mar 3, 2019
@bendlas
nixopsUnstable: mark as broken
77edcf8 
Unstable should probably be working towards updating to the most
recent version, so marking as broken, instead of using the pinned
version, like stable does.

see #52550
see NixOS/nixops#1065
see #52547
flokli pushed a commit that referenced this pull request Mar 6, 2019
@bendlas @flokli
azure-mgmt-*: re-init older versions for use with nixops
17a5b64 
add pinned versions package-private

azure-mgmt-compute 0.20.1
azure-mgmt-network 0.20.1
azure-mgmt-nspkg 1.0.0
azure-mgmt-resource 0.20.1
azure-mgmt-storage 0.20.0

#52550
NixOS/nixops#1065
(cherry picked from commit 0c4d750)
@bendlas bendlas mentioned this pull request Mar 7, 2019
Merged
10 tasks
@bendlas
Copy link
Copy Markdown
Contributor Author

bendlas commented Mar 7, 2019

This build failure was ported to stable: #55757

@bendlas bendlas added 9.needs: port to stable A PR needs a backport to the stable release. 0.kind: regression Something that worked before working no longer and removed 8.has: package (new) This PR adds a new package labels Mar 7, 2019
@bendlas bendlas added this to the 19.03 milestone Mar 7, 2019
@bendlas
Copy link
Copy Markdown
Contributor Author

bendlas commented Mar 7, 2019

https://hydra.nixos.org/eval/1508454?filter=azure-mgmt&compare=1508182&full=#tabs-still-fail

cc #56826

@flokli
Copy link
Copy Markdown
Member

flokli commented Mar 8, 2019

@bendlas this doesn't apply anymore, could you rebase?

What else is preventing this from being merged?

Does nixops work with the updated packages, or do we need to keep the private ones?

@bendlas
Copy link
Copy Markdown
Contributor Author

bendlas commented Mar 10, 2019

this doesn't apply anymore, could you rebase?

Can do. AFAICT, we don't have any consumers, other than nixops, though.

Does nixops work with the updated packages, or do we need to keep the private ones?

Unfortunately, NixOS/nixops#1065 needs to be resolved first.

@bendlas bendlas merged commit 88d9ef9 into master Mar 10, 2019
@dotlambda
Copy link
Copy Markdown
Member

dotlambda commented Mar 11, 2019

Ran 0 tests in 0.000s

Please add appropriate checkPhases.

@grahamc grahamc deleted the fix-azure-mgmt branch December 28, 2019 20:33
adrianpk added a commit to adrianpk/nixpkgs that referenced this pull request May 31, 2024
@adrianpk
azure-mgmt-*: re-init older versions for use with nixops
206931c 
add pinned versions package-private

azure-mgmt-compute 0.20.1
azure-mgmt-network 0.20.1
azure-mgmt-nspkg 1.0.0
azure-mgmt-resource 0.20.1
azure-mgmt-storage 0.20.0

NixOS#52550
NixOS/nixops#1065
(cherry picked from commit 0c4d750)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@FRidh FRidh Awaiting requested review from FRidh

Assignees

No one assigned

Labels

0.kind: regression Something that worked before working no longer 2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: python Python is a high-level, general-purpose programming language. 9.needs: port to stable A PR needs a backport to the stable release. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches.

Projects

None yet

Milestone

19.03

Development

Successfully merging this pull request may close these issues.

4 participants

@bendlas @flokli @dotlambda @GrahamcOfBorg