Skip to content
This repository has been archived by the owner on Oct 15, 2019. It is now read-only.

Change formatting to black #43

Merged
merged 3 commits into from
Jul 4, 2019
Merged

Change formatting to black #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
127e355
Pin pipenv version in Dockerfile
mst-ableton Jul 2, 2019
3a0240d
Use python 3.7
mst-ableton Jul 3, 2019
8f829c1
Change formatting to black
mst-ableton Jul 2, 2019
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
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.6-alpine
FROM python:3.7-alpine3.10

RUN mkdir -p /output
VOLUME /output
Expand All @@ -8,7 +8,7 @@ WORKDIR /jenkins_node_scanner

COPY Pipfile /jenkins_node_scanner
COPY Pipfile.lock /jenkins_node_scanner
RUN pip install --no-cache-dir pipenv
RUN pip install --no-cache-dir pipenv==2018.11.26
RUN pipenv install --system --ignore-pipfile

COPY jenkins_node_scanner.py /jenkins_node_scanner
Expand Down
3 changes: 3 additions & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ devToolsProject.run(
},
test: {
parallel(failFast: false,
black: {
sh 'pipenv run black --check .'
},
flake8: {
sh 'pipenv run flake8 -v'
},
Expand Down
4 changes: 2 additions & 2 deletions Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ prometheus-client = "*"
python-jenkins = "*"

[dev-packages]
black = "==19.3b0"
flake8 = "*"
flake8-commas = "*"
pydocstyle = "*"
pylint = "*"

[requires]
python_version = "3.6"
python_version = "3.7"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't Pipfile.lock also change in the same commit?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, I'll update.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed as of 8f829c1.

179 changes: 95 additions & 84 deletions Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading