Move elasticdl_preprocessing folder out of the elasticdl main package in the wheel deployment. (#2044)

* Excluse elasticdl_preprocessing from the elasticdl main package.

* Revert the change in elasticdl/requirements.txt

Author: brightcoder01

elasticdl/docker/Dockerfile.ci

@@ -33,6 +33,12 @@ COPY model_zoo /model_zoo
 RUN python -m pip install --quiet -r /model_zoo/requirements.txt \
         --extra-index-url=${EXTRA_PYPI_INDEX}
 
+# Install elasticdl_preprocessing package
+COPY build/elasticdl_preprocessing-develop-py3-none-any.whl /
+RUN python -m pip install --quiet /elasticdl_preprocessing-develop-py3-none-any.whl \
+        --extra-index-url=${EXTRA_PYPI_INDEX} \
+    && rm /elasticdl_preprocessing-develop-py3-none-any.whl
+
 # Install elasticdl package
 COPY build/elasticdl-develop-py3-none-any.whl /
 RUN python -m pip install --quiet /elasticdl-develop-py3-none-any.whl \

scripts/build_and_test.sh

@@ -46,4 +46,7 @@ mv coverage.xml ./build
 # Create elasticdl package
 mkdir -p ./elasticdl/go/bin
 cp /tmp/elasticdl_ps ./elasticdl/go/bin/
+rm -rf ./build/lib
 python setup.py --quiet bdist_wheel --dist-dir ./build
+rm -rf ./build/lib
+python setup_preprocessing.py --quiet bdist_wheel --dist-dir ./build

setup.py

@@ -15,6 +15,7 @@
 
 with open("elasticdl/requirements.txt") as f:
     required_deps = f.read().splitlines()
+required_deps.append("elasticdl_preprocessing")
 
 extras = {}
 with open("elasticdl/requirements-dev.txt") as f:
@@ -33,7 +34,9 @@
     install_requires=required_deps,
     extras_require=extras,
     python_requires=">=3.5",
-    packages=find_packages(exclude=["*test*"]),
+    packages=find_packages(
+        exclude=["*test*", "elasticdl_preprocessing*", "model_zoo*"]
+    ),
     package_data={
         "": [
             "proto/*.proto",

elasticdl_preprocessing/setup.py renamed to setup_preprocessing.py

@@ -34,6 +34,8 @@
     install_requires=required_deps,
     extras_require=extras,
     python_requires=">=3.5",
-    packages=find_packages(include=["*elasticdl_preprocessing*"],),
+    packages=find_packages(
+        include=["elasticdl_preprocessing*"], exclude=["*test*"]
+    ),
     package_data={"": ["requirements.txt"]},
 )