diff --git a/.gitignore b/.gitignore index 6ca4d51a..2592fe2b 100644 --- a/.gitignore +++ b/.gitignore @@ -63,6 +63,7 @@ coverage.xml *.log local_settings.py db.sqlite3 +db.sqlite3-journal # Flask stuff: instance/ @@ -272,6 +273,7 @@ flycheck_*.el # Session Session.vim +Sessionx.vim # Temporary .netrwhist @@ -429,11 +431,7 @@ DerivedData/ *.perspectivev3 !default.perspectivev3 -## Xcode Patch -*.xcodeproj/* -!*.xcodeproj/project.pbxproj -!*.xcodeproj/xcshareddata/ -!*.xcworkspace/contents.xcworkspacedata +## Gcc Patch /*.gcno # Eclipse rules diff --git a/test-requirements.txt b/test-requirements.txt index 80fe8c3e..4b444785 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,7 +10,7 @@ coverage==4.4.1 coverage-env-plugin~=0.1 coverage-config-reload-plugin~=0.2 codecov~=2.0.5 -moban~=0.3.3 ; python_version > '3.0' +moban~=0.5.0 ; python_version > '3.0' packaging~=16.8 pytest~=3.6.4 pytest-cov~=2.4 @@ -27,6 +27,7 @@ pytest-travis-fold~=1.3.0 requests-mock~=1.2 ipdb~=0.11 pip<10 +six>=1.11.0 wheel~=0.29 git+https://github.com/coala/coala.git git+https://github.com/coala/coala-bears.git