Skip to content

Commit

Permalink
Replace Microdrop occurrences with MicroDrop
Browse files Browse the repository at this point in the history
  • Loading branch information
cfobel committed Nov 18, 2016
1 parent d75f894 commit 9a707ed
Show file tree
Hide file tree
Showing 28 changed files with 108 additions and 108 deletions.
2 changes: 1 addition & 1 deletion .miniconda-recipe/construct.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ channels:
specs:
- python 2.7*
- conda
- microdrop-launcher >=0.2.post3
- microdrop-launcher >=0.4
- pip
- pywin32
- microdrop =={{ GIT_DESCRIBE_TAG[1:] }}
Expand Down
12 changes: 6 additions & 6 deletions microdrop/app.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
"""
Copyright 2011-2016 Ryan Fobel and Christian Fobel
This file is part of Microdrop.
This file is part of MicroDrop.
Microdrop is free software: you can redistribute it and/or modify
MicroDrop is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Foundation, either version 3 of the License, or
(at your option) any later version.
Microdrop is distributed in the hope that it will be useful,
MicroDrop is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Microdrop. If not, see <http://www.gnu.org/licenses/>.
along with MicroDrop. If not, see <http://www.gnu.org/licenses/>.
"""

import sys
Expand Down Expand Up @@ -58,7 +58,7 @@ def parse_args(args=None):
if args is None:
args = sys.argv

parser = ArgumentParser(description='Microdrop: graphical user interface '
parser = ArgumentParser(description='MicroDrop: graphical user interface '
'for the DropBot Digital Microfluidics control '
'system.')
parser.add_argument('-c', '--config', type=path, default=None)
Expand Down Expand Up @@ -186,7 +186,7 @@ def __init__(self):
if self.name in self.config.data and ('log_level' in
self.config.data[self.name]):
self._set_log_level(self.config.data[self.name]['log_level'])
logger.info('Microdrop version: %s', self.version)
logger.info('MicroDrop version: %s', self.version)
logger.info('Running in working directory: %s', os.getcwd())

# Run post install hooks for freshly installed plugins.
Expand Down
8 changes: 4 additions & 4 deletions microdrop/app_context.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
"""
Copyright 2011 Ryan Fobel
This file is part of Microdrop.
This file is part of MicroDrop.
Microdrop is free software: you can redistribute it and/or modify
MicroDrop is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Foundation, either version 3 of the License, or
(at your option) any later version.
Microdrop is distributed in the hope that it will be useful,
MicroDrop is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Microdrop. If not, see <http://www.gnu.org/licenses/>.
along with MicroDrop. If not, see <http://www.gnu.org/licenses/>.
"""
def get_app():
import plugin_manager
Expand Down
2 changes: 1 addition & 1 deletion microdrop/bin/create_portable_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
REM
REM [1]: http://stackoverflow.com/questions/16623780/how-to-get-windows-batchs-parent-folder
cd %~dp0
REM Launch Microdrop
REM Launch MicroDrop
{{ py_exe }} -m microdrop.microdrop -c %~dp0microdrop.ini
'''

Expand Down
6 changes: 3 additions & 3 deletions microdrop/bin/latest_versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ def get_latest_version_content(server_url=DEFAULT_SERVER_URL):

content = StringIO()

# # Microdrop application #
print >> content, '# Microdrop application installer #\n'
# # MicroDrop application #
print >> content, '# MicroDrop application installer #\n'

app_info = (app_repo.latest_version('microdrop'),
app_repo.latest_package_url('microdrop'))
Expand All @@ -40,7 +40,7 @@ def get_latest_version_content(server_url=DEFAULT_SERVER_URL):

print >> content, ''

# # Microdrop plugins #
# # MicroDrop plugins #
print >> content, '# Plugins #\n'
for name, info in plugin_info.iteritems():
print >> content, ' * [`%s` *(%s.%s.%s)*][%s]' % (name,
Expand Down
18 changes: 9 additions & 9 deletions microdrop/config.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
"""
Copyright 2011 Ryan Fobel
This file is part of Microdrop.
This file is part of MicroDrop.
Microdrop is free software: you can redistribute it and/or modify
MicroDrop is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Microdrop is distributed in the hope that it will be useful,
MicroDrop is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Microdrop. If not, see <http://www.gnu.org/licenses/>.
along with MicroDrop. If not, see <http://www.gnu.org/licenses/>.
"""

import os
Expand All @@ -34,7 +34,7 @@ class ValidationError(Exception):

class Config(object):
if os.name == 'nt':
default_config_directory = home_dir().joinpath('Microdrop')
default_config_directory = home_dir().joinpath('MicroDrop')
else:
default_config_directory = app_data_dir().joinpath('.microdrop')
default_config_path = default_config_directory / path('microdrop.ini')
Expand Down Expand Up @@ -124,17 +124,17 @@ def _init_data_dir(self):
# If no user data directory is set in the configuration file, select
# default directory based on the operating system.
if os.name == 'nt':
default_data_dir = home_dir().joinpath('Microdrop')
default_data_dir = home_dir().joinpath('MicroDrop')
else:
default_data_dir = home_dir().joinpath('.microdrop')
if 'data_dir' not in self.data:
self.data['data_dir'] = default_data_dir
warnings.warn('Using default Microdrop user data path: %s' %
warnings.warn('Using default MicroDrop user data path: %s' %
default_data_dir)
if not path(self['data_dir']).isdir():
warnings.warn('Microdrop user data directory does not exist.')
warnings.warn('MicroDrop user data directory does not exist.')
path(self['data_dir']).makedirs_p()
warnings.warn('Created Microdrop user data directory: %s' %
warnings.warn('Created MicroDrop user data directory: %s' %
self['data_dir'])

def _init_plugins_dir(self):
Expand Down
2 changes: 1 addition & 1 deletion microdrop/core_plugins/command_plugin/microdrop_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def on_plugin_disable(self):

def on_app_exit(self):
"""
Handler called just before the Microdrop application exits.
Handler called just before the MicroDrop application exits.
"""
self.cleanup()

Expand Down
2 changes: 1 addition & 1 deletion microdrop/core_plugins/device_info_plugin/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def on_plugin_disable(self):

def on_app_exit(self):
"""
Handler called just before the Microdrop application exits.
Handler called just before the MicroDrop application exits.
"""
self.cleanup()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ def on_plugin_disable(self):

def on_app_exit(self):
"""
Handler called just before the Microdrop application exits.
Handler called just before the MicroDrop application exits.
"""
self.cleanup()

Expand Down
6 changes: 3 additions & 3 deletions microdrop/core_plugins/zmq_hub_plugin/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
PluginGlobals.push_env('microdrop')


class MicrodropHub(Hub):
class MicroDropHub(Hub):
def on_command_recv(self, msg_frames):
try:
super(MicrodropHub, self).on_command_recv(msg_frames)
super(MicroDropHub, self).on_command_recv(msg_frames)
except:
logger.error('Command socket message error.', exc_info=True)

Expand Down Expand Up @@ -89,7 +89,7 @@ def on_plugin_enable(self):
super(ZmqHubPlugin, self).on_plugin_enable()
app_values = self.get_app_values()
self.hub_process = Process(target=run_hub,
args=(MicrodropHub(app_values['hub_uri'],
args=(MicroDropHub(app_values['hub_uri'],
self.name),
getattr(logging,
app_values['log_level']
Expand Down
8 changes: 4 additions & 4 deletions microdrop/dmf_device.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
"""
Copyright 2011-2015 Ryan Fobel and Christian Fobel
This file is part of Microdrop.
This file is part of MicroDrop.
Microdrop is free software: you can redistribute it and/or modify
MicroDrop is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Microdrop is distributed in the hope that it will be useful,
MicroDrop is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Microdrop. If not, see <http://www.gnu.org/licenses/>.
along with MicroDrop. If not, see <http://www.gnu.org/licenses/>.
"""
import logging

Expand Down
18 changes: 9 additions & 9 deletions microdrop/experiment_log.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
"""
Copyright 2011 Ryan Fobel
This file is part of Microdrop.
This file is part of MicroDrop.
Microdrop is free software: you can redistribute it and/or modify
MicroDrop is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Microdrop is distributed in the hope that it will be useful,
MicroDrop is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Microdrop. If not, see <http://www.gnu.org/licenses/>.
along with MicroDrop. If not, see <http://www.gnu.org/licenses/>.
"""
from collections import OrderedDict
from copy import deepcopy
Expand Down Expand Up @@ -42,22 +42,22 @@ def log_data_to_frame(log_data_i):
Parameters
----------
log_data_i : microdrop.experiment_log.ExperimentLog
Microdrop experiment log, as pickled in the ``data``
MicroDrop experiment log, as pickled in the ``data``
file in each experiment log directory.
Returns
-------
(pd.Series, pd.DataFrame)
Tuple containing:
- Experiment information, including UTC start time,
Microdrop software version, list of plugin versions,
MicroDrop software version, list of plugin versions,
etc.
- Data frame with multi-index columns, indexed first by
plugin name, then by plugin field name.
.. note::
Values may be Python objects. In future versions
of Microdrop, values *may* be restricted to json
of MicroDrop, values *may* be restricted to json
compatible types.
'''
def log_frame_experiment_info(df_log):
Expand Down Expand Up @@ -308,14 +308,14 @@ def to_frame(self):
-------
(pd.Series, pd.DataFrame)
Tuple containing:
- Experiment information, including UTC start time, Microdrop
- Experiment information, including UTC start time, MicroDrop
software version, list of plugin versions, etc.
- Data frame with multi-index columns, indexed first by plugin
name, then by plugin field name.
.. note::
Values may be Python objects. In future versions
of Microdrop, values *may* be restricted to json
of MicroDrop, values *may* be restricted to json
compatible types.
'''
return log_data_to_frame(self)
8 changes: 4 additions & 4 deletions microdrop/gui/app_options_controller.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
"""
Copyright 2011-12 Ryan Fobel and Christian Fobel
This file is part of Microdrop.
This file is part of MicroDrop.
Microdrop is free software: you can redistribute it and/or modify
MicroDrop is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Microdrop is distributed in the hope that it will be useful,
MicroDrop is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Microdrop. If not, see <http://www.gnu.org/licenses/>.
along with MicroDrop. If not, see <http://www.gnu.org/licenses/>.
"""

import os
Expand Down
8 changes: 4 additions & 4 deletions microdrop/gui/config_controller.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
"""
Copyright 2011 Ryan Fobel
This file is part of Microdrop.
This file is part of MicroDrop.
Microdrop is free software: you can redistribute it and/or modify
MicroDrop is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Microdrop is distributed in the hope that it will be useful,
MicroDrop is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Microdrop. If not, see <http://www.gnu.org/licenses/>.
along with MicroDrop. If not, see <http://www.gnu.org/licenses/>.
"""
import logging

Expand Down
8 changes: 4 additions & 4 deletions microdrop/gui/dmf_device_controller.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
"""
Copyright 2011 Ryan Fobel
This file is part of Microdrop.
This file is part of MicroDrop.
Microdrop is free software: you can redistribute it and/or modify
MicroDrop is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Microdrop is distributed in the hope that it will be useful,
MicroDrop is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Microdrop. If not, see <http://www.gnu.org/licenses/>.
along with MicroDrop. If not, see <http://www.gnu.org/licenses/>.
"""
import traceback
import shutil
Expand Down

0 comments on commit 9a707ed

Please sign in to comment.