Merge 93f539d into e179e07

.gitignore

@@ -1,3 +1,12 @@
+*.DS_Store
+*.prof
+.python-version
+
+.coverage
+.tox/
+AUTHORS
+ChangeLog
+
 # ignore visualization files that may be generated by main functions in the core concept_formation directory
 
 concept_formation/images/
@@ -25,4 +34,4 @@ visualize/output*
 visualize/images
 *.egg-info
 .cache
-.eggs/
+.eggs/

.travis.yml

@@ -1,14 +1,15 @@
 language: python
-sudo: required
-dist: xenial
 python:
-  - '3.7'
-  - 'pypy3.5-6.0'
+  - 'nightly'
+  - 'pypy3'
 install:
-  - pip install tox-travis
   - pip install coveralls
+  - pip install .
+  - pip install -r test_requirements.txt
 script:
-  - tox
+  - flake8 concept_formation
+  - coverage run --source concept_formation -m pytest
+  - coverage report
 after_success:
   - coveralls
 deploy:

tox.ini

@@ -1,13 +1,10 @@
-[tox]
-envlist = py27,py37,pypy2.7,pypy3.5
-
 [testenv]
 commands =
     coverage run --source concept_formation -m pytest
     coverage report
     flake8 concept_formation
 deps =
-    -rtest_requirements.txt
+    -r test_requirements.txt
 
 [pytest]
 doctest_optionflags=ALLOW_UNICODE