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.

Sign up for GitHub

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

Update to conda 24.1.2, conda-libmamba-solver 24.1.0, libmambapy 1.5.6 #61

Merged
merged 5 commits into from
Feb 29, 2024
Merged

Update to conda 24.1.2, conda-libmamba-solver 24.1.0, libmambapy 1.5.6 #61

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6dd0d16
Update to conda 24.1.2, conda-libmamba-solver 24.1.0, libmambapy 1.5.6
jaimergp Feb 27, 2024
fce3b88
Amend patch for conda 24.1.2
jaimergp Feb 27, 2024
7b63c62
add news
jaimergp Feb 27, 2024
feb25e0
remove patch 0003
jaimergp Feb 27, 2024
76b2ac3
remove unneeded patch
jaimergp Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions news/61-update-conda-2412
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
### Enhancements

* Update to conda 24.1.2, conda-libmamba-solver 24.1.0, libmambapy 1.5.6. (#60)

### Bug fixes

* <news item>

### Deprecations

* <news item>

### Docs

* <news item>

### Other

* <news item>
8 changes: 4 additions & 4 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set conda_version = "23.11.0" %}
{% set conda_libmamba_solver_version = "23.12.0" %}
{% set libmambapy_version = "1.5.3" %}
{% set conda_version = "24.1.2" %}
{% set conda_libmamba_solver_version = "24.1.0" %}
{% set libmambapy_version = "1.5.6" %}
{% set constructor_version = "3.6.0" %}
{% set python_version = "3.10.13" %}
{% set pyver = "".join(python_version.split(".")[:2]) %}
Expand All @@ -13,7 +13,7 @@ source:
- path: ../

- url: https://github.com/conda/conda/archive/{{ conda_version }}.tar.gz
sha256: 9276686c8a6ee536dc451cc6557685724fe275a44949ac4f741066fd23cdc7b4
sha256: 6bc4f1f72a0edddefa10e0667d6ab2eb2f1956919a59508bf3bf6c001bf7a6e8
folder: conda_src
patches:
- ../src/conda_patches/0001-Rename-and-replace-entrypoint-stub-exe.patch
Expand Down
26 changes: 15 additions & 11 deletions src/conda_patches/0003-Return-unknown-module-in-deprecations.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
From: jaimergp
Date: Wed Jun 21 18:53:36 CEST 2023
Date: Tue Feb 27 12:01:36 CEST 2024
Subject: Return 'unknown' instead of raising an exception when the calling module cannot be determined

diff --git a/conda/deprecations.py b/conda/deprecations.py
index 61154a1ee..9273cdde6 100644
index 5d4c0df28..924428fa0 100644
--- a/conda/deprecations.py
+++ b/conda/deprecations.py
@@ -284,7 +284,9 @@ class DeprecationHandler:
module = inspect.getmodule(frame[0])
return (module, module.__name__)
except (IndexError, AttributeError):
- raise DeprecatedError("unable to determine the calling module") from None
+ # raise DeprecatedError("unable to determine the calling module") from None
+ import sys as unknown
+ return (unknown, "<unknown>")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not following, why is this needed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PyInstaller will fail to determine the module being deprecated because some attribute was missing during the inspection. It was introduced in #25. I'll comment it out to see what happens (maybe we don't need it anymore?), and worst case I can post the traceback for posterity.

@@ -288,11 +288,12 @@ class DeprecationHandler:
module = inspect.getmodule(frame)
if module is not None:
return (module, module.__name__)
- except IndexError:
+ except (IndexError, AttributeError):
# IndexError: 2 + stack is out of range
pass

- raise DeprecatedError("unable to determine the calling module")
+ # raise DeprecatedError("unable to determine the calling module")
+ return (sys, "<unknown>")

def _generate_message(
self, deprecate_in: str, remove_in: str, prefix: str, addendum: str
self,
Loading