dvc: refactor requirements.txt

Signed-off-by: Ruslan Kuprieiev <[email protected]>

.appveyor.yml

@@ -69,7 +69,7 @@ before_test:
   - aws configure set aws_secret_access_key "%aws_secret_access_key%"
   - aws configure set region us-east-2
   - openssl enc -d -aes-256-cbc -md md5 -k "%GCP_CREDS%" -in scripts\ci\gcp-creds.json.enc -out scripts\ci\gcp-creds.json & exit 0
-  - pip install -r test-requirements.txt
+  - pip install -r tests/requirements.txt
 
 test_script:
   - python -mtests

scripts/ci/before_install.sh

@@ -20,7 +20,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     python --version
 fi
 
-pip install -r scripts/ci/requirements.txt
+pip install -r tests/requirements.txt
 
 # stop the build if there are any readme formatting errors
 python setup.py checkdocs

scripts/ci/install.sh

@@ -16,7 +16,7 @@ function retry {
 # work or not.
 retry pip install --upgrade pip setuptools wheel
 retry pip install -r requirements.txt
-retry pip install -r test-requirements.txt
+retry pip install -r tests/requirements.txt
 
 git config --global user.email "[email protected]"
 git config --global user.name "DVC Tester"

scripts/ci/requirements.txt

@@ -1,2 +0,0 @@
--r ../../test-style-requirements.txt
-gitpython  # used by dvc/__init__.py to dynamically create dvc version

test-style-requirements.txt

@@ -1,5 +0,0 @@
-Pygments  # required by collective.checkdocs
-collective.checkdocs
-black
-flake8
-flake8-docstrings

tests/requirements.txt

@@ -8,3 +8,8 @@ xmltodict>=0.11.0
 awscli>=1.14.18
 google-compute-engine
 pywin32; sys_platform == 'win32'
+Pygments  # required by collective.checkdocs
+collective.checkdocs
+black; python_version >= '3.6'
+flake8
+flake8-docstrings