diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 194abaca..d1b11ff3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -10,7 +10,7 @@ Change Log Changed ======= -- Changed "ci workflow" of template xblock to pass the tests of newly created xblocks and now through an error on build or anywhere else. +- Changed "ci workflow" of template xblock to pass the tests of newly created xblocks and not throw an error on build or anywhere else. 2023-11-08 ********** diff --git a/cookiecutter-xblock/{{cookiecutter.repo_name}}/tox.ini b/cookiecutter-xblock/{{cookiecutter.repo_name}}/tox.ini index 0edebec5..57ad5cb5 100644 --- a/cookiecutter-xblock/{{cookiecutter.repo_name}}/tox.ini +++ b/cookiecutter-xblock/{{cookiecutter.repo_name}}/tox.ini @@ -31,13 +31,13 @@ ignore = D101,D200,D203,D212,D215,D404,D405,D406,D407,D408,D409,D410,D411,D412,D match-dir = (?!migrations) [pytest] -DJANGO_SETTINGS_MODULE = myxblock.settings.test -addopts = --cov myxblock --cov-report term-missing --cov-report xml +DJANGO_SETTINGS_MODULE = translation_settings +addopts = --cov {{ cookiecutter.package_name }} --cov-report term-missing --cov-report xml norecursedirs = .* docs requirements site-packages [testenv:docs] setenv = - DJANGO_SETTINGS_MODULE = myxblock.settings.test + DJANGO_SETTINGS_MODULE = translation_settings.settings.test PYTHONPATH = {toxinidir} # Adding the option here instead of as a default in the docs Makefile because that Makefile is generated by shpinx. SPHINXOPTS = -W @@ -48,7 +48,7 @@ deps = -r{toxinidir}/requirements/doc.txt commands = doc8 --ignore-path docs/_build README.rst docs - rm -f docs/myxblock.rst + rm -f docs/{{ cookiecutter.package_name }}.rst rm -f docs/modules.rst make -e -C docs clean make -e -C docs html @@ -59,14 +59,14 @@ whitelist_externals = deps = -r{toxinidir}/requirements/quality.txt commands = - pylint myxblock test_utils manage.py - pycodestyle myxblock manage.py - pydocstyle myxblock manage.py - isort --check-only --diff test_utils myxblock manage.py + pylint {{ cookiecutter.package_name }} test_utils manage.py + pycodestyle {{ cookiecutter.package_name }} manage.py + pydocstyle {{ cookiecutter.package_name }} manage.py + isort --check-only --diff test_utils {{ cookiecutter.package_name }} manage.py [testenv:pii_check] setenv = - DJANGO_SETTINGS_MODULE = myxblock.settings.test + DJANGO_SETTINGS_MODULE = translation_settings.settings.test deps = -r{toxinidir}/requirements/test.txt commands =