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

use channel_remap for envs.txt too #656

Merged
merged 11 commits into from
Mar 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions constructor/preconda.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ def write_files(info, dst_dir):

# base environment file used with conda install --file
# (list of specs/dists to install)
write_env_txt(info, dst_dir, info["_urls"])
write_env_txt(info, dst_dir, final_urls_md5s)

for fn in files:
os.chmod(join(dst_dir, fn), 0o664)
Expand All @@ -167,7 +167,7 @@ def write_files(info, dst_dir):
user_requested_specs = env_config.get('user_requested_specs', env_config.get('specs', ()))
write_conda_meta(info, env_dst_dir, env_urls_md5, user_requested_specs)
# environment installation list
write_env_txt(info, env_dst_dir, env_info["_urls"])
write_env_txt(info, env_dst_dir, env_urls_md5)
# channels
write_channels_txt(info, env_dst_dir, env_config)

Expand Down
20 changes: 20 additions & 0 deletions examples/use_channel_remap/construct.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: use_channel_remap

version: 0.0.1

# after install the folder <prefix>/pkgs will not be deleted, for diagnostics
keep_pkgs: True

# we just remap the main conda channel, to show the idea of remap
channels:
- http://repo.anaconda.com/pkgs/main/

channels_remap:
- src: http://repo.anaconda.com/pkgs/main/
dest: file:///usr/local/share/private_repo/

specs:
- python
- conda

license_file: eula.txt
24 changes: 24 additions & 0 deletions examples/use_channel_remap/eula.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Copyright (c) 2016, ...
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of ... nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL ... BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
19 changes: 19 additions & 0 deletions news/654-fix_channel_remap
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
### Enhancements

* <news item>

### Bug fixes

* URLs in generated `envs.txt` will now use the correct URL given in `channel_remap`, instead of the incorrect, installer-build-time only value. (#654 via #656)

### Deprecations

* <news item>

### Docs

* <news item>

### Other

* <news item>