Skip to content

Commit

Permalink
Merge branch 'release/1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
CPrescher committed Aug 5, 2016
2 parents 7d1de5d + ee9fd94 commit ddf1f07
Show file tree
Hide file tree
Showing 108 changed files with 26,728 additions and 2,173 deletions.
4 changes: 4 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[run]
omit =
glassure/tests/*
glassure/core/_version.py
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
glassure/core/_version.py export-subst
9 changes: 3 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ __pycache__/
# IDEs

.idea
.vscode

# C extensions
*.so
Expand Down Expand Up @@ -45,12 +46,8 @@ htmlcov/
nosetests.xml
coverage.xml

# Translations
*.mo
*.pot

# Django stuff:
*.log
# Ipython Notebook
.ipynb_checkpoints

# Sphinx documentation
docs/_build/
Expand Down
56 changes: 56 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# Config file for automatic testing at travis-ci.org
language: python

python:
- 2.7
- 3.5

cache:
pip: true
directories:
- /home/travis/miniconda2
- /home/travis/miniconda3

before_install:
# install anaconda
- echo $TRAVIS_PYTHON_VERSION
- if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then
if [ ! -d "/home/travis/miniconda2/bin" ]; then
rm -rf /home/travis/miniconda2;
wget http://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
chmod +x miniconda.sh;
./miniconda.sh -b;
fi
fi
- if [ "$TRAVIS_PYTHON_VERSION" == "3.5" ]; then
if [ ! -d "/home/travis/miniconda3/bin" ]; then
rm -rf /home/travis/miniconda3;
wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
chmod +x miniconda.sh;
./miniconda.sh -b;
fi
fi

- if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then
export PATH=/home/travis/miniconda2/bin:$PATH;
else
export PATH=/home/travis/miniconda3/bin:$PATH;
fi

- conda update --yes conda
- export PYTHONPATH=$PWD/glassure:$PYTHONPATH

#start x-server
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start

install:
- conda install --yes python=$TRAVIS_PYTHON_VERSION numpy scipy pyqt pytest pytest-cov pandas mock
- pip install pyqtgraph lmfit coveralls coverage

script:
- coverage run --source glassure -m py.test
- coverage report -m

after_success:
coveralls
2 changes: 0 additions & 2 deletions Controller/__init__.py

This file was deleted.

25 changes: 0 additions & 25 deletions Glassure.py

This file was deleted.

Loading

0 comments on commit ddf1f07

Please sign in to comment.