Skip to content

Commit

Permalink
Sync moban with coala-community repo
Browse files Browse the repository at this point in the history
The Travis CI moban build is failing
due to outdated files.

Closes coala#241
  • Loading branch information
KVGarg committed May 16, 2019
1 parent 07d6d51 commit 9d9f838
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 4 deletions.
18 changes: 17 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,13 @@ ipython_config.py
# pyenv
.python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# celery beat schedule file
celerybeat-schedule

Expand Down Expand Up @@ -152,6 +159,7 @@ pip-selfcheck.json
# Windows rules
# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db

Expand Down Expand Up @@ -307,6 +315,8 @@ tags
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/
Expand Down Expand Up @@ -419,8 +429,14 @@ DerivedData/
*.perspectivev3
!default.perspectivev3

# Eclipse rules
## Xcode Patch
*.xcodeproj/*
!*.xcodeproj/project.pbxproj
!*.xcodeproj/xcshareddata/
!*.xcworkspace/contents.xcworkspacedata
/*.gcno

# Eclipse rules
.metadata
bin/
tmp/
Expand Down
6 changes: 5 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
python-tag = py34.py35.py36

[tool:pytest]
minversion = 3.6.1
minversion = 3.6.4

DJANGO_SETTINGS_MODULE = community.settings

Expand Down Expand Up @@ -111,4 +111,8 @@ exclude_lines =
def clear_score
def __str__

partial_branches =
pragma: no ?branch
pragma.* ${PLATFORM_SYSTEM}: no branch
pragma.* ${OS_NAME}: no branch
[coverage:force_end_of_section]
3 changes: 1 addition & 2 deletions test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ coverage-config-reload-plugin~=0.2
codecov~=2.0.5
moban~=0.3.3 ; python_version > '3.0'
packaging~=16.8
pytest~=3.6.1
pytest~=3.6.4
pytest-cov~=2.4
pytest-django~=3.3.3
pytest-env~=0.6.0
Expand All @@ -24,7 +24,6 @@ pytest-reorder~=0.1.0
git+https://github.com/jayvdb/pytest-reqs@coala#egg=pytest-reqs
pytest-timeout~=1.3.0
pytest-travis-fold~=1.3.0
pytest-xdist~=1.15
requests-mock~=1.2
ipdb~=0.11
pip<10
Expand Down

0 comments on commit 9d9f838

Please sign in to comment.