Skip to content

Use new nox #1765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Use new nox #1765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d12f178
Use new nox
busunkim96 Oct 15, 2018
87949fa
Update Travis to use new nox
busunkim96 Oct 16, 2018
54f5f2d
Handling of paths has changed.
engelke Oct 16, 2018
8346433
Merge branch 'master' into use-new-nox
engelke Oct 16, 2018
ff3ff05
Run travis under Python 3.6 instead of 2 for nox
engelke Oct 16, 2018
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
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
sudo: false
language: python
python:
- "3.6"
services:
- memcached
- mysql
Expand Down Expand Up @@ -27,7 +29,7 @@ addons:
- python3.6-dev
install:
- pip install --upgrade pip wheel virtualenv
- pip install --upgrade nox-automation
- pip install --upgrade nox
- pip install --upgrade git+https://github.com/dhermes/ci-diff-helper.git
script:
- "./scripts/travis.sh"
28 changes: 15 additions & 13 deletions nox.py → noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ def _session_tests(session, sample, post_install=None):

session.chdir(sample)

if os.path.exists(os.path.join(sample, 'requirements.txt')):
if os.path.exists('requirements.txt'):
session.install('-r', 'requirements.txt')

if post_install:
Expand All @@ -208,10 +208,10 @@ def _session_tests(session, sample, post_install=None):
success_codes=[0, 5])


@nox.session(python='2.7')
@nox.parametrize('sample', GAE_STANDARD_SAMPLES)
def session_gae(session, sample):
def gae(session, sample):
"""Runs py.test for an App Engine standard sample."""
session.interpreter = 'python2.7'

# Create a lib directory if needed, otherwise the App Engine vendor library
# will complain.
Expand All @@ -221,22 +221,23 @@ def session_gae(session, sample):
_session_tests(session, sample, _setup_appengine_sdk)


@nox.session(python='2.7')
@nox.parametrize('sample', NON_GAE_STANDARD_SAMPLES_PY2)
def session_py27(session, sample):
def py27(session, sample):
"""Runs py.test for a sample using Python 2.7"""
session.interpreter = 'python2.7'
_session_tests(session, sample)


@nox.session(python='3.6')
@nox.parametrize('sample', NON_GAE_STANDARD_SAMPLES_PY3)
def session_py36(session, sample):
def py36(session, sample):
"""Runs py.test for a sample using Python 3.6"""
session.interpreter = 'python3.6'
_session_tests(session, sample)


@nox.session
@nox.parametrize('sample', ALL_SAMPLE_DIRECTORIES)
def session_lint(session, sample):
def lint(session, sample):
"""Runs flake8 on the sample."""
session.install('flake8', 'flake8-import-order')

Expand All @@ -253,10 +254,9 @@ def session_lint(session, sample):
# Utility sessions
#


def session_missing_tests(session):
@nox.session
def missing_tests(session):
"""Lists all sample directories that do not have tests."""
session.virtualenv = False
print('The following samples do not have tests:')
for sample in set(ALL_SAMPLE_DIRECTORIES) - set(ALL_TESTED_SAMPLES):
print('* {}'.format(sample))
Expand All @@ -266,8 +266,9 @@ def session_missing_tests(session):
list(_collect_dirs('.', suffix='.rst.in')))


@nox.session
@nox.parametrize('sample', SAMPLES_WITH_GENERATED_READMES)
def session_readmegen(session, sample):
def readmegen(session, sample):
"""(Re-)generates the readme for a sample."""
session.install('jinja2', 'pyyaml')

Expand All @@ -278,7 +279,8 @@ def session_readmegen(session, sample):
session.run('python', 'scripts/readme-gen/readme_gen.py', in_file)


def session_check_requirements(session):
@nox.session
def check_requirements(session):
"""Checks for out of date requirements and optionally updates them.

This is intentionally not parametric, as it's desired to never have two
Expand Down