From c2cb0adbe4e05e800500c6e4435d62ecbc18c832 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Fri, 1 Mar 2019 04:35:05 +0100
Subject: [PATCH] [bootstrap] Do not set changeps1 to false as that affects
deactivation of PS1 in hybrid environments (closes #16); Remove unused
channels from default environment
---
bob/devtools/bootstrap.py | 3 ---
bob/devtools/build.py | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/bob/devtools/bootstrap.py b/bob/devtools/bootstrap.py
index e7d8b894..82e5cb57 100644
--- a/bob/devtools/bootstrap.py
+++ b/bob/devtools/bootstrap.py
@@ -9,10 +9,7 @@ _BASE_CONDARC = '''\
default_channels:
- https://repo.anaconda.com/pkgs/main
- https://repo.anaconda.com/pkgs/free
- - https://repo.anaconda.com/pkgs/r
- - https://repo.anaconda.com/pkgs/pro
add_pip_as_python_dependency: false #!final
-changeps1: false #!final
always_yes: true #!final
quiet: true #!final
show_channel_urls: true #!final
diff --git a/bob/devtools/build.py b/bob/devtools/build.py
index 0bbc66d2..cb21a664 100644
--- a/bob/devtools/build.py
+++ b/bob/devtools/build.py
@@ -288,7 +288,7 @@ def conda_create(conda, name, overwrite, condarc, packages, dry_run, use_local):
if not dry_run:
# get envdir again - it may just be created!
envdir = get_env_directory(conda, name)
- destrc = os.path.join(envdir, '.condarc')
+ destrc = os.path.join(envdir, 'condarc')
logger.info('Creating %s...', destrc)
with open(destrc, 'w') as f:
yaml.dump(condarc, f, indent=2)
--
GitLab