cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2025-08-08 05:54:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pydanny/cookiecutter-django into f-string

Browse Source
This commit is contained in:
Wan Liuyang 2018-02-28 14:23:18 +08:00
commit f4001e37c6
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
{{cookiecutter.project_slug}}/requirements/base.txt
View File

@ -36,7 +36,7 @@ django-allauth==0.35.0
# from http://www.lfd.uci.edu/~gohlke/pythonlibs/#psycopg # from http://www.lfd.uci.edu/~gohlke/pythonlibs/#psycopg
{% else %} {% else %}
# Python-PostgreSQL Database Adapter # Python-PostgreSQL Database Adapter
psycopg2==2.7.4 psycopg2==2.7.4 --no-binary psycopg2
{%- endif %} {%- endif %}
# Unicode slugification # Unicode slugification

2
{{cookiecutter.project_slug}}/requirements/local.txt
View File

@ -4,7 +4,7 @@
coverage==4.5.1 coverage==4.5.1
django-coverage-plugin==1.5.0 django-coverage-plugin==1.5.0
Sphinx==1.7.0 Sphinx==1.7.1
django-extensions==2.0.0 django-extensions==2.0.0
Werkzeug==0.14.1 Werkzeug==0.14.1
django-test-plus==1.0.22 django-test-plus==1.0.22

4
{{cookiecutter.project_slug}}/requirements/production.txt
View File

@ -6,7 +6,7 @@
# Python-PostgreSQL Database Adapter # Python-PostgreSQL Database Adapter
# Assuming Windows is used locally, and *nix -- in production. # Assuming Windows is used locally, and *nix -- in production.
# ------------------------------------------------------------ # ------------------------------------------------------------
psycopg2==2.7.4 psycopg2==2.7.4 --no-binary psycopg2
{%- endif %} {%- endif %}
# WSGI Handler # WSGI Handler
@ -16,7 +16,7 @@ gunicorn==19.7.1
# Static and Media Storage # Static and Media Storage
# ------------------------------------------------ # ------------------------------------------------
boto3==1.5.33 boto3==1.5.36
django-storages==1.6.5 django-storages==1.6.5
{% if cookiecutter.use_whitenoise != 'y' -%} {% if cookiecutter.use_whitenoise != 'y' -%}
Collectfast==0.6.0 Collectfast==0.6.0

2
{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
View File

@ -22,7 +22,7 @@
<!-- 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" %}{% 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">

2
{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
View File

@ -1,11 +1,9 @@
from django.contrib.auth.models import AbstractUser from django.contrib.auth.models import AbstractUser
from django.db import models from django.db import models
from django.urls import reverse from django.urls import reverse
from django.utils.encoding import python_2_unicode_compatible
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
@python_2_unicode_compatible
class User(AbstractUser): class User(AbstractUser):
# First Name and Last Name do not cover name patterns # First Name and Last Name do not cover name patterns