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

Update to v24.9.2 #22

Merged
merged 9 commits into from
Nov 6, 2024
Merged

Update to v24.9.2 #22

merged 9 commits into from
Nov 6, 2024

Conversation

marcoesters
Copy link
Contributor

@marcoesters marcoesters commented Oct 31, 2024

conda-standalone 24.9.2

Destination channel: defaults

Links

Explanation of changes:

  • Update conda-standalone to version 24.9.2.
  • Add .condarc file to point to defaults since automatically pointing to defaults is deprecated
  • libmambapy was pinned to 1.5.8 because 1.5.10 is not available on defaults.
  • We stick with python 3.11 because signing fails with python 3.12 on Windows.

@marcoesters marcoesters marked this pull request as ready for review October 31, 2024 16:29
recipe/.condarc Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Should all of our recipes have this? I think I'm missing context on how this deprecation affects our repos.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, this is a conda-standalone specific problem: conda/conda-standalone#99

folder: constructor_src # [win]

build:
number: 0
ignore_run_exports:
- '*'
script_env:
- PYINSTALLER_CONDARC_DIR={{ RECIPE_DIR }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
- PYINSTALLER_CONDARC_DIR={{ RECIPE_DIR }}
- PYINSTALLER_CONDARC_DIR={{ RECIPE_DIR }}

This logic is a little confusing to me. Is this pointing to the current recipe dir to retrieve the .condarc to pull from defaults or is it intended to point to the pyinstaller recipe dir?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

{{ RECIPE_DIR }} renders to the recipe directory of this feedstock. pyinstaller is not involved with this.

folder: conda_src
patches:
- "{{ SRC_DIR | replace('\\', '/') }}/src/conda_patches/0001-Rename-and-replace-entrypoint-stub-exe.patch"
- "{{ SRC_DIR | replace('\\', '/') }}/src/conda_patches/0002-Manipulate-PATH-directly-instead-of-_call_ing-conda.patch"
- "{{ SRC_DIR | replace('\\', '/') }}/src/conda_patches/0003-Restrict-search-paths.patch"
Copy link
Contributor

Choose a reason for hiding this comment

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

This looks fine, but I am curious why testing is skipped for windows and why the paths do not follow those used for Windows (i.e. '' instead of '/')?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Testing is performed on Windows.

Using forward slashes in recipe files is the correct format, but on Windows, {{ SRC_DIR }} uses Windows-style paths.

Copy link

@skupr-anaconda skupr-anaconda left a comment

Choose a reason for hiding this comment

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

LGTM

@marcoesters marcoesters requested a review from Jrice1317 November 1, 2024 14:03
@Jrice1317 Jrice1317 merged commit e58371b into master Nov 6, 2024
8 checks passed
@Jrice1317 Jrice1317 deleted the 24.9.2 branch November 6, 2024 15:42
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