Skip to content

Commit

Permalink
Merge pull request #467 from sfu-db/relax-dependencies
Browse files Browse the repository at this point in the history
chore: relax dependencies
  • Loading branch information
dovahcrow authored Jan 5, 2021
2 parents 276afff + 496f0bc commit 8e37414
Show file tree
Hide file tree
Showing 5 changed files with 1,325 additions and 1,204 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ orbs:
executors:
python37:
docker:
- image: circleci/python:3.7.8
- image: circleci/python:3.7.9
commands:
bootstrap:
steps:
Expand All @@ -13,7 +13,7 @@ commands:
command: echo "export PATH=$PATH:$HOME/.local/bin" >> $BASH_ENV
- run:
name: Install python tools
command: pip install --user poetry==1.0.0b9
command: pip install --user poetry
- run:
name: Set venv inproject
command: poetry config virtualenvs.in-project true
Expand Down
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ignore-patterns=

# Python code to execute, usually for sys.path manipulation such as
# pygtk.require().
#init-hook=
init-hook='import sys; sys.setrecursionlimit(8 * sys.getrecursionlimit())'

# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the
# number of processors available to use.
Expand Down
7 changes: 4 additions & 3 deletions dataprep/connector/config_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@


def separate_branch(config_path: str) -> Tuple[str, str]:
"""Separate the config path into db name and branch"""
segments = config_path.split("@")
if len(segments) == 1:
return segments[0], "master"
Expand All @@ -32,9 +33,9 @@ def initialize_path(config_path: str, update: bool) -> Path:
path = Path(config_path).resolve()
else:
# From GitHub!
db, branch = separate_branch(config_path)
ensure_config(db, branch, update)
path = config_directory() / branch / db
impdb, branch = separate_branch(config_path)
ensure_config(impdb, branch, update)
path = config_directory() / branch / impdb
return path


Expand Down
Loading

0 comments on commit 8e37414

Please sign in to comment.