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

Defend against upcoming libmambapy v2 #800

Merged
merged 3 commits into from
Jul 16, 2024

Conversation

jaimergp
Copy link
Member

@jaimergp jaimergp commented Jul 16, 2024

Checklist

  • Used a static YAML file for the patch if possible (instructions).
  • Only wrote code directly into generate_patch_json.py if absolutely necessary.
  • 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.

xref conda/conda-libmamba-solver#492

@jaimergp jaimergp requested a review from a team as a code owner July 16, 2024 13:40
@conda-forge-webservices
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) and found it was in an excellent condition.

@jaimergp
Copy link
Member Author

The diff:

patching repodata:   0%|          | 0/9 [00:00<?, ?it/s]
patching repodata:  11%|█         | 1/9 [02:17<18:20, 137.55s/it]
================================================================================
================================================================================
noarch
noarch::conda-libmamba-solver-22.6.0-pyhd8ed1ab_0.tar.bz2
noarch::conda-libmamba-solver-22.8.1-pyhd8ed1ab_0.tar.bz2
-    "libmambapy >=0.23",
+    "libmambapy >=0.23,<2.0.0dev0.0a0",
noarch::conda-libmamba-solver-22.12.0-pyhd8ed1ab_0.conda
noarch::conda-libmamba-solver-23.1.0-pyhd8ed1ab_0.conda
-    "libmambapy >=1.0.0",
+    "libmambapy >=1.0.0,<2.0.0dev0.0a0",
noarch::conda-libmamba-solver-23.11.0-pyhd8ed1ab_0.conda
noarch::conda-libmamba-solver-23.12.0-pyhd8ed1ab_0.conda
noarch::conda-libmamba-solver-23.11.1-pyhd8ed1ab_0.conda
-    "libmambapy >=1.5.3",
+    "libmambapy >=1.5.3,<2.0.0dev0.0a0",
noarch::conda-libmamba-solver-23.7.0-pyhd8ed1ab_0.conda
noarch::conda-libmamba-solver-23.3.0-pyhd8ed1ab_0.conda
noarch::conda-libmamba-solver-23.5.0-pyhd8ed1ab_0.conda
-    "libmambapy >=1.4.1",
+    "libmambapy >=1.4.1,<2.0.0dev0.0a0",
noarch::conda-libmamba-solver-23.9.0-pyhd8ed1ab_0.conda
noarch::conda-libmamba-solver-23.9.3-pyhd8ed1ab_0.conda
noarch::conda-libmamba-solver-23.9.2-pyhd8ed1ab_0.conda
noarch::conda-libmamba-solver-23.9.1-pyhd8ed1ab_0.conda
-    "libmambapy >=1.5.1",
+    "libmambapy >=1.5.1,<2.0.0dev0.0a0",
noarch::conda-libmamba-solver-24.1.0-pyhd8ed1ab_0.conda
-    "libmambapy >=1.5.6,<2.0a0",
+    "libmambapy >=1.5.6,<2.0.0dev0.0a0",



patching repodata:  22%|██▏       | 2/9 [02:19<06:43, 57.65s/it] ================================================================================
================================================================================
linux-armv7l



patching repodata:  33%|███▎      | 3/9 [04:21<08:42, 87.07s/it]================================================================================
================================================================================
linux-aarch64


================================================================================
================================================================================
linux-64


patching repodata:  44%|████▍     | 4/9 [05:58<07:34, 90.99s/it]
================================================================================
================================================================================
linux-ppc64le


patching repodata:  56%|█████▌    | 5/9 [06:08<04:07, 61.84s/it]

patching repodata:  67%|██████▋   | 6/9 [07:52<03:48, 76.18s/it]================================================================================
================================================================================
osx-arm64


patching repodata:  78%|███████▊  | 7/9 [08:08<01:53, 56.62s/it]
================================================================================
================================================================================
win-32


patching repodata:  89%|████████▉ | 8/9 [11:12<01:36, 96.95s/it]
================================================================================
================================================================================
osx-64


patching repodata: 100%|██████████| 9/9 [11:59<00:00, 81.51s/it]
================================================================================
================================================================================
win-64


patching repodata: 100%|██████████| 9/9 [11:59<00:00, 79.97s/it]

I think I need to remove the dev0 suffix because tighten_depends already adds the 0a0 one.

@jaimergp
Copy link
Member Author

Ok the diff looks good now:

noarch
noarch::conda-libmamba-solver-22.6.0-pyhd8ed1ab_0.tar.bz2
noarch::conda-libmamba-solver-22.8.1-pyhd8ed1ab_0.tar.bz2
-    "libmambapy >=0.23",
+    "libmambapy >=0.23,<2.0a0",
noarch::conda-libmamba-solver-23.1.0-pyhd8ed1ab_0.conda
noarch::conda-libmamba-solver-22.12.0-pyhd8ed1ab_0.conda
-    "libmambapy >=1.0.0",
+    "libmambapy >=1.0.0,<2.0.0a0",
noarch::conda-libmamba-solver-23.11.0-pyhd8ed1ab_0.conda
noarch::conda-libmamba-solver-23.11.1-pyhd8ed1ab_0.conda
noarch::conda-libmamba-solver-23.12.0-pyhd8ed1ab_0.conda
-    "libmambapy >=1.5.3",
+    "libmambapy >=1.5.3,<2.0.0a0",
noarch::conda-libmamba-solver-23.3.0-pyhd8ed1ab_0.conda
noarch::conda-libmamba-solver-23.7.0-pyhd8ed1ab_0.conda
noarch::conda-libmamba-solver-23.5.0-pyhd8ed1ab_0.conda
-    "libmambapy >=1.4.1",
+    "libmambapy >=1.4.1,<2.0.0a0",
noarch::conda-libmamba-solver-23.9.0-pyhd8ed1ab_0.conda
noarch::conda-libmamba-solver-23.9.1-pyhd8ed1ab_0.conda
noarch::conda-libmamba-solver-23.9.2-pyhd8ed1ab_0.conda
noarch::conda-libmamba-solver-23.9.3-pyhd8ed1ab_0.conda
-    "libmambapy >=1.5.1",
+    "libmambapy >=1.5.1,<2.0.0a0",

The CI failed due to a network issue for a different subdir, so I'll just merge now.

@jaimergp jaimergp merged commit a7c816a into conda-forge:main Jul 16, 2024
2 of 4 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.

2 participants