Merge git configuration on master

[odoo/odoo.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index f9be5e7..96cf70e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,78 @@
-*.pyc
+# dotfiles
 .*
-*.egg-info
+!.gitignore
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Translations
+*.mo
+*.pot
+
+# Logging stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# editors backup, swap or config files
+*~
+*.swp
+.project
+.pydevproject
+.settings
+.idea/
+
+# Data directory
+/data
+
+# hg stuff
 *.orig
-*.vim
-build
-_build
-/bin
-/dist
-/include
-
-/share
-/man
-/lib
+status
+
+# odoo filestore
+openerp/filestore
+
+# generated for windows installer?
+install/win32/*.bat
+install/win32/meta.py
+
+# various virtualenv
+/bin/
+/include/
+/lib/
+/man/
+/share/
+/src/