Update development dependencies (#462)

Development dependencies should live in dev-requirements*.txt rather than tox-requirements*.txt.
Having both is confusing. This commit moves development dependencies and unfreezes their versions
as much as possible (a couple of packages need to be pinned because of Python 2 compatibility).

* Bump development dependencies

* Revert additional changes to tox.ini

* Pin lazy-object-proxy==1.6.0

* Add comment for lazy-object-proxy==1.6.0

* Suppress new lint failures

* Suppress more lint failures

* Don't run pycodestyle

* Restrict pylint-django<2.0 because >=2.0 depends on pylint>=2.0

* Restrict flake8<3.5 for Python 2

* Restrict pyflakes<1.6.0,>=1.5.0 for Python 2

Author: pietern

.devcontainer/Dockerfile

@@ -10,11 +10,8 @@ RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/
 
 RUN /usr/local/bin/python3 -m pip install --upgrade pip
 
-COPY dev-requirements.txt /tmp/pip-tmp/requirements.txt
-RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt && rm -rf /tmp/pip-tmp
-
-COPY tox-requirements.txt /tmp/pip-tmp/requirements.txt
-RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt && rm -rf /tmp/pip-tmp
+COPY dev-requirements*.txt /tmp/pip-tmp/
+RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/dev-requirements-py3.txt && rm -rf /tmp/pip-tmp
 
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends tig python2.7 python2.7-dev

.travis.yml

@@ -8,8 +8,7 @@ matrix:
       env: TOXENV=py36
 install:
   - pip install --upgrade pip
-  - pip install .
-  - pip install -r dev-requirements.txt
+  - pip install tox
 script:
   - pip list
   - tox

CONTRIBUTING.md

@@ -11,8 +11,7 @@ docker run -it -v `echo $PWD`:/root python:2.7.12 bash
 ```
 
 - `pip install -e .`
-- `pip install -r dev-requirements.txt`
-- `pip install -r tox-requirements.txt`
+- `pip install -r dev-requirements-py3.txt`
 
 To verify that the installation of `databricks-cli` is the one checked out from VCS, you can check by doing `python -c "import databricks_cli; print databricks_cli.__file__"`.
 

Dockerfile

@@ -5,7 +5,7 @@ WORKDIR /usr/src/databricks-cli
 COPY . .
 
 RUN pip install --upgrade pip && \
-    pip install -r dev-requirements.txt && \
+    pip install -r dev-requirements-py2.txt && \
     pip list && \
     ./lint.sh && \
     pip install . && \

dev-requirements-py2.txt

@@ -0,0 +1,12 @@
+-r ./dev-requirements.txt
+prospector[with_pyroma]==0.12.7
+pylint-django<2.0
+pep8-naming==0.5.0
+flake8<3.5
+pyflakes<1.6.0,>=1.5.0
+
+# For some reason Travis tries to install the yanked version 1.7.0.
+# See https://pypi.org/project/lazy-object-proxy/#history.
+# See https://github.com/databricks/databricks-cli/pull/462.
+# Try to unpin this after moving away from Travis.
+lazy-object-proxy==1.6.0

dev-requirements-py3.txt

@@ -0,0 +1,2 @@
+-r ./dev-requirements.txt
+prospector[with_pyroma]

dev-requirements.txt

@@ -1 +1,7 @@
-tox==2.9.1
+pytest
+pytest-cov
+mock
+decorator
+requests_mock
+rstcheck
+codecov

lint.sh

@@ -7,10 +7,11 @@ PY_VERSION=${1:-3}
 FWDIR="$(cd "`dirname $0`"; pwd)"
 cd "$FWDIR"
 
+tools="-t dodgy -t mccabe -t profile-validator -t pyflakes -t pylint"
 if [[ "$PY_VERSION" -eq 3 ]]; then
-  prospector --profile "$FWDIR/prospector.yaml"
+  prospector --profile "$FWDIR/prospector.yaml" $tools
 else
-  prospector --profile "$FWDIR/prospector-2.yaml"
+  prospector --profile "$FWDIR/prospector-2.yaml" $tools
 fi
 
 rstcheck README.rst

prospector.yaml

@@ -24,6 +24,14 @@ pylint:
     - consider-using-set-comprehension
     - useless-object-inheritance
     - unnecessary-pass
+    - consider-using-f-string
+    - super-with-arguments
+    - unspecified-encoding
+    - global-variable-not-assigned
+    - useless-suppression
+    - raise-missing-from
+    - redundant-u-string-prefix
+    - consider-using-from-import
 
 mccabe:
   disable: