Skip to content

Commit

Permalink
Merge branch 'master' into pyup-pin-setuptools-40.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
timolesterhuis committed Mar 12, 2019
2 parents db78a49 + d2033f0 commit 8b62c90
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 21 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@
__pycache__
.coverage
htmlcov/
.idea/
.idea/
dist/
diagnostics.egg-info
build/
17 changes: 13 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
dist: xenial
language: python
python: 3.7.2
# Existing Python versions
python:
- 3.5
- 3.6
# Enable 3.7 without globally enabling sudo and dist: xenial for other build jobs
matrix:
include:
- python: 3.7
dist: xenial
sudo: true

install:
- pip install -r requirements_dev.txt
- pip install -r requirements.txt
- python setup.py install
script:
- python -m pytest --cov=diagnostics
- python -m pytest --cov=diagnostics --cov-report html
after_success:
- coveralls
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import os
from setuptools import setup, find_packages

with open("README.md", "r") as readme_file:
readme = readme_file.read()

with open("requirements.txt", "r") as requirements_file:
requirements = requirements_file.read().split("\N")
requirements = ["pytz", "numpy", "matplotlib"]

setup(
name="diagnostics",
Expand Down
14 changes: 0 additions & 14 deletions tox.ini

This file was deleted.

0 comments on commit 8b62c90

Please sign in to comment.