Skip to content

Commit 5dcc43a

Browse files
committed
ff to upstream
2 parents 55e1ef6 + 31215ff commit 5dcc43a

File tree

123 files changed

+6616
-3711
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+6616
-3711
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@ build
2323

2424
# codecov
2525
htmlcov/
26+
27+
# PyTorch
28+
lightning_logs
29+
tb_logs

.travis.yml

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,33 @@
11
---
2-
language: python
3-
# this is required for python 3.7
4-
dist: xenial
5-
# This list should match the versions listed in setup.py
6-
python:
7-
- 3.6
8-
- 3.7
2+
# travis pipeline
3+
dist: focal
94

105
os:
116
- linux
7+
- osx
128

139
install:
14-
- sudo apt-get update -qq
15-
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
10+
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then
11+
sudo apt-get update -qq;
12+
wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
13+
fi
14+
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then
15+
wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh;
16+
fi
1617
- bash miniconda.sh -b -p $HOME/miniconda
17-
- export PATH="$HOME/miniconda/bin:$PATH"
18+
- source "$HOME/miniconda/etc/profile.d/conda.sh"
1819
- hash -r
1920
- conda config --set always_yes yes --set changeps1 no
21+
- conda config --append channels conda-forge
2022
- conda update -q conda
23+
# Useful for debugging any issues with conda
2124
- conda info -a
22-
- conda create -q -n test-environment-$TRAVIS_PYTHON_VERSION python=$TRAVIS_PYTHON_VERSION
23-
- source activate test-environment-$TRAVIS_PYTHON_VERSION
24-
- pip install --upgrade pip
25-
- hash -r
26-
- conda info -a
27-
- pip install -e .[tf]
28-
- pip install -e .[pc]
29-
- pip install -e .[dev]
30-
- pip install -e .[ci]
31-
- pip install -e .[mm1]
32-
- echo "pip freeze virtualenv=test-environment python=${TRAVIS_PYTHON_VERSION}"
33-
- pip freeze > test-environment-${TRAVIS_PYTHON_VERSION}.txt
34-
- cat test-environment-${TRAVIS_PYTHON_VERSION}.txt
25+
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then conda env create -f install/envs/mac.yml ; fi
26+
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then conda env create -f install/envs/pc.yml ; fi
27+
- conda activate donkey
28+
- pip install -e .
29+
- conda env export > environment.yml
30+
- cat environment.yml
3531

3632
script:
3733
- pytest -v donkeycar/tests --cov=./
@@ -65,7 +61,6 @@ jobs:
6561
- stage: lint
6662
name: black
6763
language: python
68-
python: 3.6
6964
install:
7065
- pip install --upgrade pip
7166
- hash -r

README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ community contributions.
1212
#### Quick Links
1313
* [Donkeycar Updates & Examples](http://donkeycar.com)
1414
* [Build instructions and Software documentation](http://docs.donkeycar.com)
15-
* [Slack / Chat](https://donkey-slackin.herokuapp.com/)
15+
* [Discord / Chat](https://discord.gg/PN6kFeA)
1616

1717
![donkeycar](./docs/assets/build_hardware/donkey2.png)
1818

@@ -37,7 +37,7 @@ The donkey car is controlled by running a sequence of events
3737
import time
3838
from donkeycar import Vehicle
3939
from donkeycar.parts.cv import CvCam
40-
from donkeycar.parts.datastore import TubWriter
40+
from donkeycar.parts.datastore_v2 import TubWriter
4141
V = Vehicle()
4242

4343
IMAGE_W = 160
@@ -53,14 +53,12 @@ while cam.run() is None:
5353
time.sleep(1)
5454

5555
#add tub part to record images
56-
tub = TubWriter(path='./dat',
57-
inputs=['image'],
58-
types=['image_array'])
56+
tub = TubWriter(path='./dat', inputs=['image'], types=['image_array'])
5957
V.add(tub, inputs=['image'], outputs=['num_records'])
6058

6159
#start the drive loop at 10 Hz
6260
V.start(rate_hz=10)
6361
```
6462

6563
See [home page](http://donkeycar.com), [docs](http://docs.donkeycar.com)
66-
or join the [Slack channel](http://www.donkeycar.com/community.html) to learn more.
64+
or join the [Discord server](http://www.donkeycar.com/community.html) to learn more.
73.1 KB
Loading
4.44 MB
Loading
102 KB
Loading

docs/assets/mobile_app/cover.png

155 KB
Loading

docs/assets/mobile_app/data.png

165 KB
Loading
129 KB
Loading
3.61 MB
Loading

0 commit comments

Comments
 (0)