Skip to content
This repository was archived by the owner on Oct 19, 2023. It is now read-only.

Upgrade nox #373

Merged
merged 1 commit into from
Oct 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ before_install:
- sudo apt-get -qq update
- sudo apt-get install -y portaudio19-dev libffi-dev libssl-dev
install:
- pip install nox-automation
- pip install nox
script:
- nox -f google-assistant-grpc/nox.py -s lint
- nox -f google-assistant-sdk/nox.py -s lint unittest
- nox -f google-assistant-grpc/noxfile.py -s lint
- nox -f google-assistant-sdk/noxfile.py -s lint unittest
2 changes: 1 addition & 1 deletion google-assistant-grpc/MAINTAINER.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Maintainer guide

- Install automation tools

pip install --upgrade nox-automation
pip install --upgrade nox

## Tasks

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
import nox


@nox.session
@nox.session(python=["3"])
def lint(session):
session.interpreter = 'python3'
session.install('pip', 'setuptools')
session.install('docutils', 'flake8', 'readme_renderer')
session.run('flake8', 'nox.py', 'setup.py')
Expand Down
2 changes: 1 addition & 1 deletion google-assistant-sdk/MAINTAINER.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Maintainer guide

- Install automation tools

pip install --upgrade nox-automation
pip install --upgrade nox

## Tasks

Expand Down
15 changes: 5 additions & 10 deletions google-assistant-sdk/nox.py → google-assistant-sdk/noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@
import nox


@nox.session
@nox.session(python=["3"])
def lint(session):
session.interpreter = 'python3'
session.install('pip', 'setuptools')
session.install('docutils', 'flake8', 'readme_renderer')
session.run('flake8',
Expand All @@ -29,21 +28,17 @@ def lint(session):
session.run('python', '-m', 'json.tool', 'actions.json')


@nox.session
@nox.parametrize('python_version', ['2.7', '3'])
def unittest(session, python_version):
session.interpreter = 'python' + python_version
@nox.session(python=['2.7', '3'])
def unittest(session):
session.install('pip', 'setuptools')
session.install('pytest', 'future')
session.install('../google-assistant-grpc/')
session.install('-e', '.[samples]')
session.run('py.test', '-k', 'not test_endtoend', 'tests')


@nox.session
@nox.parametrize('python_version', ['2.7', '3'])
def endtoend_test(session, python_version):
session.interpreter = 'python' + python_version
@nox.session(python=['2.7', '3'])
def endtoend_test(session):
session.install('pip', 'setuptools')
session.install('pytest', 'future')
session.install('../google-assistant-grpc/')
Expand Down