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

make pre-split xz conflict with new liblzma #936

Closed
wants to merge 1 commit into from

Conversation

minrk
Copy link
Member

@minrk minrk commented Jan 8, 2025

ref: conda-forge/xz-feedstock#47

makes sure pre-split xz package cannot be installed with new liblzma, both of which provide liblzma.

cc @xhochy

  • Used a static YAML file for the patch if possible (instructions).
  • Ran pre-commit run -a and ensured all files pass the linting checks.
  • Ran python show_diff.py and posted the output as part of the PR.
  • Modifications won't affect packages built in the future.
diff
================================================================================
================================================================================
linux-armv7l
================================================================================
================================================================================
win-32
win-32::xz-5.2.2-0.tar.bz2
win-32::xz-5.2.3-0.tar.bz2
+  "constrains": [
+    "liblzma ==0.0.0"
+  ],
================================================================================
================================================================================
linux-ppc64le
linux-ppc64le::xz-5.2.4-h14c3975_1001.tar.bz2
linux-ppc64le::xz-5.2.4-h6eb9509_1002.tar.bz2
linux-ppc64le::xz-5.2.5-h6eb9509_0.tar.bz2
linux-ppc64le::xz-5.2.5-h6eb9509_1.tar.bz2
linux-ppc64le::xz-5.2.6-hb283c62_0.tar.bz2
+  "constrains": [
+    "liblzma ==0.0.0"
+  ],
================================================================================
================================================================================
osx-arm64
osx-arm64::xz-5.2.5-h642e427_1.tar.bz2
osx-arm64::xz-5.2.6-h57fd34a_0.tar.bz2
+  "constrains": [
+    "liblzma ==0.0.0"
+  ],
================================================================================
================================================================================
linux-aarch64
linux-aarch64::xz-5.2.4-h6dd45c4_1002.tar.bz2
linux-aarch64::xz-5.2.4-hda93590_1001.tar.bz2
linux-aarch64::xz-5.2.5-h6dd45c4_0.tar.bz2
linux-aarch64::xz-5.2.5-h6dd45c4_1.tar.bz2
linux-aarch64::xz-5.2.6-h9cdd2b7_0.tar.bz2
+  "constrains": [
+    "liblzma ==0.0.0"
+  ],
================================================================================
================================================================================
noarch
================================================================================
================================================================================
win-64
win-64::xz-5.2.2-0.tar.bz2
win-64::xz-5.2.3-0.tar.bz2
win-64::xz-5.2.4-h2fa13f4_0.tar.bz2
win-64::xz-5.2.4-h2fa13f4_1.tar.bz2
win-64::xz-5.2.4-h2fa13f4_1001.tar.bz2
win-64::xz-5.2.4-h2fa13f4_1002.tar.bz2
win-64::xz-5.2.4-h3cc03e0_0.tar.bz2
win-64::xz-5.2.4-h3cc03e0_1.tar.bz2
win-64::xz-5.2.4-h3cc03e0_1001.tar.bz2
win-64::xz-5.2.5-h2fa13f4_0.tar.bz2
win-64::xz-5.2.5-h62dcd97_1.tar.bz2
win-64::xz-5.2.6-h8d14728_0.tar.bz2
+  "constrains": [
+    "liblzma ==0.0.0"
+  ],
================================================================================
================================================================================
osx-64
osx-64::xz-5.0.5-1.tar.bz2
osx-64::xz-5.2.2-0.tar.bz2
osx-64::xz-5.2.3-0.tar.bz2
osx-64::xz-5.2.4-h0b31af3_1002.tar.bz2
osx-64::xz-5.2.4-h1de35cc_1001.tar.bz2
osx-64::xz-5.2.4-h470a237_0.tar.bz2
osx-64::xz-5.2.4-h470a237_1.tar.bz2
osx-64::xz-5.2.5-h0b31af3_0.tar.bz2
osx-64::xz-5.2.5-h0b31af3_1.tar.bz2
osx-64::xz-5.2.5-haf1e3a3_1.tar.bz2
osx-64::xz-5.2.6-h775f41a_0.tar.bz2
+  "constrains": [
+    "liblzma ==0.0.0"
+  ],
================================================================================
================================================================================
linux-64
linux-64::xz-5.0.5-1.tar.bz2
linux-64::xz-5.2.2-0.tar.bz2
linux-64::xz-5.2.3-0.tar.bz2
linux-64::xz-5.2.4-h14c3975_1001.tar.bz2
linux-64::xz-5.2.4-h470a237_0.tar.bz2
linux-64::xz-5.2.4-h470a237_1.tar.bz2
linux-64::xz-5.2.4-h516909a_1002.tar.bz2
linux-64::xz-5.2.5-h516909a_0.tar.bz2
linux-64::xz-5.2.5-h516909a_1.tar.bz2
linux-64::xz-5.2.6-h166bdaf_0.tar.bz2
+  "constrains": [
+    "liblzma ==0.0.0"
+  ],

@conda-forge-admin
Copy link
Contributor

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe/meta.yaml) and found it was in an excellent condition.

@h-vetinari
Copy link
Member

I think it'd be more proper to add a run-constraint xz ={{ version }} to liblzma, that way it is similarly uninstallable with the old packages, we don't need to patch old packages (only the new liblzma builds), and we can also make this transparent on the feedstock (which should happen before any repopatching).

@minrk
Copy link
Member Author

minrk commented Jan 8, 2025

OK, I thought this was simpler since the new liblzma builds don't need patches since the split xz builds already have the right pinning and both require similar repodata patches. But I can do that, if it's better.

@minrk
Copy link
Member Author

minrk commented Jan 16, 2025

alternative submitted as conda-forge/xz-feedstock#48 and #945

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.

3 participants