FIX-#2667: Change names of files for development env

prutskov · prutskov · commit b3f3c4b78ba5 · 2021-02-03T15:33:09.000+03:00
Signed-off-by: Alexey Prutskov &lt;alexey.prutskov@intel.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -77,7 +77,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: modin
-          environment-file: environment.yml
+          environment-file: environment-dev.yml
           python-version: 3.7
           channel-priority: strict
           use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
@@ -105,7 +105,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: modin
-          environment-file: environment.yml
+          environment-file: environment-dev.yml
           python-version: 3.7
           channel-priority: strict
           use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
@@ -167,7 +167,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: modin
-          environment-file: environment.yml
+          environment-file: environment-dev.yml
           python-version: 3.7
           channel-priority: strict
           use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
@@ -209,7 +209,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: modin
-          environment-file: environment.yml
+          environment-file: environment-dev.yml
           python-version: 3.7
           channel-priority: strict
           use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
@@ -303,7 +303,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: modin
-          environment-file: environment.yml
+          environment-file: environment-dev.yml
           python-version: 3.7
           channel-priority: strict
           use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
@@ -357,7 +357,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: modin
-          environment-file: environment.yml
+          environment-file: environment-dev.yml
           python-version: ${{matrix.python-version}}
           channel-priority: strict
           use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
@@ -420,7 +420,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: modin
-          environment-file: environment.yml
+          environment-file: environment-dev.yml
           python-version: 3.7
           channel-priority: strict
           use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
@@ -453,7 +453,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: modin
-          environment-file: environment.yml
+          environment-file: environment-dev.yml
           python-version: 3.7
           channel-priority: strict
           use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
@@ -486,7 +486,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: modin
-          environment-file: environment.yml
+          environment-file: environment-dev.yml
           python-version: ${{matrix.python-version}}
           channel-priority: strict
           use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
@@ -566,7 +566,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: modin
-          environment-file: environment.yml
+          environment-file: environment-dev.yml
           python-version: ${{matrix.python-version}}
           channel-priority: strict
           use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: modin
-          environment-file: environment.yml
+          environment-file: environment-dev.yml
           python-version: 3.7
           channel-priority: strict
           use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
@@ -50,7 +50,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: modin
-          environment-file: environment.yml
+          environment-file: environment-dev.yml
           python-version: 3.7
           channel-priority: strict
           use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
@@ -143,7 +143,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: modin
-          environment-file: environment.yml
+          environment-file: environment-dev.yml
           python-version: ${{matrix.python-version}}
           channel-priority: strict
           use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
@@ -209,7 +209,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: modin
-          environment-file: environment.yml
+          environment-file: environment-dev.yml
           python-version: ${{matrix.python-version}}
           channel-priority: strict
           use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
@@ -288,7 +288,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: modin
-          environment-file: environment.yml
+          environment-file: environment-dev.yml
           python-version: ${{matrix.python-version}}
           channel-priority: strict
           use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly!
diff --git a/ci/jenkins/build-tests/Dockerfile b/ci/jenkins/build-tests/Dockerfile
@@ -1,7 +1,7 @@
 FROM python:3.6.6-stretch
 
-COPY requirements.txt requirements.txt
-RUN pip install -r requirements.txt
+COPY requirements-dev.txt requirements-dev.txt
+RUN pip install -r requirements-dev.txt
 
 COPY . .
 RUN pip install -e .
diff --git a/ci/jenkins/performance-tests/Dockerfile b/ci/jenkins/performance-tests/Dockerfile
@@ -1,7 +1,7 @@
 FROM python:3.6.6-stretch
 
-COPY requirements.txt requirements.txt
-RUN pip install -r requirements.txt
+COPY requirements-dev.txt requirements-dev.txt
+RUN pip install -r requirements-dev.txt
 RUN pip install -q pytest==3.9.3 awscli pytest-benchmark feather-format lxml openpyxl xlrd numpy matplotlib sqlalchemy
 
 COPY . .
diff --git a/ci/teamcity/Dockerfile.teamcity-ci b/ci/teamcity/Dockerfile.teamcity-ci
@@ -4,11 +4,11 @@
 #
 # tar cf ci/teamcity/modin.tar .
 #
-# docker build --build-arg ENVIRONMENT=environment.yml -t modin-project/teamcity-ci:${BUILD_NUMBER} -f ci/teamcity/Dockerfile.teamcity-ci ci/teamcity
+# docker build --build-arg ENVIRONMENT=environment-dev.yml -t modin-project/teamcity-ci:${BUILD_NUMBER} -f ci/teamcity/Dockerfile.teamcity-ci ci/teamcity
 
 FROM rayproject/ray:1.0.1
 
-ARG ENVIRONMENT=environment.yml
+ARG ENVIRONMENT=environment-dev.yml
 
 ADD modin.tar /modin
 ADD git-rev /modin/git-rev
diff --git a/ci/teamcity/build-docker.py b/ci/teamcity/build-docker.py
@@ -15,7 +15,7 @@ def execute_command(cmd):
         "(cd ../.. && git archive -o ci/teamcity/modin.tar $(cat ci/teamcity/git-rev))"
     )
     base_image = "ray-project/deploy"
-    requirements = "requirements.txt"
+    requirements = "requirements-dev.txt"
     execute_command(
         "docker build -f Dockerfile.modin-base --build-arg BASE_IMAGE={} -t modin-project/modin-base .".format(
             base_image
diff --git a/docs/contributing.rst b/docs/contributing.rst
@@ -114,9 +114,9 @@ dependencies for running the tests and formatting the code:
 
 .. code-block:: bash
 
-  conda env create --file environment.yml
+  conda env create --file environment-dev.yml
   # or
-  pip install -r requirements.txt
+  pip install -r requirements-dev.txt
 
 Code Formatting and Lint
 ------------------------
diff --git a/environment-dev.yml b/environment-dev.yml
diff --git a/examples/tutorial/Dockerfile b/examples/tutorial/Dockerfile
@@ -1,5 +1,5 @@
 FROM continuumio/miniconda3
 
 RUN conda install -c conda-forge psutil setproctitle
-RUN pip install -r requirements.txt
+RUN pip install -r requirements-dev.txt
 
diff --git a/requirements-dev.txt b/requirements-dev.txt

Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,11 @@`
`4`	`4`	`#`
`5`	`5`	`# tar cf ci/teamcity/modin.tar .`
`6`	`6`	`#`
`7`		`-# docker build --build-arg ENVIRONMENT=environment.yml -t modin-project/teamcity-ci:${BUILD_NUMBER} -f ci/teamcity/Dockerfile.teamcity-ci ci/teamcity`
	`7`	`+# docker build --build-arg ENVIRONMENT=environment-dev.yml -t modin-project/teamcity-ci:${BUILD_NUMBER} -f ci/teamcity/Dockerfile.teamcity-ci ci/teamcity`
`8`	`8`
`9`	`9`	`FROM rayproject/ray:1.0.1`
`10`	`10`
`11`		`-ARG ENVIRONMENT=environment.yml`
	`11`	`+ARG ENVIRONMENT=environment-dev.yml`
`12`	`12`
`13`	`13`	`ADD modin.tar /modin`
`14`	`14`	`ADD git-rev /modin/git-rev`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ def execute_command(cmd):`
`15`	`15`	`"(cd ../.. && git archive -o ci/teamcity/modin.tar $(cat ci/teamcity/git-rev))"`
`16`	`16`	`)`
`17`	`17`	`base_image = "ray-project/deploy"`
`18`		`- requirements = "requirements.txt"`
	`18`	`+ requirements = "requirements-dev.txt"`
`19`	`19`	`execute_command(`
`20`	`20`	`"docker build -f Dockerfile.modin-base --build-arg BASE_IMAGE={} -t modin-project/modin-base .".format(`
`21`	`21`	`base_image`