Merge 79c6606 into 15e567f

dcowden · Sep 17, 2018 · 4c13418 · 4c13418
2 parents 15e567f + 79c6606
commit 4c13418
Show file tree

Hide file tree

Showing 13 changed files with 306 additions and 272 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,12 +23,16 @@ before_install:
     pip install -r requirements-dev.txt;
     pip install travis-sphinx;
     pip install sphinx_rtd_theme;
+    pip install readme_renderer;
   fi
 
 install:
 - python setup.py install;
 
 script:
+- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
+    python setup.py check -r -s;
+  fi
 - coverage run runtests.py
 - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
     travis-sphinx build --nowarn --source=doc;

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