Merge pull request #3077 from pydanny/fix/linting-gh-actions

This commit is contained in:
Bruno Alla 2021-04-07 21:01:47 +01:00 committed by GitHub
commit c09830d335
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 106 additions and 101 deletions

View File

@ -8,6 +8,7 @@ black==20.8b1
isort==5.8.0 isort==5.8.0
flake8==3.9.0 flake8==3.9.0
flake8-isort==4.0.0 flake8-isort==4.0.0
pre-commit==2.10.1
# Testing # Testing
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------

View File

@ -27,5 +27,11 @@ sudo utility/install_os_dependencies.sh install
# Install Python deps # Install Python deps
pip install -r requirements/local.txt pip install -r requirements/local.txt
# Lint by running pre-commit on all files
# Needs a git repo to find the project root
git init
git add .
pre-commit run --show-diff-on-failure -a
# run the project's tests # run the project's tests
pytest pytest

View File

@ -17,12 +17,16 @@ cd .cache/docker
cookiecutter ../../ --no-input --overwrite-if-exists use_docker=y $@ cookiecutter ../../ --no-input --overwrite-if-exists use_docker=y $@
cd my_awesome_project cd my_awesome_project
# Lint by running pre-commit on all files
# Needs a git repo to find the project root
# We don't have git inside Docker, so run it outside
git init
git add .
pre-commit run --show-diff-on-failure -a
# run the project's type checks # run the project's type checks
docker-compose -f local.yml run django mypy my_awesome_project docker-compose -f local.yml run django mypy my_awesome_project
# Run black with --check option
docker-compose -f local.yml run django black --check --diff --exclude 'migrations' ./
# run the project's tests # run the project's tests
docker-compose -f local.yml run django pytest docker-compose -f local.yml run django pytest

View File

@ -14,4 +14,4 @@ REDIS_URL=redis://redis:6379/0
# Flower # Flower
CELERY_FLOWER_USER=!!!SET CELERY_FLOWER_USER!!! CELERY_FLOWER_USER=!!!SET CELERY_FLOWER_USER!!!
CELERY_FLOWER_PASSWORD=!!!SET CELERY_FLOWER_PASSWORD!!! CELERY_FLOWER_PASSWORD=!!!SET CELERY_FLOWER_PASSWORD!!!
{% endif %} {%- endif %}

View File

@ -26,4 +26,3 @@ repos:
- id: flake8 - id: flake8
args: ['--config=setup.cfg'] args: ['--config=setup.cfg']
additional_dependencies: [flake8-isort] additional_dependencies: [flake8-isort]

View File

@ -1,5 +1,5 @@
[MASTER] [MASTER]
load-plugins=pylint_django{% if cookiecutter.use_celery == "y" %}, pylint_celery {% endif %} load-plugins=pylint_django{% if cookiecutter.use_celery == "y" %}, pylint_celery{% endif %}
[FORMAT] [FORMAT]
max-line-length=120 max-line-length=120

View File

@ -7,7 +7,7 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
{% elif cookiecutter.open_source_license == 'BSD' %} {%- elif cookiecutter.open_source_license == 'BSD' %}
Copyright (c) {% now 'utc', '%Y' %}, {{ cookiecutter.author_name }} Copyright (c) {% now 'utc', '%Y' %}, {{ cookiecutter.author_name }}
All rights reserved. All rights reserved.
@ -35,7 +35,7 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE. OF THE POSSIBILITY OF SUCH DAMAGE.
{% elif cookiecutter.open_source_license == 'GPLv3' %} {%- elif cookiecutter.open_source_license == 'GPLv3' %}
Copyright (c) {% now 'utc', '%Y' %}, {{ cookiecutter.author_name }} Copyright (c) {% now 'utc', '%Y' %}, {{ cookiecutter.author_name }}
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
@ -50,7 +50,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
{% elif cookiecutter.open_source_license == 'Apache Software License 2.0' %} {%- elif cookiecutter.open_source_license == 'Apache Software License 2.0' %}
Apache License Apache License
Version 2.0, January 2004 Version 2.0, January 2004
@ -242,4 +242,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
{% endif %} {%- endif %}

View File

@ -1,10 +1,10 @@
release: python manage.py migrate release: python manage.py migrate
{% if cookiecutter.use_async == "y" -%} {%- if cookiecutter.use_async == "y" -%}
web: gunicorn config.asgi:application -k uvicorn.workers.UvicornWorker web: gunicorn config.asgi:application -k uvicorn.workers.UvicornWorker
{%- else %} {%- else %}
web: gunicorn config.wsgi:application web: gunicorn config.wsgi:application
{%- endif %} {%- endif %}
{% if cookiecutter.use_celery == "y" -%} {%- if cookiecutter.use_celery == "y" -%}
worker: celery worker --app=config.celery_app --loglevel=info worker: celery worker --app=config.celery_app --loglevel=info
beat: celery beat --app=config.celery_app --loglevel=info beat: celery beat --app=config.celery_app --loglevel=info
{%- endif %} {%- endif %}

View File

@ -9,10 +9,10 @@
.. image:: https://img.shields.io/badge/code%20style-black-000000.svg .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
:target: https://github.com/ambv/black :target: https://github.com/ambv/black
:alt: Black code style :alt: Black code style
{% if cookiecutter.open_source_license != "Not open source" %} {%- if cookiecutter.open_source_license != "Not open source" %}
:License: {{cookiecutter.open_source_license}} :License: {{cookiecutter.open_source_license}}
{% endif %} {%- endif %}
Settings Settings
-------- --------
@ -67,7 +67,7 @@ Moved to `Live reloading and SASS compilation`_.
.. _`Live reloading and SASS compilation`: http://cookiecutter-django.readthedocs.io/en/latest/live-reloading-and-sass-compilation.html .. _`Live reloading and SASS compilation`: http://cookiecutter-django.readthedocs.io/en/latest/live-reloading-and-sass-compilation.html
{% if cookiecutter.use_celery == "y" %} {%- if cookiecutter.use_celery == "y" %}
Celery Celery
^^^^^^ ^^^^^^
@ -83,19 +83,21 @@ To run a celery worker:
Please note: For Celery's import magic to work, it is important *where* the celery commands are run. If you are in the same folder with *manage.py*, you should be right. Please note: For Celery's import magic to work, it is important *where* the celery commands are run. If you are in the same folder with *manage.py*, you should be right.
{% endif %} {%- endif %}
{% if cookiecutter.use_mailhog == "y" %} {%- if cookiecutter.use_mailhog == "y" %}
Email Server Email Server
^^^^^^^^^^^^ ^^^^^^^^^^^^
{% if cookiecutter.use_docker == 'y' %} {%- if cookiecutter.use_docker == 'y' %}
In development, it is often nice to be able to see emails that are being sent from your application. For that reason local SMTP server `MailHog`_ with a web interface is available as docker container. In development, it is often nice to be able to see emails that are being sent from your application. For that reason local SMTP server `MailHog`_ with a web interface is available as docker container.
Container mailhog will start automatically when you will run all docker containers. Container mailhog will start automatically when you will run all docker containers.
Please check `cookiecutter-django Docker documentation`_ for more details how to start all containers. Please check `cookiecutter-django Docker documentation`_ for more details how to start all containers.
With MailHog running, to view messages that are sent by your application, open your browser and go to ``http://127.0.0.1:8025`` With MailHog running, to view messages that are sent by your application, open your browser and go to ``http://127.0.0.1:8025``
{% else %} {%- else %}
In development, it is often nice to be able to see emails that are being sent from your application. If you choose to use `MailHog`_ when generating the project a local SMTP server with a web interface will be available. In development, it is often nice to be able to see emails that are being sent from your application. If you choose to use `MailHog`_ when generating the project a local SMTP server with a web interface will be available.
#. `Download the latest MailHog release`_ for your OS. #. `Download the latest MailHog release`_ for your OS.
@ -117,10 +119,10 @@ In development, it is often nice to be able to see emails that are being sent fr
Now you have your own mail server running locally, ready to receive whatever you send it. Now you have your own mail server running locally, ready to receive whatever you send it.
.. _`Download the latest MailHog release`: https://github.com/mailhog/MailHog/releases .. _`Download the latest MailHog release`: https://github.com/mailhog/MailHog/releases
{% endif %} {%- endif %}
.. _mailhog: https://github.com/mailhog/MailHog .. _mailhog: https://github.com/mailhog/MailHog
{% endif %} {%- endif %}
{% if cookiecutter.use_sentry == "y" %} {%- if cookiecutter.use_sentry == "y" %}
Sentry Sentry
^^^^^^ ^^^^^^
@ -129,13 +131,13 @@ Sentry is an error logging aggregator service. You can sign up for a free accoun
The system is setup with reasonable defaults, including 404 logging and integration with the WSGI application. The system is setup with reasonable defaults, including 404 logging and integration with the WSGI application.
You must set the DSN url in production. You must set the DSN url in production.
{% endif %} {%- endif %}
Deployment Deployment
---------- ----------
The following details how to deploy this application. The following details how to deploy this application.
{% if cookiecutter.use_heroku.lower() == "y" %} {%- if cookiecutter.use_heroku.lower() == "y" %}
Heroku Heroku
^^^^^^ ^^^^^^
@ -143,8 +145,8 @@ Heroku
See detailed `cookiecutter-django Heroku documentation`_. See detailed `cookiecutter-django Heroku documentation`_.
.. _`cookiecutter-django Heroku documentation`: http://cookiecutter-django.readthedocs.io/en/latest/deployment-on-heroku.html .. _`cookiecutter-django Heroku documentation`: http://cookiecutter-django.readthedocs.io/en/latest/deployment-on-heroku.html
{% endif %} {%- endif %}
{% if cookiecutter.use_docker.lower() == "y" %} {%- if cookiecutter.use_docker.lower() == "y" %}
Docker Docker
^^^^^^ ^^^^^^
@ -152,9 +154,8 @@ Docker
See detailed `cookiecutter-django Docker documentation`_. See detailed `cookiecutter-django Docker documentation`_.
.. _`cookiecutter-django Docker documentation`: http://cookiecutter-django.readthedocs.io/en/latest/deployment-with-docker.html .. _`cookiecutter-django Docker documentation`: http://cookiecutter-django.readthedocs.io/en/latest/deployment-with-docker.html
{% endif %} {%- endif %}
{%- if cookiecutter.custom_bootstrap_compilation == "y" %}
{% if cookiecutter.custom_bootstrap_compilation == "y" %}
Custom Bootstrap Compilation Custom Bootstrap Compilation
^^^^^^ ^^^^^^
@ -163,11 +164,11 @@ Bootstrap v4 is installed using npm and customised by tweaking your variables in
You can find a list of available variables `in the bootstrap source`_, or get explanations on them in the `Bootstrap docs`_. You can find a list of available variables `in the bootstrap source`_, or get explanations on them in the `Bootstrap docs`_.
{% if cookiecutter.js_task_runner == 'Gulp' %} {%- if cookiecutter.js_task_runner == 'Gulp' %}
Bootstrap's javascript as well as its dependencies is concatenated into a single file: ``static/js/vendors.js``. Bootstrap's javascript as well as its dependencies is concatenated into a single file: ``static/js/vendors.js``.
{% endif %} {%- endif %}
.. _in the bootstrap source: https://github.com/twbs/bootstrap/blob/v4-dev/scss/_variables.scss .. _in the bootstrap source: https://github.com/twbs/bootstrap/blob/v4-dev/scss/_variables.scss
.. _Bootstrap docs: https://getbootstrap.com/docs/4.1/getting-started/theming/ .. _Bootstrap docs: https://getbootstrap.com/docs/4.1/getting-started/theming/
{% endif %} {%- endif %}

View File

@ -10,4 +10,4 @@ python manage.py migrate
uvicorn config.asgi:application --host 0.0.0.0 --reload uvicorn config.asgi:application --host 0.0.0.0 --reload
{%- else %} {%- else %}
python manage.py runserver_plus 0.0.0.0:8000 python manage.py runserver_plus 0.0.0.0:8000
{% endif %} {%- endif %}

View File

@ -21,4 +21,3 @@ export AWS_STORAGE_BUCKET_NAME="${DJANGO_AWS_STORAGE_BUCKET_NAME}"
aws s3 cp s3://${AWS_STORAGE_BUCKET_NAME}${BACKUP_DIR_PATH}/${1} ${BACKUP_DIR_PATH}/${1} aws s3 cp s3://${AWS_STORAGE_BUCKET_NAME}${BACKUP_DIR_PATH}/${1} ${BACKUP_DIR_PATH}/${1}
message_success "Finished downloading ${1}." message_success "Finished downloading ${1}."

View File

@ -27,4 +27,3 @@ message_info "Cleaning the directory ${BACKUP_DIR_PATH}"
rm -rf ${BACKUP_DIR_PATH}/* rm -rf ${BACKUP_DIR_PATH}/*
message_success "Finished uploading and cleaning." message_success "Finished uploading and cleaning."

View File

@ -35,7 +35,7 @@ http:
web-secure-router: web-secure-router:
{%- if cookiecutter.domain_name.count('.') == 1 %} {%- if cookiecutter.domain_name.count('.') == 1 %}
rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)" rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)"
{% else %} {%- else %}
rule: "Host(`{{ cookiecutter.domain_name }}`)" rule: "Host(`{{ cookiecutter.domain_name }}`)"
{%- endif %} {%- endif %}
entryPoints: entryPoints:

View File

@ -44,7 +44,7 @@ LOCALE_PATHS = [str(ROOT_DIR / "locale")]
DATABASES = {"default": env.db("DATABASE_URL")} DATABASES = {"default": env.db("DATABASE_URL")}
{%- else %} {%- else %}
DATABASES = { DATABASES = {
"default": env.db("DATABASE_URL", default="postgres://{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.project_slug}}") "default": env.db("DATABASE_URL", default="postgres://{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.project_slug}}"),
} }
{%- endif %} {%- endif %}
DATABASES["default"]["ATOMIC_REQUESTS"] = True DATABASES["default"]["ATOMIC_REQUESTS"] = True
@ -230,7 +230,8 @@ X_FRAME_OPTIONS = "DENY"
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# https://docs.djangoproject.com/en/dev/ref/settings/#email-backend # https://docs.djangoproject.com/en/dev/ref/settings/#email-backend
EMAIL_BACKEND = env( EMAIL_BACKEND = env(
"DJANGO_EMAIL_BACKEND", default="django.core.mail.backends.smtp.EmailBackend" "DJANGO_EMAIL_BACKEND",
default="django.core.mail.backends.smtp.EmailBackend",
) )
# https://docs.djangoproject.com/en/dev/ref/settings/#email-timeout # https://docs.djangoproject.com/en/dev/ref/settings/#email-timeout
EMAIL_TIMEOUT = 5 EMAIL_TIMEOUT = 5

View File

@ -146,7 +146,8 @@ DEFAULT_FROM_EMAIL = env(
SERVER_EMAIL = env("DJANGO_SERVER_EMAIL", default=DEFAULT_FROM_EMAIL) SERVER_EMAIL = env("DJANGO_SERVER_EMAIL", default=DEFAULT_FROM_EMAIL)
# https://docs.djangoproject.com/en/dev/ref/settings/#email-subject-prefix # https://docs.djangoproject.com/en/dev/ref/settings/#email-subject-prefix
EMAIL_SUBJECT_PREFIX = env( EMAIL_SUBJECT_PREFIX = env(
"DJANGO_EMAIL_SUBJECT_PREFIX", default="[{{cookiecutter.project_name}}]" "DJANGO_EMAIL_SUBJECT_PREFIX",
default="[{{cookiecutter.project_name}}]",
) )
# ADMIN # ADMIN

View File

@ -29,14 +29,14 @@ function pathsConfig(appName) {
const vendorsRoot = 'node_modules' const vendorsRoot = 'node_modules'
return { return {
{% if cookiecutter.custom_bootstrap_compilation == 'y' %} {%- if cookiecutter.custom_bootstrap_compilation == 'y' %}
bootstrapSass: `${vendorsRoot}/bootstrap/scss`, bootstrapSass: `${vendorsRoot}/bootstrap/scss`,
vendorsJs: [ vendorsJs: [
`${vendorsRoot}/jquery/dist/jquery.slim.js`, `${vendorsRoot}/jquery/dist/jquery.slim.js`,
`${vendorsRoot}/popper.js/dist/umd/popper.js`, `${vendorsRoot}/popper.js/dist/umd/popper.js`,
`${vendorsRoot}/bootstrap/dist/js/bootstrap.js`, `${vendorsRoot}/bootstrap/dist/js/bootstrap.js`,
], ],
{% endif %} {%- endif %}
app: this.app, app: this.app,
templates: `${this.app}/templates`, templates: `${this.app}/templates`,
css: `${this.app}/static/css`, css: `${this.app}/static/css`,
@ -67,9 +67,9 @@ function styles() {
return src(`${paths.sass}/project.scss`) return src(`${paths.sass}/project.scss`)
.pipe(sass({ .pipe(sass({
includePaths: [ includePaths: [
{% if cookiecutter.custom_bootstrap_compilation == 'y' %} {%- if cookiecutter.custom_bootstrap_compilation == 'y' %}
paths.bootstrapSass, paths.bootstrapSass,
{% endif %} {%- endif %}
paths.sass paths.sass
] ]
}).on('error', sass.logError)) }).on('error', sass.logError))
@ -90,7 +90,7 @@ function scripts() {
.pipe(dest(paths.js)) .pipe(dest(paths.js))
} }
{% if cookiecutter.custom_bootstrap_compilation == 'y' %} {%- if cookiecutter.custom_bootstrap_compilation == 'y' %}
// Vendor Javascript minification // Vendor Javascript minification
function vendorScripts() { function vendorScripts() {
return src(paths.vendorsJs) return src(paths.vendorsJs)
@ -101,7 +101,7 @@ function vendorScripts() {
.pipe(rename({ suffix: '.min' })) .pipe(rename({ suffix: '.min' }))
.pipe(dest(paths.js)) .pipe(dest(paths.js))
} }
{% endif %} {%- endif %}
// Image compression // Image compression
function imgCompression() { function imgCompression() {
@ -110,7 +110,7 @@ function imgCompression() {
.pipe(dest(paths.images)) .pipe(dest(paths.images))
} }
{% if cookiecutter.use_async == 'y' -%} {%- if cookiecutter.use_async == 'y' -%}
// Run django server // Run django server
function asyncRunServer() { function asyncRunServer() {
var cmd = spawn('gunicorn', [ var cmd = spawn('gunicorn', [
@ -143,7 +143,7 @@ function initBrowserSync() {
// https://www.browsersync.io/docs/options/#option-proxy // https://www.browsersync.io/docs/options/#option-proxy
{%- if cookiecutter.use_docker == 'n' %} {%- if cookiecutter.use_docker == 'n' %}
proxy: 'localhost:8000' proxy: 'localhost:8000'
{% else %} {%- else %}
proxy: { proxy: {
target: 'django:8000', target: 'django:8000',
proxyReq: [ proxyReq: [
@ -172,7 +172,7 @@ function watchPaths() {
const generateAssets = parallel( const generateAssets = parallel(
styles, styles,
scripts, scripts,
{% if cookiecutter.custom_bootstrap_compilation == 'y' %}vendorScripts,{% endif %} {%- if cookiecutter.custom_bootstrap_compilation == 'y' %}vendorScripts,{% endif %}
imgCompression imgCompression
) )

View File

@ -52,7 +52,6 @@ services:
ports: ports:
- "7000:7000" - "7000:7000"
command: /start-docs command: /start-docs
{%- if cookiecutter.use_mailhog == 'y' %} {%- if cookiecutter.use_mailhog == 'y' %}
mailhog: mailhog:
@ -75,7 +74,7 @@ services:
depends_on: depends_on:
- redis - redis
- postgres - postgres
{% if cookiecutter.use_mailhog == 'y' -%} {%- if cookiecutter.use_mailhog == 'y' %}
- mailhog - mailhog
{%- endif %} {%- endif %}
ports: [] ports: []
@ -88,7 +87,7 @@ services:
depends_on: depends_on:
- redis - redis
- postgres - postgres
{% if cookiecutter.use_mailhog == 'y' -%} {%- if cookiecutter.use_mailhog == 'y' %}
- mailhog - mailhog
{%- endif %} {%- endif %}
ports: [] ports: []

View File

@ -64,10 +64,9 @@ services:
<<: *django <<: *django
image: {{ cookiecutter.project_slug }}_production_flower image: {{ cookiecutter.project_slug }}_production_flower
command: /start-flower command: /start-flower
{%- endif %} {%- endif %}
{%- if cookiecutter.cloud_provider == 'AWS' %}
{% if cookiecutter.cloud_provider == 'AWS' %}
awscli: awscli:
build: build:
context: . context: .

View File

@ -33,9 +33,8 @@ if [ -z "$VIRTUAL_ENV" ]; then
echo >&2 -e "\n" echo >&2 -e "\n"
exit 1; exit 1;
else else
pip install -r $PROJECT_DIR/requirements/local.txt pip install -r $PROJECT_DIR/requirements/local.txt
{% if cookiecutter.use_heroku == "y" -%} {%- if cookiecutter.use_heroku == "y" -%}
pip install -r $PROJECT_DIR/requirements.txt pip install -r $PROJECT_DIR/requirements.txt
{%- endif %} {%- endif %}
fi fi

View File

@ -6,4 +6,5 @@
<h1>Forbidden (403)</h1> <h1>Forbidden (403)</h1>
<p>{% if exception %}{{ exception }}{% else %}You're not allowed to access this page.{% endif %}</p> <p>{% if exception %}{{ exception }}{% else %}You're not allowed to access this page.{% endif %}</p>
{% endblock content %}{% endraw %} {% endblock content %}
{%- endraw %}

View File

@ -6,4 +6,5 @@
<h1>Page not found</h1> <h1>Page not found</h1>
<p>{% if exception %}{{ exception }}{% else %}This is not the page you were looking for.{% endif %}</p> <p>{% if exception %}{{ exception }}{% else %}This is not the page you were looking for.{% endif %}</p>
{% endblock content %}{% endraw %} {% endblock content %}
{%- endraw %}

View File

@ -9,5 +9,4 @@
<p>We track these errors automatically, but if the problem persists feel free to contact us. In the meantime, try refreshing.</p> <p>We track these errors automatically, but if the problem persists feel free to contact us. In the meantime, try refreshing.</p>
{% endblock content %} {% endblock content %}
{%- endraw %}
{% endraw %}

View File

@ -9,4 +9,4 @@
<p>{% trans "This account is inactive." %}</p> <p>{% trans "This account is inactive." %}</p>
{% endblock %} {% endblock %}
{% endraw %} {%- endraw %}

View File

@ -8,4 +8,4 @@
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% endraw %} {%- endraw %}

View File

@ -77,4 +77,4 @@ window.addEventListener('DOMContentLoaded',function() {
$('.form-group').removeClass('row'); $('.form-group').removeClass('row');
</script> </script>
{% endblock %} {% endblock %}
{% endraw %} {%- endraw %}

View File

@ -29,4 +29,4 @@
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% endraw %} {%- endraw %}

View File

@ -45,4 +45,4 @@ for a {{ site_name }} account and sign in below:{% endblocktrans %}</p>
</form> </form>
{% endblock %} {% endblock %}
{% endraw %} {%- endraw %}

View File

@ -16,7 +16,5 @@
{% endif %} {% endif %}
<button class="btn btn-danger" type="submit">{% trans 'Sign Out' %}</button> <button class="btn btn-danger" type="submit">{% trans 'Sign Out' %}</button>
</form> </form>
{% endblock %} {% endblock %}
{% endraw %} {%- endraw %}

View File

@ -14,4 +14,4 @@
<button class="btn btn-primary" type="submit" name="action">{% trans "Change Password" %}</button> <button class="btn btn-primary" type="submit" name="action">{% trans "Change Password" %}</button>
</form> </form>
{% endblock %} {% endblock %}
{% endraw %} {%- endraw %}

View File

@ -23,4 +23,4 @@
<p>{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}</p> <p>{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}</p>
{% endblock %} {% endblock %}
{% endraw %} {%- endraw %}

View File

@ -7,11 +7,11 @@
{% block inner %} {% block inner %}
<h1>{% trans "Password Reset" %}</h1> <h1>{% trans "Password Reset" %}</h1>
{% if user.is_authenticated %} {% if user.is_authenticated %}
{% include "account/snippets/already_logged_in.html" %} {% include "account/snippets/already_logged_in.html" %}
{% endif %} {% endif %}
<p>{% blocktrans %}We have sent you an e-mail. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}</p> <p>{% blocktrans %}We have sent you an e-mail. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}</p>
{% endblock %} {% endblock %}
{% endraw %} {%- endraw %}

View File

@ -22,4 +22,4 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% endraw %} {%- endraw %}

View File

@ -7,4 +7,4 @@
<h1>{% trans "Change Password" %}</h1> <h1>{% trans "Change Password" %}</h1>
<p>{% trans 'Your password is now changed.' %}</p> <p>{% trans 'Your password is now changed.' %}</p>
{% endblock %} {% endblock %}
{% endraw %} {%- endraw %}

View File

@ -14,4 +14,4 @@
<input class="btn btn-primary" type="submit" name="action" value="{% trans 'Set Password' %}"/> <input class="btn btn-primary" type="submit" name="action" value="{% trans 'Set Password' %}"/>
</form> </form>
{% endblock %} {% endblock %}
{% endraw %} {%- endraw %}

View File

@ -20,4 +20,4 @@
</form> </form>
{% endblock %} {% endblock %}
{% endraw %} {%- endraw %}

View File

@ -9,4 +9,4 @@
<p>{% trans "We are sorry, but the sign up is currently closed." %}</p> <p>{% trans "We are sorry, but the sign up is currently closed." %}</p>
{% endblock %} {% endblock %}
{% endraw %} {%- endraw %}

View File

@ -10,4 +10,4 @@
<p>{% blocktrans %}We have sent an e-mail to you for verification. Follow the link provided to finalize the signup process. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}</p> <p>{% blocktrans %}We have sent an e-mail to you for verification. Follow the link provided to finalize the signup process. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}</p>
{% endblock %} {% endblock %}
{% endraw %} {%- endraw %}

View File

@ -18,7 +18,5 @@ verification. Please click on the link inside this e-mail. Please
contact us if you do not receive it within a few minutes.{% endblocktrans %}</p> contact us if you do not receive it within a few minutes.{% endblocktrans %}</p>
<p>{% blocktrans %}<strong>Note:</strong> you can still <a href="{{ email_url }}">change your e-mail address</a>.{% endblocktrans %}</p> <p>{% blocktrans %}<strong>Note:</strong> you can still <a href="{{ email_url }}">change your e-mail address</a>.{% endblocktrans %}</p>
{% endblock %} {% endblock %}
{% endraw %} {%- endraw %}

View File

@ -16,43 +16,43 @@
<link rel="icon" href="{% static 'images/favicons/favicon.ico' %}"> <link rel="icon" href="{% static 'images/favicons/favicon.ico' %}">
{% block css %} {% block css %}
{% endraw %}{% if cookiecutter.custom_bootstrap_compilation == "n" %}{% raw %} {%- endraw %}{% if cookiecutter.custom_bootstrap_compilation == "n" %}{% raw %}
<!-- Latest compiled and minified Bootstrap CSS --> <!-- Latest compiled and minified Bootstrap CSS -->
<link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous"> <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
{% endraw %}{% endif %}{% raw %} {%- endraw %}{% endif %}{% raw %}
<!-- Your stuff: Third-party CSS libraries go here --> <!-- Your stuff: Third-party CSS libraries go here -->
{% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress css %}{% endraw %}{% endif %}{% raw %} {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress css %}{% endraw %}{% endif %}{% raw %}
<!-- This file stores project-specific CSS --> <!-- This file stores project-specific CSS -->
{% endraw %}{% if cookiecutter.js_task_runner == "Gulp" and cookiecutter.use_compressor == "n" %}{% raw %} {%- endraw %}{% if cookiecutter.js_task_runner == "Gulp" and cookiecutter.use_compressor == "n" %}{% raw %}
<link href="{% static 'css/project.min.css' %}" rel="stylesheet"> <link href="{% static 'css/project.min.css' %}" rel="stylesheet">
{% endraw %}{% else %}{% raw %} {%- endraw %}{% else %}{% raw %}
<link href="{% static 'css/project.css' %}" rel="stylesheet"> <link href="{% static 'css/project.css' %}" rel="stylesheet">
{% endraw %}{% endif %}{% raw %} {%- endraw %}{% endif %}{% raw %}
{% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %} {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
{% endblock %} {% endblock %}
<!-- Le javascript <!-- Le javascript
================================================== --> ================================================== -->
{# Placed at the top of the document so pages load faster with defer #} {# Placed at the top of the document so pages load faster with defer #}
{% block javascript %} {% block javascript %}
{% endraw %}{% if cookiecutter.custom_bootstrap_compilation == "y" and cookiecutter.js_task_runner == "Gulp" %}{% raw %} {%- endraw %}{% if cookiecutter.custom_bootstrap_compilation == "y" and cookiecutter.js_task_runner == "Gulp" %}{% raw %}
<!-- Vendor dependencies bundled as one file--> <!-- Vendor dependencies bundled as one file-->
{% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress js %}{% endraw %}{% endif %}{% raw %} {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress js %}{% endraw %}{% endif %}{% raw %}
<script defer src="{% static 'js/vendors.js' %}"></script> <script defer src="{% static 'js/vendors.js' %}"></script>
{% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %} {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
{% endraw %}{% else %}{% raw %} {%- endraw %}{% else %}{% raw %}
<!-- Bootstrap JS and its dependencies--> <!-- Bootstrap JS and its dependencies-->
<script defer src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script> <script defer src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script> <script defer src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
<script defer src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script> <script defer src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
<!-- Your stuff: Third-party javascript libraries go here --> <!-- Your stuff: Third-party javascript libraries go here -->
{% endraw %}{% endif %}{% raw %} {%- endraw %}{% endif %}{% raw %}
<!-- place project specific Javascript in this file --> <!-- place project specific Javascript in this file -->
{% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress js %}{% endraw %}{% endif %}{% raw %} {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress js %}{% endraw %}{% endif %}{% raw %}
<script defer src="{% static 'js/project.js' %}"></script> <script defer src="{% static 'js/project.js' %}"></script>
{% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %} {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
{% endblock javascript %} {% endblock javascript %}
@ -121,4 +121,4 @@
{% endblock inline_javascript %} {% endblock inline_javascript %}
</body> </body>
</html> </html>
{% endraw %} {%- endraw %}

View File

@ -1 +1 @@
{% raw %}{% extends "base.html" %}{% endraw %} {% raw %}{% extends "base.html" %}{% endraw %}

View File

@ -1 +1 @@
{% raw %}{% extends "base.html" %}{% endraw %} {% raw %}{% extends "base.html" %}{% endraw %}

View File

@ -30,7 +30,6 @@
<!-- End Action buttons --> <!-- End Action buttons -->
{% endif %} {% endif %}
</div> </div>
{% endblock content %} {% endblock content %}
{% endraw %} {%- endraw %}

View File

@ -14,4 +14,5 @@
</div> </div>
</div> </div>
</form> </form>
{% endblock %}{% endraw %} {% endblock %}
{%- endraw %}