Skip to content

Fix CI configuration #576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zerothabhishek merged 7 commits into from
Apr 9, 2019
Merged

Fix CI configuration #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
15c1826
#dropthedot
pradyunsg Apr 3, 2019
bb1e0d0
Use the newer tool:pytest section for pytest
pradyunsg Apr 3, 2019
eafbb3f
Minimal dependency upgrades for fixing pytest runs
pradyunsg Apr 3, 2019
08b7ceb
We're still Python 2. :(
pradyunsg Apr 3, 2019
b3ced1f
Use older flake8 to not need code changes
pradyunsg Apr 3, 2019
a061a31
Bump down pytest-flakes to make things work
pradyunsg Apr 3, 2019
3f31197
Re-add pytest-cov
pradyunsg Apr 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ env:

script:
- flake8
- py.test --cov -v --tb=native
- pytest --cov -v --tb=native
- coverage report -m

after_success:
Expand Down
21 changes: 9 additions & 12 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,24 @@

# Testing
# -------------------------------------------------
# Fix for travis CI tests failing
# Ref: https://github.com/FactoryBoy/factory_boy/issues/334#issuecomment-267696136
fake-factory==0.7.4
factory-boy==2.7.0
factory-boy==2.11.1

flake8==2.4.1
pytest-django==2.9.1
pytest-cov==2.2.1
pytest-flakes==1.0.0
pytest-django==3.4.8
pytest-flakes==2.0.0
pytest-cov==2.6.1

coverage==4.1
coverage==4.5.3

# Documentation
# --------------------------------------------------
mkdocs==0.15.3
mkdocs==1.0.4
bumpversion==0.5.3

# Debugging
# --------------------------------------------------
ipdb==0.9.0
ipdb==0.12

# Patch for html5lib - issue #520
html5lib<0.99999999
bleach<2.0.0
html5lib==1.0.1
bleach==3.1.0
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ hashids==1.1.0
# Django Model Helpers
# -------------------------------------------------
django-uuid-upload-path==1.0.0
Pillow==2.9.0
Pillow==5.4.1

# Auth
# -------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ tag = True

[bumpversion:file:README.md]

[pytest]
[tool:pytest]
DJANGO_SETTINGS_MODULE = settings.test_settings
addopts = --reuse-db
norecursedirs = .tox .git */migrations/* */static/* docs venv
Expand All @@ -18,7 +18,7 @@ exclude = .tox,.git,*/migrations/*,*/static/*,docs,venv

[coverage:run]
source = junction/
omit =
omit =
*tests*
*commands*
*migrations*
Expand Down