diff --git a/.gitignore b/.gitignore index f0c89543b6..eb86f42976 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,6 @@ base.db /contents-public /media /articles-data -contents-private/ -contents-public/ /tutoriels-private-test /tutoriels-public-test diff --git a/.travis.yml b/.travis.yml index f86a6f250b..00fb9d93a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,8 @@ env: global: - secure: "azmDZZQZzf88zpbkYpLpxI66vpEVyv+kniW0QdWAt4qlys8P5OcO3VJBR5YT85vlvnjN9b6raWQAL1ymee0WmVdTmzXed8XjZv7t9QXVw7pfezxMKlEftVp/4Cu4wtvbew0ViZXNWV2hNXHzEqlhgnoIOq94i0UzZ7grMrI0xm0=" matrix: - - TEST_APP="-e back_mysql -- zds.member zds.mp zds.utils zds.forum zds.gallery zds.pages zds.search" - - TEST_APP="-e back_mysql_tuto -- zds.article zds.tutorial zds.tutorialv2" + - TEST_APP="-e back_mysql -- zds.member zds.mp zds.utils zds.forum zds.gallery zds.pages zds.search zds.featured" + - TEST_APP="-e back_mysql -- zds.article zds.tutorial zds.tutorialv2" - TEST_APP="-e front" diff --git a/tox.ini b/tox.ini index 2b50b8fff0..78e7158ad0 100644 --- a/tox.ini +++ b/tox.ini @@ -19,15 +19,6 @@ commands = coverage run --source='.' {toxinidir}/manage.py test {posargs} flake8 -[testenv:back_mysql_tuto] -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/requirements-dev.txt - MySQL-python - ujson -commands = - coverage run --source='.' {toxinidir}/manage.py test {posargs} - flake8 - [testenv:back] deps = -r{toxinidir}/requirements.txt -r{toxinidir}/requirements-dev.txt diff --git a/zds/tutorialv2/utils.py b/zds/tutorialv2/utils.py index ef12a1b12b..bb46153fba 100644 --- a/zds/tutorialv2/utils.py +++ b/zds/tutorialv2/utils.py @@ -822,6 +822,7 @@ def get_content_from_json(json, sha, slug_last_draft, public=False): return versioned + class InvalidSlugError(ValueError): pass