Remove pipenv and update how requirements are specified

.travis.yml

@@ -1,12 +1,13 @@
 language: python
+sudo: required
+dist: xenial
 python:
   - "3.6"
-  - "3.7-dev"  # 3.7 development branch
+  - "3.7"
 # command to install dependencies
 install:
-  - pip install pipenv
-  - pipenv install
-  - pipenv install '-e .'
+  - pip install .
+  - pip install -r requirements-dev.txt
 # command to run tests
 script:
   - pytest # or py.test for Python versions 3.5 and below

README.md

@@ -206,36 +206,11 @@ Clone this repository
 ```
 git clone [email protected]:iandanforth/pymuscle.git
 cd pymuscle
+pip install -r requirements-dev.txt
+python setup.py develop
+pytest
 ```
 
-Install [pipenv](https://docs.pipenv.org/). (The modern combination of pip and 
-virtual environments.)
-
-```
-pip install pipenv
-```
-
-If this throws a permissions error you will need to to run this with 'sudo'
-
-```
-sudo pip install pipenv
-```
-
-Install dependencies and start a clean python environment
-
-```
-pipenv install
-pipenv shell
-```
-
-To exit this python environment
-
-```
-exit
-```
-
-or close your terminal and start a new one.
-
 # Performance
 
 PyMuscle aims to be fast. We use Numpy to get fast vector computation. PyMuscle

pymuscle/__version__.py

@@ -1,6 +1,6 @@
 """
 PyMuscle Library
 """
-VERSION = (0, 1, 0)
+VERSION = (0, 1, 1)
 
 __version__ = '.'.join(map(str, VERSION))

pymuscle/vis/potvin_charts.py

@@ -1,5 +1,4 @@
 import numpy as np
-import plotly.graph_objs as go
 import colorlover as cl
 from numpy import ndarray
 from plotly.offline import plot

requirements-dev.txt

@@ -0,0 +1,11 @@
+# Why only a requirements-dev.txt?
+# https://caremad.io/posts/2013/07/setup-vs-requirement/
+# Standard install: 
+# 	`pip install pymuscle` 		# From PyPi
+# 	`pip install .`				# Locally
+#	`python setup.py install`	# Same as above
+pytest >= 3.6
+pylint
+coverage
+pytest-cov
+sphinx-rtd-theme

setup.py

@@ -21,9 +21,12 @@
 VERSION = None
 
 # What packages are required for this module to be executed?
+# This should be kept in sync with *runtime* packages, but not
+# *development* packages.
 REQUIRED = [
     'numpy',
-    'plotly'
+    'plotly',
+    'colorlover'
 ]
 
 # The rest you shouldn't have to touch too much :)