Merge pull request #338 from autorope/dev

remove non core parts

.travis.yml

@@ -2,7 +2,6 @@ language: python
 
 # This list should match the versions listed in setup.py
 python:
-- 3.4
 - 3.5
 - 3.6
 
@@ -29,14 +28,23 @@ install:
 script:
 - pytest -v --cov=donkeycar donkeycar/tests
 
+stages:
+    - name: deploy
+      if: branch = master
+
+jobs:
+  include:
+    - stage: deploy
+      python: 3.6
+      script: skip
+      deploy:
+        provider: pypi
+        user: wroscoe
+        password:
+          secure: Y64NS2etlOIjKMTLQex+5H/QrKdBzwGjhZ9VVp1NXyx76oqg0ygn5lOPcMAvQbuJbGzT0E/5q/EDhJAh6YjyjVYAS2UgBUehpY5Nu0oYFTfWCTC9fbQRn0XRLXPeZR3BKZ1cAxDCMm4a6iZ4M8CqatN73IexcORCYgkIXZfGRVGcAdLonWzkXPqIwe287e7TiQAx6wM6e7k4DRRUFcrw56lLWTG6FEkauQDNXJFlySwesIgFni+K59tHcxP1U00NTV5utTaNzkkFwro4bp6EsVHEYr8Hgz2Sv0mxAggWmXaMGwILahTSVoRznFsik4r3DiOwVEAc+aeTHg9NJin5/ic4ShODMPKkBQInUNxgmE8cZy5EpZ+a9Xbp1dNt/+x56Bmz+bKoQq/e0ydIBNXCeaT41VFyJTjz9db01HwUPZHfp0NCyIo5QcknH98G0oLmaqv43qGJzmaQi0h4BkkmgI5HpkE12MSDC8QFsDKmOXlj/I4WEWXuPslhuKTgYNadFGdTkfbhnbMjRDkuNfL8YSXwnNDTcB5qT3hIYWGVKN2qAAljWniWHdQMMosMv7CwfoM7IO6apgBuvoMJOMunHEgyGDX5Hb1Y5YYa+OC/0eCfcIEScoPM0JHtMmznYlIv5vwx8B3yK0qk0W8nIv65bZvP5eYBF1zLgeE2FLsuc1o=
+        on:
+          tags: true
+          branch: master
+
 after_success:
-- codecov
-
-deploy:
-  provider: pypi
-  user: wroscoe
-  password:
-    secure: Y64NS2etlOIjKMTLQex+5H/QrKdBzwGjhZ9VVp1NXyx76oqg0ygn5lOPcMAvQbuJbGzT0E/5q/EDhJAh6YjyjVYAS2UgBUehpY5Nu0oYFTfWCTC9fbQRn0XRLXPeZR3BKZ1cAxDCMm4a6iZ4M8CqatN73IexcORCYgkIXZfGRVGcAdLonWzkXPqIwe287e7TiQAx6wM6e7k4DRRUFcrw56lLWTG6FEkauQDNXJFlySwesIgFni+K59tHcxP1U00NTV5utTaNzkkFwro4bp6EsVHEYr8Hgz2Sv0mxAggWmXaMGwILahTSVoRznFsik4r3DiOwVEAc+aeTHg9NJin5/ic4ShODMPKkBQInUNxgmE8cZy5EpZ+a9Xbp1dNt/+x56Bmz+bKoQq/e0ydIBNXCeaT41VFyJTjz9db01HwUPZHfp0NCyIo5QcknH98G0oLmaqv43qGJzmaQi0h4BkkmgI5HpkE12MSDC8QFsDKmOXlj/I4WEWXuPslhuKTgYNadFGdTkfbhnbMjRDkuNfL8YSXwnNDTcB5qT3hIYWGVKN2qAAljWniWHdQMMosMv7CwfoM7IO6apgBuvoMJOMunHEgyGDX5Hb1Y5YYa+OC/0eCfcIEScoPM0JHtMmznYlIv5vwx8B3yK0qk0W8nIv65bZvP5eYBF1zLgeE2FLsuc1o=
-  on:
-    tags: true
-    branch: master
+- codecov

Dockerfile

@@ -1,8 +1,29 @@
-FROM python:3
+FROM python:3.6
 
 WORKDIR /app
 
+# install donkey with tensorflow (cpu only version)
+ADD ./setup.py /app/setup.py
+ADD ./README.md /app/README.md
+RUN pip install -e .[tf]
+
+# get testing requirements
+RUN pip install -e .[dev]
+
+# setup jupyter notebook to run without password
+RUN pip install jupyter notebook
+RUN jupyter notebook --generate-config
+RUN echo "c.NotebookApp.password = ''">>/root/.jupyter/jupyter_notebook_config.py
+RUN echo "c.NotebookApp.token = ''">>/root/.jupyter/jupyter_notebook_config.py
+
+# add the whole app dir after install so the pip install isn't updated when code changes.
 ADD . /app
-RUN pip install -e .
 
+#start the jupyter notebook
+CMD jupyter notebook --no-browser --ip 0.0.0.0 --port 8888 --allow-root  --notebook-dir=/app/notebooks
+
+#port for donkeycar
 EXPOSE 8887
+
+#port for jupyter notebook
+EXPOSE 8888

MANIFEST.in

@@ -1,2 +1,3 @@
 include donkeycar/templates/*
-recursive-include donkeycar/parts/web_controller/templates/ *
+include VERSION
+recursive-include donkeycar/parts/web_controller/templates/ *

Makefile

@@ -0,0 +1,8 @@
+
+
+tests:
+	pytest
+
+package:
+	python setup.py sdist
+

README.md

@@ -6,7 +6,7 @@
 [![Py versions](https://img.shields.io/pypi/pyversions/donkeycar.svg)](https://img.shields.io/pypi/pyversions/donkeycar.svg)
 
 Donkeycar is minimalist and modular self driving library for Python. It is
-developed for hobbiests and students with a focus on allowing fast experimentation and easy
+developed for hobbyists and students with a focus on allowing fast experimentation and easy
 community contributions.
 
 #### Quick Links
@@ -21,12 +21,11 @@ community contributions.
 * Compete in self driving races like [DIY Robocars](http://diyrobocars.com)
 * Experiment with autopilots, mapping computer vision and neural networks.
 * Log sensor data. (images, user inputs, sensor readings)
-* Drive your car via a web or game controler.
+* Drive your car via a web or game controller.
 * Leverage community contributed driving data.
-* Use existing harsupport
-supportdware CAD designs for upgrades.
+* Use existing CAD models for design upgrades.
 
-### Getting driving.
+### Get driving.
 After building a Donkey2 you can turn on your car and go to http://localhost:8887 to drive.
 
 ### Modify your cars behavior.

docs/guide/install_software.md

@@ -149,7 +149,7 @@ python -c "import donkeycar as dk; print(dk.__version__)"
 Now generate the drive script, config and folder structure for your car.
 
 ```bash
-donkey createcar ~/
+donkey createcar ~/mycar
 ```
 
 ----

docs/index.md

@@ -7,9 +7,7 @@ developed with a focus on enabling fast experimentation and easy contribution.
 
 ### Build your own Donkey2
 
-Donkey2 is the standard car that most people build first. The parts cost about $250 to $300
-
-and take 2 hours to assemble. Here are the main steps to build your own car:
+Donkey2 is the standard car that most people build first. The parts cost about $250 to $300 and take 2 hours to assemble. Here are the main steps to build your own car:
 
 1. [Assemble hardware.](guide/build_hardware.md)
 2. [Install software.](guide/install_software.md)

donkeycar/__init__.py

@@ -1,9 +1,16 @@
-__version__ = '2.5.1'
-
-print('using donkey v{} ...'.format(__version__))
+import os
 
+import pkg_resources  # part of setuptools
 import sys
 
+__version__ = pkg_resources.require("donkeycar")[0].version
+print('using donkey version: {} ...'.format(__version__))
+
+
+
+current_module = sys.modules[__name__]
+
+
 if sys.version_info.major < 3:
     msg = 'Donkey Requires Python 3.4 or greater. You are using {}'.format(sys.version)
     raise ValueError(msg)