Merge pull request #293 from chapmanb/docker-no-ez_setup

Remove ez_setup from conformance test Docker
common-workflow-language · Feb 17, 2017 · 57c11c7 · 57c11c7
2 parents c949878 + 9535e97
commit 57c11c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,4 @@
-include gittaggers.py ez_setup.py Makefile cwltool.py
+include gittaggers.py Makefile cwltool.py
 include tests/*
 include tests/wf/*
 include cwltool/schemas/v1.0/*.yml

diff --git a/cwltool_module.Dockerfile b/cwltool_module.Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update -qq && apt-get install -qqy \
     python-setuptools gcc python-dev
 
 # Install cwltool
-ADD setup.py README.rst ez_setup.py cwltool/ /root/cwltool/
+ADD setup.py README.rst cwltool/ /root/cwltool/
 ADD cwltool/ /root/cwltool/cwltool
 ADD cwltool/schemas/ /root/cwltool/cwltool/schemas
-RUN cd /root/cwltool && ./ez_setup.py && easy_install .
+RUN cd /root/cwltool && python setup.py install