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

Remove the explicit mention of Poetry as a runtime dependency #103

Merged
merged 1 commit into from
Aug 28, 2023

Conversation

gridhead
Copy link
Member

Step down the required Poetry version to v1.1.14 available on Fedora Linux 37

Should fix https://bugzilla.redhat.com/show_bug.cgi?id=2223835

@gridhead
Copy link
Member Author

I did a scratch build with the generated SRPM and can confirm that it works https://koji.fedoraproject.org/koji/taskinfo?taskID=105113576

pyproject.toml Outdated Show resolved Hide resolved
@nphilipp nphilipp self-assigned this Aug 22, 2023
@gridhead gridhead force-pushed the fix-ftbfs-f37 branch 2 times, most recently from 3ece236 to 2193c04 Compare August 23, 2023 02:54
@gridhead gridhead changed the title Step down the required Poetry version to v1.1.14 available on Fedora Linux 37 Remove the explicit mention of Poetry as a runtime dependency Aug 23, 2023
@nphilipp
Copy link
Member

NB: The way merge conflicts in poetry.lock were resolved before in this PR doesn’t work – the content-hash will be inconsistent with the contents.

I’ve applied the changes I asked for and resolved the current conflicts. For that, I removed the conflict – erased one of the content-hash lines and the conflict markers, then ran poetry lock --no-update like this:

(mirrors-countme) nils@makake:~/src/fedora-infra/mirrors-countme (gridhead--fix-ftbfs-f37)> git rebase main
Auto-merging poetry.lock
CONFLICT (content): Merge conflict in poetry.lock
Auto-merging pyproject.toml
error: could not apply 4cd857f... Mark Poetry as a dev dependency only
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 4cd857f... Mark Poetry as a dev dependency only
(mirrors-countme) nils@makake:~/src/fedora-infra/mirrors-countme ((no branch, rebasing gridhead--fix-ftbfs-f37))> git diff
diff --cc poetry.lock
index 21a1a08,56eff34..0000000
--- a/poetry.lock
+++ b/poetry.lock
@@@ -1583,4 -1525,4 +1525,8 @@@ testing = ["big-O", "jaraco.functools"
  [metadata]
  lock-version = "2.0"
  python-versions = "^3.11"
++<<<<<<< HEAD
 +content-hash = "1c835f5741732a64c14f27bff76c70b08b98f257a744360289b442d29d000007"
++=======
+ content-hash = "f79387af95c9ddd7f480b89bf6572dd189bfebb8820bbb24da5082b9271dee4e"
++>>>>>>> 4cd857f (Mark Poetry as a dev dependency only)
(mirrors-countme) nils@makake:~/src/fedora-infra/mirrors-countme ((no branch, rebasing gridhead--fix-ftbfs-f37))> vim poetry.lock 
(mirrors-countme) nils@makake:~/src/fedora-infra/mirrors-countme ((no branch, rebasing gridhead--fix-ftbfs-f37))> poetry lock --no-update
Resolving dependencies... Downloading https://files.pythonhosted.org/packages/7e/27/1ed13b9e50c4bb317bResolving dependencies... Downloading https://files.pythonhosted.org/packages/7e/27/1ed13b9e50c4bb317bResolving dependencies... Downloading https://files.pythonhosted.org/packages/7e/27/1ed13b9e50c4bb317bResolving dependencies... (1.0s)

Writing lock file
(mirrors-countme) nils@makake:~/src/fedora-infra/mirrors-countme ((no branch, rebasing gridhead--fix-ftbfs-f37))> git diff
diff --cc poetry.lock
index 21a1a08,56eff34..0000000
--- a/poetry.lock
+++ b/poetry.lock
@@@ -1583,4 -1525,4 +1525,4 @@@ testing = ["big-O", "jaraco.functools"
  [metadata]
  lock-version = "2.0"
  python-versions = "^3.11"
- content-hash = "1c835f5741732a64c14f27bff76c70b08b98f257a744360289b442d29d000007"
 -content-hash = "f79387af95c9ddd7f480b89bf6572dd189bfebb8820bbb24da5082b9271dee4e"
++content-hash = "e6d7e74d8366cf906f6418683b82a24061c055236d2ba28a198295c14042865a"
(mirrors-countme) nils@makake:~/src/fedora-infra/mirrors-countme ((no branch, rebasing gridhead--fix-ftbfs-f37))> git add poetry.lock 
(mirrors-countme) nils@makake:~/src/fedora-infra/mirrors-countme ((no branch, rebasing gridhead--fix-ftbfs-f37))> git rebase --cont
[detached HEAD cbd1bda] Mark Poetry as a dev dependency only
 Author: Akashdeep Dhar <akashdeep.dhar@gmail.com>
 2 files changed, 398 insertions(+), 456 deletions(-)
Successfully rebased and updated refs/heads/gridhead--fix-ftbfs-f37.
(mirrors-countme) nils@makake:~/src/fedora-infra/mirrors-countme (gridhead--fix-ftbfs-f37)>

Signed-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>
Signed-off-by: Nils Philippsen <nils@redhat.com>
@nphilipp nphilipp merged commit a030d7e into fedora-infra:main Aug 28, 2023
3 checks passed
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.

4 participants