Skip to content

Commit

Permalink
'Labman' -> 'LabControl' (#526)
Browse files Browse the repository at this point in the history
* More labman to labcontrol renaming

Renames most internal instances of 'labman' to a suitable variant of
'LabControl'. For the most part, only database schema-related instances remain.

* Additional modifications to support name change

* Change labman -> labcontrol in text

Mostly this is to avoid confusion while running things like nosetests.

* Add Chrome as a dependency of Travis

Test adding Chrome as a dependency of Travis builds before requiring it
(in headless mode) for unit-testing.
  • Loading branch information
charles-cowart authored and wasade committed May 23, 2019
1 parent 1f0e0ac commit 4e036d2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ dist: trusty
language: python
# qiita travis has set sudo to false
sudo: required
addons:
# install chrome for testing purposes
chrome: stable
group: deprecated-2017Q4
env:
matrix:
Expand Down
6 changes: 3 additions & 3 deletions labcontrol/db/configuration_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class ConfigurationManager(object):
def create(config_fp, test_env, certificate_filepath, key_filepath,
cookie_secret, db_host, db_port, db_name, db_user, db_password,
db_admin_user, db_admin_password, log_dir, qiita_server_cert):
"""Creates a new labman configuration file
"""Creates a new labcontrol configuration file
Parameters
----------
Expand Down Expand Up @@ -111,7 +111,7 @@ def __init__(self):
self.conf_fp = expanduser('~/.labcontrol.cfg')
if not exists(self.conf_fp):
raise RuntimeError(
'Please, configure labman using `labman config`. If the '
'Please, configure labcontrol using `labcontrol config`. If the '
'config file is not in `~/.labcontrol.cfg`, please set the '
'`LABCONTROL_CONFIG_FP` environment variable to the '
'configuration file')
Expand Down Expand Up @@ -169,7 +169,7 @@ def _get_qiita(self, config):
self.qiita_server_cert = config.get('qiita', 'SERVER_CERT')


CONFIG_TEMPLATE = """# Configuration file generated by labman on %(date)s
CONFIG_TEMPLATE = """# Configuration file generated by labcontrol on %(date)s
# ------------------------- MAIN SETTINGS ----------------------------------
[main]
Expand Down

0 comments on commit 4e036d2

Please sign in to comment.