Skip to content

Commit

Permalink
🐛 v1.3.5 Fixed a virtual environment issue in plugins.
Browse files Browse the repository at this point in the history
  • Loading branch information
bmeares committed Oct 18, 2022
1 parent 8fe8f3b commit cc9e6e3
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion meerschaum/config/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Specify the Meerschaum release version.
"""

__version__ = "1.3.4"
__version__ = "1.3.5"
4 changes: 2 additions & 2 deletions meerschaum/connectors/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def get_connector(
"""
from meerschaum.connectors.parse import parse_instance_keys
from meerschaum.config import get_config
from meerschaum.config.static import _static_config
from meerschaum.config.static import STATIC_CONFIG
global _loaded_plugin_connectors
with _locks['_loaded_plugin_connectors']:
if not _loaded_plugin_connectors:
Expand All @@ -137,7 +137,7 @@ def get_connector(

### NOTE: the default instance connector may not be main.
### Only fall back to 'main' if the type is provided by the label is omitted.
label = label if label is not None else _static_config()['connectors']['default_label']
label = label if label is not None else STATIC_CONFIG['connectors']['default_label']

### type might actually be a label. Check if so and raise a warning.
if type not in connectors:
Expand Down
2 changes: 1 addition & 1 deletion meerschaum/plugins/_Plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ def activate_venv(self, dependencies: bool=True, debug: bool=False, **kw) -> boo
for plugin in self.get_required_plugins(debug=debug):
plugin.activate_venv(debug=debug, **kw)

vtp = venv_target_path(self.name, debug=debug)
vtp = venv_target_path(self.name, debug=debug, allow_nonexistent=True)
venv_meerschaum_path = vtp / 'meerschaum'

try:
Expand Down
3 changes: 0 additions & 3 deletions meerschaum/utils/venv/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ def activate_venv(
if str(target) not in sys.path:
sys.path.insert(0, str(target))

# if debug:
# dprint(f"sys.path: {sys.path}", color=False)

return True


Expand Down

0 comments on commit cc9e6e3

Please sign in to comment.