Skip to content
This repository has been archived by the owner on Dec 20, 2023. It is now read-only.

Commit

Permalink
Merge pull request #432 from alexa-pi/dev
Browse files Browse the repository at this point in the history
Version 1.7
  • Loading branch information
renekliment committed Dec 22, 2018
2 parents c8adfbe + 8245cd6 commit 83f71d4
Show file tree
Hide file tree
Showing 35 changed files with 697 additions and 126 deletions.
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE.md
Expand Up @@ -9,6 +9,7 @@ In order to help troubleshooting, be sure to include the following information:
**Output of the [audio debugging script](https://github.com/alexa-pi/AlexaPi/wiki/Audio-setup-&-debugging#audio-debugging-script).**

**Your OS (including version) where you are running AlexaPi:**
_Note: Raspbian older than Stretch is not supported!_
```
```

Expand All @@ -17,7 +18,7 @@ In order to help troubleshooting, be sure to include the following information:
```

**Python release (`python2 --version`):**
**Python release (`python3 --version`):**
```
```
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
@@ -1,6 +1,8 @@
*__pycache__*
*.pyc

.venv

src/config.yaml

.idea
Expand Down
31 changes: 14 additions & 17 deletions .travis.yml
Expand Up @@ -3,29 +3,26 @@ language: python
cache: pip

python:
- "2.7"
- "3.4"
- "3.5"
# pylint doesn't work on 3.6 yet
# - "3.6"
- "3.6"
- "3.7"

dist: trusty
# On the container-based infrastructure, trusty-backports isn't available, hence this silly thing
sudo: required
dist: xenial

# It installs old shellcheck from trusty-backports
# Installing from Debian Sid or Ubuntu Zesty doesn't work
# Some discussion: https://github.com/koalaman/shellcheck/issues/785
before_install:
- sudo apt-get update
- sudo apt-get install -y wget git swig portaudio19-dev libpulse-dev vlc-nox shellcheck
- sudo apt-get install -y wget git portaudio19-dev libpulse-dev vlc-nox shellcheck sox libatlas-base-dev
- sudo wget http://mirrors.kernel.org/ubuntu/pool/universe/s/swig/swig3.0_3.0.10-1.2_amd64.deb
- sudo dpkg -i swig3.0_3.0.10-1.2_amd64.deb
- sudo ln -s /usr/bin/swig3.0 /usr/local/bin/swig
- pip install pipenv

install:
- pip install -r src/requirements.txt
- pip install -r src/dev-requirements.txt
- yes | pip install git+https://github.com/duxingkei33/orangepi_PC_gpio_pyH3.git -v
- pipenv install --dev --deploy
- pipenv install git+https://github.com/Kitt-AI/snowboy.git#egg=snowboy || true
# - yes | pip install git+https://github.com/duxingkei33/orangepi_PC_gpio_pyH3.git#egg=pyA20 -v

script:
- pylint --rcfile=pylintrc --ignore=tunein.py src/auth_web.py src/main.py src/alexapi
- python -c "import yaml; yaml.load(open('src/config.template.yaml'))"
- cd src/scripts && shellcheck -e 2164 ./inc/*.sh ./inc/os/*.sh ./inc/device/*.sh ./*.sh
- pipenv run lint
- pipenv run yamlcheck
- pipenv run shlint
21 changes: 20 additions & 1 deletion CHANGELOG.md
Expand Up @@ -5,6 +5,24 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).

## [Unreleased]

## [1.7] - 2018-12-22

### Added
- Support for snowboy - the awesome trigger word detector
- Debug option to `auth_web.py`.

### Changed
- Python 3 is default.
- Uses `pip` version from the repo on Debian systems instead of the dirty uninstall & install via `easy_install`.

### Removed
- Support for Python < 3.5
- Support for Debian/Raspbian older than Stretch - Jessie is not supported anymore!

### Fixed
- Weird bugs with dependencies versions, as we now use locked deps.
- Broken Raspbian installs due to some Python version mishap.

## [1.6] - 2017-10-08

### Added
Expand Down Expand Up @@ -147,7 +165,8 @@ This is mainly a test of doing bugfix releases.
@sammachin created the project in January 2016 and made significant changes that lead to this version.


[Unreleased]: https://github.com/alexa-pi/AlexaPi/compare/v1.6...HEAD
[Unreleased]: https://github.com/alexa-pi/AlexaPi/compare/v1.7...HEAD
[1.7]: https://github.com/alexa-pi/AlexaPi/compare/v1.6...v1.7
[1.6]: https://github.com/alexa-pi/AlexaPi/compare/v1.5.1...v1.6
[1.5.1]: https://github.com/alexa-pi/AlexaPi/compare/v1.5...v1.5.1
[1.5]: https://github.com/alexa-pi/AlexaPi/compare/v1.4...v1.5
Expand Down
29 changes: 29 additions & 0 deletions Pipfile
@@ -0,0 +1,29 @@
[[source]]
name = "pypi"
url = "https://pypi.org/simple"
verify_ssl = true

[dev-packages]
pylint = "*"
pyserial = "*"
websocket-client = "*"
fakerpigpio = "==0.3a0"
chip-io = {git = "https://github.com/xtacocorex/CHIP_IO.git"}

[packages]
requests = "*"
python-vlc = "*"
webrtcvad = "*"
pocketsphinx = "*"
coloredlogs = "*"
CherryPy = "*"
PyAudio = "*"
PyYAML = "*"

[requires]
#python_version = "3.7"

[scripts]
lint = "pylint --rcfile=pylintrc --ignore=tunein.py src/auth_web.py src/main.py src/alexapi"
yamlcheck = "python -c \"import yaml; yaml.load(open('src/config.template.yaml'))\""
shlint = "pipenv shell --anyway \"cd src/scripts && shellcheck -e 2164 -e 1117 ./inc/*.sh ./inc/os/*.sh ./inc/device/*.sh ./*.sh\" && exit"

0 comments on commit 83f71d4

Please sign in to comment.