Skip to content

updated Dockerfile so tests would pass and image would build #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

updated Dockerfile so tests would pass and image would build #167

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
990d30c
added entry for (Apache) license to classifiers to satisfy pyroma
jeffreybreen Aug 15, 2018
b35e519
bumped version of tox and added click and tabulate packages to dev-re…
jeffreybreen Aug 15, 2018
2ef919e
bumped package versions in tox-requirements.txt to resolve conflicts …
jeffreybreen Aug 15, 2018
3f056a7
added installation (and removal) of packages in tox-requirements.txt …
jeffreybreen Aug 15, 2018
d202df6
first try to add ability to select export format for recursive export…
jeffreybreen Dec 12, 2018
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
12 changes: 8 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@ WORKDIR /usr/src/databricks-cli

COPY . .

RUN pip install --upgrade pip && \
pip install -r dev-requirements.txt && \
Copy link
Contributor

@andrewmchen andrewmchen Aug 15, 2018

Choose a reason for hiding this comment

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

Is a minimal fix here just to also install tox-requirements?

Copy link
Author

@jeffreybreen jeffreybreen Aug 15, 2018

Choose a reason for hiding this comment

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

That is certainly the heart of the change -- and almost enough to fix the issue,

You also need to bump the versions on some of the packages in tox-requirements.txt or it will fail due to pytest-django and pyflakes dependencies. Also, you need to add the tabulate and click packages to dev-requirements.txt.

My other edits to Dockerfile were an attempt to minimize the resulting image size, but I didn't get a dramatic savings.

Copy link
Contributor

@andrewmchen andrewmchen Aug 15, 2018

Choose a reason for hiding this comment

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

Gotcha. I'm a bit concerned about changing the dev-requirements.txt and tox-requirements.txt to make this docker container build work.

I think a minimal fix is to intall tox-requirements.txt and to move up pip install . above the ./lint.sh

Also it may be useful to add a .dockerignore file containing

**/__pycache__
**/*.pyc

so we don't run into https://stackoverflow.com/questions/44067609/getting-error-importmismatcherror-while-running-py-test

Copy link

@joanteixi joanteixi Feb 18, 2019

Choose a reason for hiding this comment

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

with @andrewmchen proposals (add tox-requirements to pip install and moving ./lint.sh) works without problem.

thanks

RUN pip install --upgrade --no-cache-dir pip && \
pip install --no-cache-dir \
-r dev-requirements.txt \
-r tox-requirements.txt && \
pip list && \
./lint.sh && \
pip install . && \
pytest tests
pip install --no-cache-dir . && \
pytest tests && \
pip uninstall -y \
-r tox-requirements.txt

ENTRYPOINT [ "databricks" ]
4 changes: 3 additions & 1 deletion dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
tox==2.9.1
tox==3.2.1
click==6.7
tabulate==0.8.2
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
'Intended Audience :: System Administrators',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.6',
'License :: OSI Approved :: Apache Software License'
],
keywords='databricks cli',
url='https://github.com/databricks/databricks-cli'
Expand Down
12 changes: 6 additions & 6 deletions tox-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Test reqs
prospector[with_pyroma]==0.12.7
pylint==1.8.2
pep8-naming==0.5.0
pytest==3.2.1
prospector[with_pyroma]==1.1.1
pylint==1.9.3
pep8-naming==0.7.0
pytest==3.7.1
mock==2.0.0
decorator==4.2.1
rstcheck==3.2
decorator==4.3.0
rstcheck==3.3
pytest-cov
codecov