Merge pull request #146 from jacebrowning/plumbing/pipenv-and-python3.6

Use pipenv and add Python 3.6 support
jacebrowning · May 31, 2017 · ff062bb · ff062bb
2 parents dd3b252 + b35ce59
commit ff062bb
Show file tree

Hide file tree

Showing 21 changed files with 728 additions and 164 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,5 +1,5 @@
 [run]
 branch = true
 omit =
-    */env/*
+    */.venv/*
     */tests/*
diff --git a/.gitignore b/.gitignore
@@ -8,17 +8,17 @@ __pycache__
 Icon*
 
 # Temporary virtual environment files
-/.cache
-/env
+/.cache/
+/.venv/
 
 # Temporary server files
 .env
 *.pid
 
 # Generated documentation
-/docs/gen
-/docs/apidocs
-/site
+/docs/gen/
+/docs/apidocs/
+/site/
 /*.html
 /*.rst
 /docs/*.png
@@ -30,19 +30,19 @@ Icon*
 *.gdraw
 
 # Testing and coverage results
-/.pytest
+/.pytest/
 /.coverage
 /.coverage.*
-/htmlcov
-/xmlreport
+/htmlcov/
+/xmlreport/
 /pyunit.xml
-/tmp
+/tmp/
 *.tmp
 
 # Build and release directories
+/build/
+/dist/
 *.spec
-/build
-/dist
 
 # Sublime Text
 *.sublime-workspace