Merge a4da15f into 6251ec0

dcowden · Jul 22, 2018 · 30ac67c · 30ac67c
2 parents 6251ec0 + a4da15f
commit 30ac67c
Show file tree

Hide file tree

Showing 6 changed files with 297 additions and 269 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -34,7 +34,7 @@ RUN mkdir -p $CQ_HOME
 RUN mkdir -p $CQ_HOME/build_data
 VOLUME $CQ_HOME/build_data
 
-COPY requirements-dev.txt  runtests.py  cq_cmd.py cq_cmd.sh setup.py  README.md MANIFEST setup.cfg $CQ_HOME/
+COPY requirements-dev.txt  runtests.py  cq_cmd.py cq_cmd.sh setup.py  README.rst MANIFEST setup.cfg $CQ_HOME/
 COPY cadquery $CQ_HOME/cadquery
 COPY examples $CQ_HOME/examples
 COPY tests $CQ_HOME/tests

diff --git a/MANIFEST b/MANIFEST
@@ -1,5 +1,4 @@
-README.txt
-README.md
+README.rst
 setup.cfg
 setup.py
 cadquery\cq.py

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1 @@
-include README.md LICENSE
+include README.rst LICENSE
diff --git a/README.md b/README.md