Skip to content
This repository has been archived by the owner on Feb 1, 2023. It is now read-only.

Remove pyproject causing pip install issues #54

Merged
merged 2 commits into from
Sep 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,9 @@
"[python]": {
"editor.formatOnSave": true,
"editor.formatOnPaste": false
}
},
"python.formatting.blackArgs": [
"--target-version=py36",
"--line-length=100"
]
}
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
export PYTHONPATH=./brick
VENV = .venv
PY_FILES = $(shell find *.py brick -type f -name '*.py')
BLACK_OPTIONS = brick setup.py
# NOTE: we cannot currently use the pyproject.toml option as installation fails
BLACK_OPTIONS = --target-version=py36 --line-length=100 brick setup.py
all: $(VENV)


Expand All @@ -22,7 +23,7 @@ pylint: lint

format: $(VENV) .format.made

.format.made: $(PY_FILES) pyproject.toml
.format.made: $(PY_FILES) Makefile
$(VENV)/bin/black $(BLACK_OPTIONS)
touch $@

Expand Down
4 changes: 2 additions & 2 deletions brick/dockerlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def docker_run(tag, command, volumes=None, ports=None, environment=None):


def docker_build(
tags, dockerfile_contents, pass_ssh=False, no_cache=False, secrets=None, dependency_paths=None
tags, dockerfile_contents, pass_ssh=False, no_cache=False, secrets=None, dependency_paths=None,
) -> str:
# pylint: disable=too-many-branches
tag_to_return = tags[-1] # Not sure why we return an argument the caller provided
Expand Down Expand Up @@ -68,7 +68,7 @@ def docker_build(
basename = os.path.basename(src)
tarfile = os.path.join(ROOT_PATH, f"{basename}.tar.gz")
subprocess.run(
f"tar zc -C {src} --exclude='logs' . > {tarfile}", shell=True, check=True
f"tar zc -C {src} --exclude='logs' . > {tarfile}", shell=True, check=True,
)
cmd += f" --secret id={k},src={tarfile}"
with subprocess.Popen(
Expand Down
4 changes: 0 additions & 4 deletions pyproject.toml

This file was deleted.