Merge 711357d into f9343b2

openworm · Jan 26, 2019 · ca275e0 · ca275e0
2 parents f9343b2 + 711357d
commit ca275e0
Show file tree

Hide file tree

Showing 80 changed files with 4,473 additions and 18,516 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ matrix:
     - python: '3.4'
     - python: '2.7'
 before_install:
+- pip install --upgrade pip
 - pip install coveralls
 - pip uninstall pytest --yes
 - pip install pytest>=3.4.0

diff --git a/INSTALL.md b/INSTALL.md
@@ -4,31 +4,36 @@ The recommended way to get PyOpenWorm is from [pip](http://pip.readthedocs.org/e
 
     pip install pyopenworm
 
-Alternatively, you can grab the contents from GitHub:
+Alternatively, you can grab the latest on the development branch from GitHub:
 
     git clone https://github.com/openworm/PyOpenWorm.git
     cd PyOpenWorm
     python setup.py install
 
-Uninstall
-----------
-
-    pip uninstall PyOpenWorm
-
 Running tests
 -------------
 
 After checking out the project, tests can be run from the command line in the root folder with::
 
-    py.test
+    python setup.py test
 
 You may also run individual test cases with::
 
-    py.test -k <NameOfTest>
+    python setup.py test --addopts "-k <NameOfTest>"
+
+For example, where *test_muscles1* is a test in the *WormTest* suite of tests (see tests/WormTest.py)::
 
-For example, where *test_muscles*1 is a test in the *WormTest* suite of tests (see tests/WormTest.py)::
+    python setup.py test --addopts "-k test_muscles1"
 
-    py.test -k test_muscles1
+Python 2 support
+----------------
+Python 2.7 will be supported in PyOpenWorm through Python 2.7 end-of-life in 2020. Subsequent to that, any regressions for 2.7-based applications will only be fixed for the sake of OpenWorm projects.
+
+
+Uninstall
+----------
+
+    pip uninstall PyOpenWorm
 
 
 Optional

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2016 OpenWorm
+Copyright (c) 2014-2019 OpenWorm
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/OpenWormData/aux_data/C. elegans Cell List - WormAtlas.tsv b/OpenWormData/aux_data/C. elegans Cell List - WormAtlas.tsv
diff --git a/OpenWormData/aux_data/C. elegans Cell List - WormBase.csv b/OpenWormData/aux_data/C. elegans Cell List - WormBase.csv
diff --git a/OpenWormData/aux_data/Ion channels - Ion Channel To Body Muscle.tsv b/OpenWormData/aux_data/Ion channels - Ion Channel To Body Muscle.tsv
diff --git a/OpenWormData/aux_data/Ion channels - Ion Channel To Neuron.tsv b/OpenWormData/aux_data/Ion channels - Ion Channel To Neuron.tsv
diff --git a/OpenWormData/aux_data/Modified celegans db dump.csv b/OpenWormData/aux_data/Modified celegans db dump.csv
diff --git a/OpenWormData/aux_data/NeuroML_Channel.csv b/OpenWormData/aux_data/NeuroML_Channel.csv
diff --git a/OpenWormData/aux_data/NeuronConnect.xls b/OpenWormData/aux_data/NeuronConnect.xls
diff --git a/OpenWormData/aux_data/README.md b/OpenWormData/aux_data/README.md
diff --git a/OpenWormData/aux_data/bibtex_files/WormAtlas.bib b/OpenWormData/aux_data/bibtex_files/WormAtlas.bib
diff --git a/OpenWormData/aux_data/bibtex_files/altun2009.bib b/OpenWormData/aux_data/bibtex_files/altun2009.bib
diff --git a/OpenWormData/aux_data/bibtex_files/harris2010.bib b/OpenWormData/aux_data/bibtex_files/harris2010.bib
diff --git a/OpenWormData/aux_data/bibtex_files/rand1997.bib b/OpenWormData/aux_data/bibtex_files/rand1997.bib
diff --git a/OpenWormData/aux_data/celegans.db b/OpenWormData/aux_data/celegans.db