Skip to content
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.

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

Update tox and travis #3

Merged
merged 4 commits into from
Apr 3, 2018
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
16 changes: 6 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
# Config file for automatic testing at travis-ci.org

sudo: false
language: python

python:
- "3.4"
- "2.7"

- "3.5"
- "3.6"
# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
install:
- pip install -r requirements.txt
- pip install .

install:
- pip install -U tox-travis
# command to run tests, e.g. python setup.py test
script:
- py.test
script: tox
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include leicacam/VERSION
8 changes: 5 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/usr/bin/env python

"""Set up package."""
import os
import sys
from setuptools import setup


Expand All @@ -11,9 +10,12 @@
except FileNotFoundError:
readme = ''

with open(os.path.join('leicacam', 'VERSION')) as version_file:
VERSION = version_file.read().strip()

setup(
name='leicacam',
version=open(os.path.join('leicacam', 'VERSION')).read().strip(),
version=VERSION,
description='Control Leica microscopes with python',
long_description=readme,
author='Arve Seljebu',
Expand Down
1 change: 1 addition & 0 deletions test-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pytest==3.5.0
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[tox]
envlist = py27, py34
envlist = py27, py35, py36

[testenv]
setenv =
PYTHONPATH = {toxinidir}:{toxinidir}/leicacam
deps =
-r{toxinidir}/requirements.txt
pytest
-r{toxinidir}/test-requirements.txt
commands =
py.test --basetemp={envtmpdir} {posargs}
pytest --basetemp={envtmpdir} {posargs}