From 75dcd6951b18f8cf59fc06e02366085f4f511745 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Thu, 17 Jan 2019 16:35:23 +0100
Subject: [PATCH] [bdt] Move environment variable setup to module
initialization
---
bob/devtools/__init__.py | 17 +++++++++++++++++
bob/devtools/bootstrap.py | 4 +---
bob/devtools/scripts/bdt.py | 13 +------------
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/bob/devtools/__init__.py b/bob/devtools/__init__.py
index e69de29b..790e3b4a 100644
--- a/bob/devtools/__init__.py
+++ b/bob/devtools/__init__.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+'''Environment variable initialization'''
+
+import os
+from .constants import CACERT
+from .bootstrap import set_environment
+
+
+# must set LANG and LC_ALL before using click
+set_environment('LANG', 'en_US.UTF-8', os.environ)
+set_environment('LC_ALL', os.environ['LANG'], os.environ)
+
+# we need the right certificates setup as well
+set_environment('SSL_CERT_FILE', CACERT, os.environ)
+set_environment('REQUESTS_CA_BUNDLE', CACERT, os.environ)
diff --git a/bob/devtools/bootstrap.py b/bob/devtools/bootstrap.py
index 7b3d6955..5e332f59 100644
--- a/bob/devtools/bootstrap.py
+++ b/bob/devtools/bootstrap.py
@@ -74,14 +74,12 @@ def set_environment(name, value, env=os.environ, verbose=False):
verbose: Increases the verbosity of variable reporting
'''
- if name in env:
- logger.warn('Overriding existing environment variable ${%s} (was: "%s")',
- name, env[name])
env[name] = value
logat = logger.debug
if verbose:
logat = logger.info
logat('environ["%s"] = %s', name, value)
+ return value
def human_time(seconds, granularity=2):
diff --git a/bob/devtools/scripts/bdt.py b/bob/devtools/scripts/bdt.py
index 92d3af40..7a26b97c 100644
--- a/bob/devtools/scripts/bdt.py
+++ b/bob/devtools/scripts/bdt.py
@@ -11,7 +11,6 @@ import click
from click_plugins import with_plugins
from ..log import setup
-from ..bootstrap import set_environment
logger = setup('bob')
@@ -49,19 +48,9 @@ def raise_on_error(view_func):
return wraps(view_func)(_decorator)
-# must set LANG and LC_ALL before using click
-set_environment('LANG', 'en_US.UTF-8', os.environ, verbose=False)
-set_environment('LC_ALL', os.environ['LANG'], os.environ, verbose=False)
-
-
@with_plugins(pkg_resources.iter_entry_points('bdt.cli'))
@click.group(cls=AliasedGroup,
context_settings=dict(help_option_names=['-?', '-h', '--help']))
def main():
"""Bob Development Tools - see available commands below"""
-
- #sets up basic environment variables required everywhere
- from ..constants import CACERT
-
- set_environment('SSL_CERT_FILE', CACERT, os.environ)
- set_environment('REQUESTS_CA_BUNDLE', CACERT, os.environ)
+ pass
--
GitLab