From c0674dc13446e5f02b370cf0435f7cc02aa8a33e Mon Sep 17 00:00:00 2001
From: Ruslan Kuprieiev <ruslan@iterative.ai>
Date: Sun, 10 Feb 2019 22:42:50 +0200
Subject: [PATCH] dvc: refactor requirements.txt

Signed-off-by: Ruslan Kuprieiev <ruslan@iterative.ai>
---
 .appveyor.yml                                   | 2 +-
 scripts/ci/before_install.sh                    | 2 +-
 scripts/ci/install.sh                           | 2 +-
 scripts/ci/requirements.txt                     | 2 --
 test-style-requirements.txt                     | 5 -----
 test-requirements.txt => tests/requirements.txt | 5 +++++
 6 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 100644 scripts/ci/requirements.txt
 delete mode 100644 test-style-requirements.txt
 rename test-requirements.txt => tests/requirements.txt (58%)

diff --git a/.appveyor.yml b/.appveyor.yml
index c8bd31ec1..116b2c37b 100644
--- a/.appveyor.yml
+++ b/.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
diff --git a/scripts/ci/before_install.sh b/scripts/ci/before_install.sh
index 58067aa7c..5e41b42cd 100644
--- a/scripts/ci/before_install.sh
+++ b/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
diff --git a/scripts/ci/install.sh b/scripts/ci/install.sh
index dfbe394a8..caf4eb7a2 100644
--- a/scripts/ci/install.sh
+++ b/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 "dvctester@example.com"
 git config --global user.name "DVC Tester"
diff --git a/scripts/ci/requirements.txt b/scripts/ci/requirements.txt
deleted file mode 100644
index 928b3b946..000000000
--- a/scripts/ci/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
--r ../../test-style-requirements.txt
-gitpython  # used by dvc/__init__.py to dynamically create dvc version
diff --git a/test-style-requirements.txt b/test-style-requirements.txt
deleted file mode 100644
index 3f01c825a..000000000
--- a/test-style-requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Pygments  # required by collective.checkdocs
-collective.checkdocs
-black
-flake8
-flake8-docstrings
diff --git a/test-requirements.txt b/tests/requirements.txt
similarity index 58%
rename from test-requirements.txt
rename to tests/requirements.txt
index 5d6bb8e74..2ff1af693 100644
--- a/test-requirements.txt
+++ b/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