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.

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

Nix #1067

Merged
merged 27 commits into from
Oct 31, 2023
Merged

Nix #1067

merged 27 commits into from
Oct 31, 2023

Conversation

alecandido
Copy link
Member

Checklist:

  • Reviewers confirm new code works as expected.
  • Tests are passing.
  • Coverage does not decrease.
  • Documentation is updated.

@alecandido alecandido requested a review from scarrazza October 30, 2023 10:58
@alecandido alecandido mentioned this pull request Oct 30, 2023
4 tasks
@scarrazza
Copy link
Member

@alecandido why nix in the lock file? Could you please fix the conflict, it seems that I cannot simply do poetry update?

@codecov
Copy link

codecov bot commented Oct 30, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Files Coverage Δ
src/qibo/gates/abstract.py 100.00% <100.00%> (ø)
src/qibo/gates/gates.py 100.00% <100.00%> (ø)
src/qibo/gates/measurements.py 100.00% <100.00%> (ø)
src/qibo/models/circuit.py 100.00% <100.00%> (ø)

📢 Thoughts on this report? Let us know!.

@alecandido
Copy link
Member Author

Nix has its own lock file, flake.lock, and it's completely decoupled. The conflict comes from this branch being based on an old version of master, and the lock file having been modified in #809 (I added IPython and pdb++ as development tools).

I reran poetry lock, and everything should be fixed and consistent

@scarrazza
Copy link
Member

Thanks, we can merge as soon as tests pass.

@scarrazza
Copy link
Member

Windows seems not happy again.

@alecandido
Copy link
Member Author

The problem doesn't seem to be Windows, but rather a conflict with #1039.

It actually defined M.load in a separate way from any other gate, and now it is conflicting with the general Gate.load, and failing in test_result.py.

@scarrazza
Copy link
Member

@BrunoLiegiBastonLiegi could you please have a look and chat with @alecandido

@scarrazza scarrazza merged commit 401f724 into master Oct 31, 2023
26 checks passed
@scarrazza scarrazza deleted the nix branch November 2, 2023 14:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants