summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorChristoph Zwerschke <cito@online.de>2016-04-19 20:07:12 +0200
committerChristoph Zwerschke <cito@online.de>2016-04-19 20:07:12 +0200
commit3629c49e46207ff5162a82883c14937e6ef4c186 (patch)
tree1306181202cb8313f16080789f5b9ab1eeb61d53 /.gitignore
parent804ba0b2f434781e77d2b5191f1cd76a490f6610 (diff)
parent6c16fb020027fac47e4d2e335cd9e264dba8aa3b (diff)
downloadpyramid-3629c49e46207ff5162a82883c14937e6ef4c186.tar.gz
pyramid-3629c49e46207ff5162a82883c14937e6ef4c186.tar.bz2
pyramid-3629c49e46207ff5162a82883c14937e6ef4c186.zip
Merge remote-tracking branch 'refs/remotes/Pylons/master'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore19
1 files changed, 11 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index ea97734f6..fe132412a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,20 @@
*.egg
*.egg-info
+.eggs/
*.pyc
*$py.class
*.pt.py
*.txt.py
*~
+.*.swp
.coverage
+.coverage.*
.tox/
nosetests.xml
-pyramid/coverage.xml
+coverage.xml
+nosetests-*.xml
+coverage-*.xml
tutorial.db
-env26/
-env26-debug/
-bookenv/
-env24/
-env27/
-jyenv/
-pypyenv/
build/
dist/
bin/
@@ -24,3 +22,8 @@ lib/
include/
.idea/
distribute-*.tar.gz
+bookenv/
+jyenv/
+pypyenv/
+env*/
+venv/