Skip to content

correct extra files ref issue introduced in 0c80f9b #942

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

Merged
merged 5 commits into from
Mar 5, 2025
Merged

correct extra files ref issue introduced in 0c80f9b #942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e9859a
correct extra files ref issue introduced in 0c80f9b
Feb 25, 2025
5f4a9b8
update news
Feb 25, 2025
93a7561
Update news/942-fix-win-extra_files
NixM0nk3y Mar 1, 2025
222833b
raise errors in tests on EXE installs
Mar 3, 2025
d1ac180
Merge branch 'main' into fix/extra_files
marcoesters Mar 5, 2025
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
1 change: 1 addition & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ jobs:
&& files+=(--file "dev/extra-requirements-${{ runner.os }}.txt")
conda install ${files[@]} -y
echo "NSIS_USING_LOG_BUILD=1" >> $GITHUB_ENV
echo "NSIS_SCRIPTS_RAISE_ERRORS=1" >> $GITHUB_ENV
pip install -e . --no-deps --no-build-isolation
- name: Set up conda executable
run: |
Expand Down
2 changes: 1 addition & 1 deletion constructor/nsis/main.nsi.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1265,7 +1265,7 @@ Section "Install"
File {{ conda_exe }}
File {{ pre_uninstall }}

{%- for path, files in extra_files | items %}
{%- for path, files in EXTRA_FILES | items %}
SetOutPath {{ path }}
{%- for file in files %}
File {{ file }}
Expand Down
19 changes: 19 additions & 0 deletions news/942-fix-win-extra_files
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
### Enhancements

* <news item>

### Bug fixes

* Fix `extra_files` functionality on EXE installers. (#942)

### Deprecations

* <news item>

### Docs

* <news item>

### Other

* <news item>
Loading