cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-22 17:47:08 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,763 Commits 13 Branches 581 Tags 25 MiB
1c5c4e52c0
Commit Graph

900 Commits

Author SHA1 Message Date
Nikita Shupeyko
275c13292c
Integrate Flower with Docker Compose setup (#1655) 
* Integrate Flower with Docker Compose setup locally

* Remove alien worker celeryd option

* Move Flower COPY section below the worker's

* Remove set -o pipefail command from Flower start script

* Flower client authentication

* Override flower service image name

* Move flower service to the end of local.yml

* Install flower==0.9.2 in all environments

* Introduce production flower service

* Fix local flower start script

* Document Flower integration

* Prettify *.django envs

Rationale: consistency.

* Reference local environment Flower docs from the production's

* 'two more services' -> 'three more services'
 2018-06-27 19:33:21 +03:00
Bruno Alla
a183a8181d
Merge pull request #1694 from delneg/patch-2 
Make 'duplicate_username' message translatable
 2018-06-26 10:20:27 +02:00
pyup.io bot
eb0297aeb3 Update django-environ from 0.4.4 to 0.4.5 (#1695) 2018-06-26 10:53:36 +03:00
Denis
2a7ab8be2f
Try to fix flake8 2018-06-25 21:08:33 +03:00
Denis
0d1cfe548c
Make 'duplicate_username' message translatable 
Added ugettext_lazy and used it on the 'duplicate_username' message
 2018-06-24 02:34:08 +03:00
pyup.io bot
ee2bb3f2ef Update pytest-django to 3.3.2 (#1692) 
This PR updates [pytest-django](https://pypi.org/project/pytest-django) from **3.3.0** to **3.3.2**.



<details>
  <summary>Changelog</summary>
  
  
   ### 3.3.1
   ```
   ------------------

Bug fixes
^^^^^^^^^

* Fixed test for classmethod with Django TestCases again (618,
  introduced in 598 (3.3.0)).

Compatibility
^^^^^^^^^^^^^

* Support Django 2.1 (no changes necessary) (614).
   ```
   
  
</details>


 

<details>
  <summary>Links</summary>
  
  - PyPI: https://pypi.org/project/pytest-django
  - Changelog: https://pyup.io/changelogs/pytest-django/
  - Docs: https://pytest-django.readthedocs.io/
</details>
 2018-06-22 08:50:02 +08:00
Denis Orehovsky
83b5f00ac5 Add celery prefix for configuration (#1676) 
* Add celery prefix for configuration

* Update CONTRIBUTORS.rst
 2018-06-21 19:39:19 +00:00
Nikita Shupeyko
07060eaecc
Extend & enhance Celery configuration (#1679) 
* CELERY_TASK_TIME_LIMIT

* CELERY_TASK_SOFT_TIME_LIMIT

* CELERY_ALWAYS_EAGER -> CELERY_TASK_ALWAYS_EAGER

* CELERY_EAGER_PROPAGATES = CELERY_TASK_ALWAYS_EAGER

Addresses https://github.com/pydanny/cookiecutter-django/pull/1446/files#r167238808

* CELERY_RESULT_BACKEND = CELERY_BROKER_URL always

* CELERY_TIMEZONE = TIME_ZONE

* CELERY_TASK_EAGER_PROPAGATES = True

* Name task limit settings appropriately

CELERY_TASK_TIME_LIMIT -> CELERYD_TASK_TIME_LIMIT, CELERY_TASK_SOFT_TIME_LIMIT -> CELERYD_TASK_SOFT_TIME_LIMIT
 2018-06-21 19:38:48 +00:00
Wan Liuyang
5309fbf5e7
Upgrade celery to 4.2 (#1446) 
* Update celery to 4.1.0

* Re-add endif closing block

* Update local.py

* Update base.txt

* Update local.py
 2018-06-21 14:53:04 +08:00
pyup.io bot
75a0699848 Update pytest to 3.6.2 (#1690) 
This PR updates [pytest](https://pypi.org/project/pytest) from **3.6.1** to **3.6.2**.



*The bot wasn't able to find a changelog for this release. [Got an idea?](https://github.com/pyupio/changelogs/issues/new)*

<details>
  <summary>Links</summary>
  
  - PyPI: https://pypi.org/project/pytest
  - Changelog: https://pyup.io/changelogs/pytest/
  - Repo: https://github.com/pytest-dev/pytest/issues
  - Homepage: http://pytest.org
</details>
 2018-06-21 11:00:47 +08:00
pyup.io bot
f3d76a4134 Update celery from 3.1.25 to 3.1.26.post2 (#1683) 2018-06-19 01:07:14 +03:00
pyup-bot
24a7e535c6 Update psycopg2-binary from 2.7.4 to 2.7.5 2018-06-17 12:36:30 -07:00
Bruno Alla
c6c8ca953a Remove entry from other .gitignore causing compose/local to match 2018-06-16 15:07:40 +01:00
Bruno Alla
16c4e31d0e
Merge pull request #1684 from pydanny/pyup-update-django-test-plus-1.0.22-to-1.1.0 
Update django-test-plus to 1.1.0
 2018-06-15 22:44:30 +01:00
pyup-bot
cec06b2d81 Update pytest-django from 3.2.1 to 3.3.0 2018-06-15 14:20:32 -07:00
pyup-bot
a9db5b0982 Update django-test-plus from 1.0.22 to 1.1.0 2018-06-15 14:20:28 -07:00
Nikita P. Shupeyko
7d7eb78773 Remove duplicate Docker Compose service configuration 
Rationale: those sections will always be there thanks to inheritance
 2018-06-09 14:59:30 +03:00
Nikita P. Shupeyko
911e822e85 Gitignore .pytest_cache/ in project template 2018-06-06 09:40:24 +03:00
pyup.io bot
0ff3236ce4 Update pytest to 3.6.1 (#1675) 
* Update pytest from 3.6.0 to 3.6.1

* Update pytest from 3.6.0 to 3.6.1
 2018-06-06 09:38:28 +03:00
Nikita P. Shupeyko
d8526d1b2d Unset -o xtrace in compose start scripts 2018-06-05 12:28:11 +03:00
Nikita P. Shupeyko
c812e01fc5 Rename UsersConfig to UsersAppConfig 2018-06-05 12:18:35 +03:00
Nikita P. Shupeyko
95d218e3e4 Rename CeleryConfig to CeleryAppConfig 2018-06-05 12:18:07 +03:00
Nikita P. Shupeyko
5b5ad0e4fc Fix Py.Test unittests fail on new cookie 
Fixes #1674
 2018-06-05 12:13:50 +03:00
pyup-bot
77f87c4532 Update django from 2.0.5 to 2.0.6 2018-06-01 15:16:03 -07:00
pyup.io bot
cff7111edb Update django-anymail from 2.2 to 3.0 (#1668) 2018-05-31 16:14:37 +03:00
pyup.io bot
eea6cc94de Update raven to 6.9.0 (#1667) 
This PR updates [raven](https://pypi.org/project/raven) from **6.8.0** to **6.9.0**.



<details>
  <summary>Changelog</summary>
  
  
   ### 6.9.0
   ```
   ------------------
* [Core] Switched from culprit to transaction for automatic transaction reporting.
* [CI] Removed py3.3 from build
* [Django] resolved an issue where the log integration would override the user.
   ```
   
  
</details>


 

<details>
  <summary>Links</summary>
  
  - PyPI: https://pypi.org/project/raven
  - Changelog: https://pyup.io/changelogs/raven/
  - Repo: https://github.com/getsentry/raven-python
</details>
 2018-05-31 12:55:38 +08:00
pyup-bot
a4240bcf08 Update sphinx from 1.7.4 to 1.7.5 2018-05-28 21:18:55 -07:00
Nikita P. Shupeyko
b8c7ae8b4b Remove set -o pipefail command from celerybeat start script 2018-05-28 12:50:57 +03:00
Nikita P. Shupeyko
e08b6ab6f8 Remove set -o pipefail command from celeryworker start script 2018-05-28 12:50:54 +03:00
Nikita Shupeyko
fe3f45ba7d
Rename DJANGO_SENTRY_DSN env to SENTRY_DSN (#1663) 
Rationale: so that Heroku auto-provisioned Sentry addon, with its SENTRY_DSN config var is being connected to out-of-box
 2018-05-27 22:36:13 +03:00
Nikita P. Shupeyko
77f61de236 chown django /start-(celerybeat|celeryworker) in production Django 2018-05-25 12:55:27 +03:00
Nikita P. Shupeyko
ea9a781cc8 Install Mailgun's (and potentially, other ESPs') dependencies with Anymail 
Rationale: this is a [generic way](https://github.com/anymail/django-anymail#anymail-1-2-3) of handling Anymail ESP dependencies
 2018-05-25 12:08:57 +03:00
pyup.io bot
39d897169c Update pytest to 3.6.0 (#1662) 
* Update pytest from 3.5.1 to 3.6.0

* Update pytest from 3.5.1 to 3.6.0
 2018-05-25 10:31:33 +03:00
Michel Sassano
c3b9f72f31 Remove openssl to fix unsatisfiable constraints error with libressl (#1661) 
Removed the openssl-dev package from the Django Dockerfiles (local and production) to fix the unsatisfiable constraints error.

The error appears because you can't have openssl and libressl installed at the same time. One of the package used by the template/project installs libressl which create an error when trying to install openssl.

Thx to @browniebroke
 2018-05-25 14:21:22 +08:00
Nikita P. Shupeyko
39c825a262 Fix latest Caddy version 2018-05-21 22:36:50 +03:00
Nikita P. Shupeyko
6cefe2b9dc Rename gunicorn script to start 2018-05-21 22:28:18 +03:00
Nikita P. Shupeyko
b069f8e40e Fix E303 in production.py 2018-05-21 21:57:52 +03:00
Nikita P. Shupeyko
600be33b85 Fix E402 in production.py 2018-05-21 21:57:31 +03:00
Nikita P. Shupeyko
5b6c8a89d3 Fix flake8 errors in wsgi.py 2018-05-21 21:36:03 +03:00
Nikita P. Shupeyko
8e429d7e3d Update PyCharm configs with respect to the latest IDE version 2018-05-21 16:29:18 +03:00
Nikita P. Shupeyko
4a1ea2fb45 Commit local django start scripts back 2018-05-21 15:39:12 +03:00
Nikita P. Shupeyko
cfff5b9d08 Commit local django celery start scripts back 2018-05-21 15:34:28 +03:00
Nikita P. Shupeyko
849f64e1a5 Remove .sh ext from executable scripts 2018-05-21 15:20:11 +03:00
Nikita P. Shupeyko
90953a83f2 Alter django entrypoint.sh output 2018-05-21 15:03:37 +03:00
Nikita P. Shupeyko
9b938647b4 Refactor exec "$@" in django entrypoint.sh 2018-05-21 14:59:26 +03:00
Nikita Shupeyko
820e3540da
Upgrade Caddy to 0.11 and pin its version to minor rather than patch (#1653) 2018-05-21 12:44:38 +03:00
Nguyễn Hồng Quân
39378e3b32 Replace awesome-slugify with python-slugify 
The former drags us from getting update with new libraries (e.g
Unidecode).
 2018-05-14 19:01:16 +07:00
Nikita P. Shupeyko
c3baadd8c7 Set DEBUG=True unconditionally in local config 2018-05-14 10:21:33 +03:00
Nikita P. Shupeyko
091a3b6d0f gunicorn --bind instead of gunicorn -b 2018-05-14 10:20:27 +03:00
Nikita P. Shupeyko
4bcd4c3343 Don't migrate during Heroku release phase 
Closes #1646.
 2018-05-14 10:15:51 +03:00
saschalalala
6d4be405d8 Migrate to Django2 path urls (#1637) 
* Change users urls to Django 2 paths

* Change config urls to Django 2 paths

* Change admin url setting to Django 2 path syntax

* Replace more admin urls

* Add myself to contributors.rst
 2018-05-14 10:09:24 +03:00
Nikita P. Shupeyko
fd15b20a08 Use string interpolation in production STATIC_URL 2018-05-13 17:03:04 +03:00
Nikita P. Shupeyko
be1024cd06 Drop Grunt support 
Closes #1636.
 2018-05-13 13:51:01 +03:00
pyup.io bot
dbdedb81c1 Update raven from 6.7.0 to 6.8.0 (#1642) 2018-05-12 22:57:24 +03:00
pyup.io bot
144f4ca3b7 Update django-model-utils from 3.1.1 to 3.1.2 (#1640) 2018-05-10 23:16:42 +02:00
Nikita P. Shupeyko
661fc3e449 Fix E402 2018-05-09 13:42:20 +03:00
Nikita P. Shupeyko
a07327459c Fix logging module imported unconditionally in production.py 2018-05-09 13:24:08 +03:00
Nikita P. Shupeyko
df1ce737d5 Replace os.environ.get with env call in local.py 2018-05-09 13:15:41 +03:00
Nikita P. Shupeyko
17739ff263 Refactor POSTGRES_PORT env 2018-05-09 12:58:37 +03:00
Nikita P. Shupeyko
906299ae39 Refactor POSTGRES_HOST env 2018-05-09 12:58:33 +03:00
pyup.io bot
b4b3c04253 Update django-allauth from 0.35.0 to 0.36.0 (#1638) 2018-05-08 15:28:52 +08:00
Nikita P. Shupeyko
00ff5c8506
Fix a typo in production.py 2018-05-07 20:33:34 +03:00
Nikita P. Shupeyko
35b2aac87a
Use relative -r path in production.txt 2018-05-07 20:30:14 +03:00
Nikita P. Shupeyko
74c838dc0c Link favicon from base.html 2018-05-05 22:25:07 +03:00
pyup.io bot
0d2f8fcfd9 Update factory-boy from 2.11.0 to 2.11.1 (#1635) 2018-05-05 22:18:56 +03:00
Nikita P. Shupeyko
5a3dd8f0c6 Uninstall gevent 
Closes #1555.
 2018-05-05 15:03:01 +03:00
Nikita P. Shupeyko
2eac9648a1 Install boto3 as extra of django-storages 
Closes #1586.
 2018-05-05 15:01:03 +03:00
Nikita P. Shupeyko
9f14254e8e Move pytest settings from setup.cfg to pytest.ini 2018-05-05 12:45:49 +03:00
Nikita P. Shupeyko
d8267edd09 Run black reformatting 
https://github.com/ambv/black
 2018-05-05 12:37:10 +03:00
Nikita P. Shupeyko
8ef1019e01 Use implicit path to manage.py in Procfile 2018-05-05 12:30:20 +03:00
Marlon
ec78d9ce97 Use Heroku's Release Phase for Migrations (#1615) 
Automatically run migrations on deployments to Heroku. Advantages include deployments are rolled-back if a migration fails, preventing broken applications due to failed migrations, no time between when application is released and database is migrated, and removes risk of forgetting to manually run migrations.
 2018-05-05 12:28:30 +03:00
Nikita Shupeyko
b4d0416530
Fix PostgreSQL backup restore (#1628) 
* Export PG* envs when backing up postgres

* Export PG* envs when restoring postgres from backup

* Prevent postgres connection from dropping all at ones

* Alter postgres backups docs  

Include another crucial prerequisite.

* "feel free switching" -> "feel free to switch"

* Address the feedback
 2018-05-05 12:27:27 +03:00
pyup.io bot
8203cfe4fc Update factory-boy to 2.11.0 (#1632) 2018-05-05 09:06:41 +08:00
Nikita Shupeyko
4944907fb5
Upgrade redis service to 3.2 (#1631) 2018-05-05 01:30:57 +03:00
Nikita P. Shupeyko
b7172cfeba Conditionally gitignore virtualenv files 
Fixes #1321 the right way.
 2018-05-05 01:29:47 +03:00
Bruno Alla
f22f8e3716
Merge pull request #1610 from AlekseiAQ/update-runtime-python-version-3.6.4-to-3.6.5 
Update runtime python version from 3.6.4 to 3.6.5
 2018-05-02 22:24:52 +01:00
pyup-bot
b8a709b191 Update django from 2.0.4 to 2.0.5 2018-05-02 01:08:03 -07:00
pyup.io bot
cf03bf74e7 Update gunicorn from 19.8.0 to 19.8.1 (#1627) 2018-04-30 22:16:09 +03:00
pyup.io bot
3e6caf6692 Update gunicorn from 19.7.1 to 19.8.0 (#1624) 2018-04-29 21:48:53 +03:00
pyup.io bot
34d9bd5d80 Update sphinx to 1.7.4 (#1620) 2018-04-26 09:06:35 +08:00
pyup-bot
f8e3221622 Update pytest from 3.5.0 to 3.5.1 2018-04-25 03:24:51 -07:00
pyup-bot
47cc9f03fe Update sphinx from 1.7.2 to 1.7.3 2018-04-22 21:36:42 -05:00
pyup.io bot
edae0854bf Update raven from 6.6.0 to 6.7.0 (#1614) 2018-04-18 22:56:29 +08:00
pyup.io bot
bbc69b3bf1 Update django-extensions to 2.0.7 (#1613) 2018-04-18 16:30:35 +08:00
pyup.io bot
cbc51bfc5f Update django-anymail to 2.2 (#1612) 2018-04-17 10:02:06 +08:00
Aleksei Kuznetcov
6a0a2e5637 Update runtime python version from 3.6.4 to 3.6.5 2018-04-15 17:14:11 -04:00
pyup.io bot
56b3ac7311 Update pytest-django from 3.1.2 to 3.2.1 (#1608) 2018-04-14 23:27:58 +08:00
pyup.io bot
1c5f1bb62b Update django-anymail from 2.0 to 2.1 (#1607) 2018-04-12 08:32:02 +08:00
pyup.io bot
b6c80ab333 Update pytz from 2018.3 to 2018.4 (#1605) 2018-04-10 20:34:01 +00:00
Bruno Alla
8fa24e9c5e
Merge pull request #1599 from pydanny/pyup-update-djangorestframework-3.7.7-to-3.8.2 
Update djangorestframework to 3.8.2
 2018-04-10 15:52:51 +01:00
Osaetin Daniel
a4f059196e Removed unnecessary sentry configuration (#1598) 2018-04-10 10:39:44 +08:00
Daniel Roy Greenfeld
3f753e0411
First pass at running black across the project (#1602) 2018-04-08 17:03:29 -05:00
pyup-bot
dffacdc2ed Update djangorestframework from 3.7.7 to 3.8.2 2018-04-06 11:40:11 -05:00
Nikita P. Shupeyko
26ccf9307f Fix REDIS_URL missing 
Fixes #1570.
 2018-04-04 13:42:01 +03:00
Nikita P. Shupeyko
ae9dc2e782 Distinguish between local and production compose services 
Rationale: 
1. building production stack on the same machine with local doesn't lead to conflicts anymore;
2. production and local service images are now clearly distinguished by name.
 2018-04-04 13:38:57 +03:00
Nikita P. Shupeyko
2fa5adc2b0 Designate 'postgres' as a variable in entrypoint.sh 
Rationale: clarity.
 2018-04-04 11:43:39 +03:00
Nikita P. Shupeyko
897d54b690 Alter Dockerfile comment url to point at dev Django 2018-04-04 11:16:11 +03:00
Nikita P. Shupeyko
34673ff686 Merge .celery envs file with .django 
Rationale: workflow simplification.
 2018-04-04 10:52:16 +03:00
Nikita P. Shupeyko
418b53bf77 Rename use_sentry_for_error_reporting to use_sentry 
Rationale: consistency
 2018-04-03 12:12:26 +03:00
pyup.io bot
53186d2697 Update django from 2.0.3 to 2.0.4 (#1593) 2018-04-03 10:46:34 +03:00
pyup.io bot
3c3d5914d2 Update pillow to 5.1.0 (#1592) 2018-04-03 09:50:34 +08:00
Nikita P. Shupeyko
bf089fd2b6 Fix celery services exit with status code 2 
Fixes #1588.
 2018-03-28 18:18:26 +03:00
Nikita Shupeyko
59cd5b4849
Celery code blocks are still generated even though Celery is not opted out for (#1587) 
* Celery jinja condition in .gitignore

* Celery jinja conditions in Django Dockerfiles

* Re-phrase Django Dockerfile requirements comments

* Remove celery compose dirs through post_gen_project.py
 2018-03-27 18:40:44 +03:00
pyup.io bot
9c09675cb8 Update django-storages from 1.6.5 to 1.6.6 (#1585) 2018-03-27 11:43:29 +08:00
pyup.io bot
60ebda8bf7 Update sphinx from 1.7.1 to 1.7.2 (#1579) 2018-03-25 15:45:00 +03:00
pyup.io bot
3264e77696 Update pytest to 3.5.0 (#1580) 
* Update pytest from 3.4.2 to 3.5.0

* Update pytest from 3.4.2 to 3.5.0
 2018-03-25 15:30:58 +03:00
Wan Liuyang
d1198f63b1
Drop Opbeat (#1578) 2018-03-21 19:54:27 +08:00
pyup.io bot
f0175aa9be Update collectfast to 0.6.2 (#1575) 2018-03-17 22:29:44 +08:00
Daniel Roy Greenfeld
d6e0b95d81
Adding coreapi and moving DRF to end of base.txt 2018-03-17 06:58:16 -05:00
Bruno Alla
80618f0ace Install psycopg2-binary when not using docker locally (#1569) 
- The binary package should be installable on Windows locally
- The binary package is not recommended for Production, compile from
  source
 2018-03-16 16:32:43 -05:00
jose Gabriel Guzman Lopez
0601a1b858
Local 
add  "127.0.0.1"
 2018-03-16 11:35:39 -05:00
pyup-bot
f3d0c6baf0 Update django-extensions from 2.0.5 to 2.0.6 2018-03-15 16:28:44 -05:00
Nikita Shupeyko
bcd0a8c46e
Fix & improve PostgreSQL backup/restore scripts (#1571) 
* Fix & imporve postgres backup/restore scripts

* Update PostgreSQL backup/restore docs

* Fix postgres Dockerfile regression

* Extend error messages in PostgreSQL maintenance scipts
 2018-03-14 13:44:16 +03:00
Daniel Roy Greenfeld
b32fd78012
Update base.py 2018-03-13 22:21:01 -05:00
Daniel Roy Greenfeld
19501ef26b
Adding DRF 2018-03-13 22:17:46 -05:00
Daniel Roy Greenfeld
c06ce847b3
Added DRF 2018-03-13 22:13:36 -05:00
Nikita P. Shupeyko
edef0167fe Gitignore MailHog in template 2018-03-11 12:21:49 +03:00
pyup.io bot
09af25547b Update django-extensions from 2.0.3 to 2.0.5 (#1568) 2018-03-11 11:33:10 +03:00
pyup.io bot
05e97777e2 Update django-crispy-forms from 1.7.1 to 1.7.2 (#1567) 2018-03-09 19:21:40 +03:00
Nikita P. Shupeyko
3e2bf3f701 Prettify template's pytest.ini 2018-03-09 13:06:45 +03:00
Nikita Shupeyko
b2a6b9a511
Prettify generated project requirements (#1557) 
* Prettify base.txt

* Prettify local.txt

* Get rid of test.txt

Rationale: it effectively a duplicate of what's in local.txt

* Prettify production.txt
 2018-03-09 12:57:32 +03:00
Nikita P. Shupeyko
e1bce92ad9 apk add postgresql-client with django Dockerfile 2018-03-09 11:41:02 +03:00
pyup.io bot
f3dc7898e9 Update django-anymail from 1.4 to 2.0 (#1564) 2018-03-09 10:54:56 +03:00
Nikita P. Shupeyko
a72383a851 FIx WEB_CONCURRENCY environment variable missing 
Fixes #1562.
 2018-03-08 22:40:22 +03:00
Nikita P. Shupeyko
03ee6c78d6 Fix CELERY_BROKER_URL overriden in entrypoint.sh 
Closes #1235.
 2018-03-08 19:04:10 +03:00
Nikita P. Shupeyko
5543359382 Distinguish between POSTGRES_DB and POSTGRES_USER 
Closes #1301.
 2018-03-08 19:04:10 +03:00
pyup.io bot
dd0a73a985 Update django-extensions from 2.0.2 to 2.0.3 (#1561) 2018-03-08 19:03:18 +03:00
Nikita Shupeyko
3f8aa26d0f
Group environment variables by the corresponding directories (#1295) 
* Update generated project's .gitignore

* Post-gen gitignore .env/ and .env

* Fix linesep between gitignored entries

* Persist `.env/**/*` files into cookiecutter-django's VCS

* Rename .env/ to .envs/

* Reference the newly created .envs/**/.* files in local.yml

* Reference the newly created .envs/**/.* files in production.yml

* Delete .env.example

* Refactor post-gen-project.py

Closes #1299.

* Implement production-dotenv-files-to-dotenv-file merge script

* Create shared PyCharm Run Configuration for the automation script

* Randomize POSTGRES_PASSWORD in ./envs/(.local|.production)/.postgres

* Default POSTGRES_PASSWORD and POSTGRES_USER to random values

* Fix jinja linebreaks in local.yml

* Spaces in production.yml

* Fix post-merge leftovers & set DJANGO_ADMIN_URL automatically

* Prettify here and there

* Fix FileNotFoundError

* Leave a TODO in post_gen_hook.py

* Introduce keep_local_envs_in_vcs option

* Remove envs when not opted for

* Inline pre_gen_project.py if-condition

* Get rid of PROJECT_DIR_PATH in post_gen_project.py

* Clean up the docs

* Match copyright notices

* Document envs ins and outs
 2018-03-08 15:56:15 +03:00
Malik S
6c8538abfe Add all internal IPs for multiple docker networks (#1520) 
* Add all internal IPs for multiple docker networks

When developing with modified docker-compose.yml that contains multiple
network definitions, all networks gateways of the created container
should be added to INTERNAL_IPS, otherwise Django-Debug-Toolbar will not
work.

* Add @flyudvik to contributors
 2018-03-08 15:54:24 +03:00
pyup.io bot
0bd019deb0 Update django-extensions from 2.0.0 to 2.0.2 (#1556) 2018-03-07 17:15:15 +03:00
Wan Liuyang
9cb7e50b8e Convert old-styled string formatting to f-string (#1528) 
* Convert old-styled string formatting to f-string

* Update flake8 explicit version to 3.5.0

* Make tox.ini in sync with requirements.txt

* Fix annoying flake8 F405
 2018-03-06 19:56:27 +03:00
Nikita P. Shupeyko
ee04c5cf09 noqa F401 in users apps.py 2018-03-06 19:54:20 +03:00
Eric Groom
f67f37a463 update grunt-sass to latest version (#1544) 
* update grunt-sass

* add to contributors

* update gulp deps

* update grunt deps

* add convenience run script to grunt and gulp configurations
 2018-03-06 19:46:21 +03:00
pyup.io bot
218a79e16a Update django from 2.0.2 to 2.0.3 (#1551) 2018-03-06 19:44:43 +03:00
Daniel Roy Greenfeld
7bc5d1408c
Make registration of signals easier for users 2018-03-06 10:52:45 -05:00
Nikita Shupeyko
d2791b019a
Prettify and re-order settings entries (#1550) 
* Prettify and re-order settings entries

* Use old-style .format() for the time being

* Remove redundant linebreaks at the settings files' beginning

* Fix E303 too many blank lines

* Remove a redundant linebreak from requirements.txt

* Some linebreake juggling in config.settings.base
 2018-03-06 14:28:25 +03:00
Nikita P. Shupeyko
5380117181 Uninstall wheel 
Closes #1095.
 2018-03-06 14:27:13 +03:00
Bruno Alla
6ef30b1741 Merge branch 'master' into simplify-environment 
# Conflicts:
#	docs/deployment-on-heroku.rst
 2018-03-06 09:55:28 +00:00
pyup.io bot
93ad8e6125 Update django-crispy-forms from 1.7.0 to 1.7.1 (#1546) 2018-03-06 06:13:20 +00:00
Bruno Alla
82dcd2d30c Simplify Mailgun settings 
When creating a Mailgun add-on on Heroku, the app gets some environment
variables by default:

    MAILGUN_API_KEY
    MAILGUN_DOMAIN

However, the cookiecutter names do not match and requires a manual step
from the user deploying. It's used elsewhere but shouldn't harm the
other deployment methods to rename these variables.

While updating the docs I noticed a variable that appear unused
DJANGO_MAILGUN_SERVER_NAME so this removes it from the documentation.
 2018-03-05 17:56:45 +00:00
Bruno Alla
baf08b2f5f Document Gunicorn worker concurrency 2018-03-05 17:30:13 +00:00
Nikita P. Shupeyko
5261956356 Refactor gunicorn -w to be set from WEB_CONCURRENCY env 
Closes #1480.
 2018-03-05 14:26:43 +03:00
Nikita P. Shupeyko
64f2541743 Set ALLOWED_HOSTS in config.settings.local 2018-03-04 17:51:37 +03:00
Nikita P. Shupeyko
f4e217ed21 Simplify production databases section generation 2018-03-04 17:33:54 +03:00
Nikita P. Shupeyko
6c26d39f65 Unconditionally connect to database from DATABASE_URL env when opting for Docker 
Closes #1541.
 2018-03-04 17:24:06 +03:00
Nikita P. Shupeyko
281dde1d1d Simplify post hook 2018-03-04 14:43:54 +03:00
adammsteele
ed2204ecba Celery config - json serialization by default (#1535) 
* Use json serialization in celery by default

* Added myself to CONTRIBUTORS.rst
 2018-03-01 14:25:33 +03:00
Andy Woods
1afa2b4487 Update urls.py (#1537) 
Elsewise, named url 'detail' matches regex of 'update'
 2018-03-01 14:21:09 +03:00
pyup.io bot
fbdc3c930f Update raven from 6.5.0 to 6.6.0 (#1539) 2018-03-01 14:20:25 +03:00
pyup.io bot
3084d9d5c1 Update django-redis from 4.8.0 to 4.9.0 (#1540) 2018-03-01 14:20:08 +03:00
pyup.io bot
a429a050c9 Update boto3 to 1.6.2 (#1538) 
* Update boto3 from 1.6.1 to 1.6.2

* Update production.txt
 2018-03-01 11:59:59 +01:00
pyup.io bot
496869164f Update boto3 from 1.5.36 to 1.6.1 (#1536) 2018-02-28 12:42:47 +01:00
Daniel Roy Greenfeld
ff92210573
Remove python_2_unicode_compatible 
Python 3.6 or go home!
 2018-02-27 17:03:02 -05:00
Bruno Alla
56bd2ca9a1
Merge pull request #1533 from browniebroke/bug-500-compressor 
Link to unminified CSS if using django-compressor
 2018-02-27 18:50:22 +00:00
pyup.io bot
48a6bf56a6 Update boto3 from 1.5.33 to 1.5.36 (#1531) 2018-02-26 16:35:01 +03:00
pyup.io bot
18509cb85b Update sphinx from 1.7.0 to 1.7.1 (#1532) 2018-02-26 16:34:51 +03:00
Bruno Alla
01e598df79 Link to unminified CSS if using django-compressor 2018-02-24 10:14:41 +00:00
Bruno Alla
575fe7e2f0 Merge branch 'master' into psycopg2-no-binary 2018-02-22 17:50:20 +00:00
pyup.io bot
b3a4d0ca14 Update django-extensions from 1.9.9 to 2.0.0 (#1526) 2018-02-22 18:03:06 +03:00
Bruno Alla
0164c330b3 Move to the python:alpine docker image (#1482) 
* Move to the python:alpine docker image

- Switch the base images for local and production to alpine
- Install extra dependencies for psycopg2, Pillow and cffi
- Change shebang for shell scripts to use sh instead of bash

* Move to the python:alpine docker image

- Migrate group and user creation to Alpine syntax

* Move to the python:alpine docker image

- Remove `function` keyword, unsupported in shell

* Upgrade various places to the latest Python 3.6

* Test support for translations

* Add gettext library, required for translations support

* Add locale folder for translations support with README documenting it

* Update Changelog

* Tweak command to test translations support
 2018-02-22 10:01:05 -05:00
pyup-bot
76334c086e Update boto3 from 1.5.31 to 1.5.33 2018-02-20 18:26:40 -05:00
Wan Liuyang
30dfbbd0ab Remove AWS S3 header bytes workaround 2018-02-20 16:04:16 +08:00
pyup.io bot
1452fe6ecd Update boto3 from 1.5.30 to 1.5.31 (#1517) 2018-02-18 19:20:27 +03:00
pyup.io bot
97f0ca6fa7 Update django from 2.0 to 2.0.2 (#1514) 2018-02-16 22:42:20 +01:00
Bruno Alla
642af90a37
Merge pull request #1421 from epicwhale/update-django-1.11.8-to-2.0 
Upgrade Django to 2.0
 2018-02-16 21:37:06 +00:00
Bruno Alla
3853094221
Merge pull request #1374 from svleeuwen/patch-1 
Remove boto related settings that aren't used
 2018-02-16 21:19:35 +00:00
pyup.io bot
68ae00e028 Update ipdb from 0.10.3 to 0.11 (#1511) 2018-02-16 18:16:23 +03:00
pyup.io bot
07d7482dbe Update boto3 from 1.5.27 to 1.5.30 (#1512) 2018-02-16 18:16:09 +03:00
Hashim Muqtadir
e8ca2dd8ea Add atomic requests setting to production.py (#1513) 
Since config/production.py sets a new value for `DATABASES['default']`, the `DATABASES['default']['ATOMIC_REQUESTS'] = True` setting from base gets overridden. So it's probably a good idea to add it back.
 2018-02-16 18:15:50 +03:00
Sander van Leeuwen
bef1bb856e
Add cache control via AWS_S3_OBJECT_PARAMETERS setting 
Previously covered by AWS_HEADERS
 2018-02-13 16:04:43 +01:00
Bruno Alla
d783367a86 Prevent pyup to Update Celery automatically 2018-02-13 14:37:40 +00:00
Bruno Alla
faabec8028
Merge pull request #1508 from pydanny/pyup-update-boto3-1.5.25-to-1.5.27 
Update boto3 to 1.5.27
 2018-02-13 14:35:08 +00:00
Bruno Alla
db42ec24ae
Merge pull request #1501 from pydanny/pyup-update-pytz-2017.3-to-2018.3 
Update pytz to 2018.3
 2018-02-13 14:34:49 +00:00
Bruno Alla
95f22eab4f
Merge pull request #1507 from pydanny/pyup-update-sphinx-1.6.7-to-1.7.0 
Update sphinx to 1.7.0
 2018-02-13 14:34:19 +00:00
pyup-bot
26e35a5c79 Update boto3 from 1.5.25 to 1.5.27 2018-02-12 21:26:27 -05:00
pyup-bot
c0bcf3d22e Update sphinx from 1.6.7 to 1.7.0 2018-02-12 11:00:24 -05:00
pyup-bot
7d291e8863 Update coverage from 4.5 to 4.5.1 2018-02-11 02:06:18 -05:00
pyup-bot
e7a47c6f9b Update coverage from 4.5 to 4.5.1 2018-02-11 02:06:17 -05:00
Bruno Alla
5e93bf954d Install psycopg2 with --no-binary option 2018-02-09 13:00:20 +00:00
pyup-bot
8941e4a81d Update pytz from 2017.3 to 2018.3 2018-02-09 02:46:23 -08:00
pyup-bot
dd756e432d Update boto3 from 1.5.24 to 1.5.25 2018-02-08 15:26:11 -08:00
pyup.io bot
7271934268 Update psycopg2 to 2.7.4 (#1497) 
* Update psycopg2 from 2.7.3.2 to 2.7.4

* Update psycopg2 from 2.7.3.2 to 2.7.4

* Update psycopg2 from 2.7.3.2 to 2.7.4
 2018-02-08 23:46:03 +03:00
pyup.io bot
4a81b8577d Update django-anymail from 1.3 to 1.4 (#1498) 2018-02-08 23:45:45 +03:00
David
fb83d8d8bd Add Debian 9 (Stretch) os dependencies (#1496) 2018-02-07 22:54:55 +03:00
Nikita Shupeyko
86e33e8714
Refactor *_gen_project hooks (#1490) 
* Fix ./hooks/pre_gen_project.py asking user to select an option once only

+ prettify output

* Fix pre_gen hook not really exiting when it should

* Refactor & prettify ./hooks/post_gen_project.py

* Ensure same POSTGRES_USER is set across environments

+ get rid of env.example in favor of pre-generated .env.
 2018-02-07 22:52:52 +03:00
Bruno Alla
93f11f6691
Merge branch 'master' into update-django-1.11.8-to-2.0 2018-02-07 14:59:20 +00:00
Bruno Alla
090c81731b
Merge pull request #1418 from reggieriser/django_python_upgrade_cleanups 
Fixing leftovers from migration to Django 1.11 and Python 3.6.
 2018-02-07 14:52:27 +00:00
Reggie Riser
5ffeb2bbdd
Update heroku runtime to 3.6.4 2018-02-07 08:45:56 -05:00
pyup.io bot
1148802655 Update boto3 from 1.5.23 to 1.5.24 (#1492) 2018-02-07 02:52:44 +03:00
pyup.io bot
e9511a1735 Update pytest-sugar from 0.9.0 to 0.9.1 (#1489) 2018-02-06 20:17:39 +03:00
Wan Liuyang
219b6ba817 Update pytest-sugar to 0.9.1 (#1486) 2018-02-06 20:16:24 +03:00
pyup-bot
fe39d9d4e4 Update boto3 from 1.5.22 to 1.5.23 2018-02-05 18:26:06 -08:00
Dayson Pais
d133026968
Update 0001_initial.py 
Increase max length of User.last_name to 150 characters.
 2018-02-05 23:29:36 +00:00
Bruno Alla
19547ac937 Bootstrap4 workarounds cleanup (#1470) 
* Cleanup workaround CSS for Bootstrap 4 + DDT fix

* Cleanup custom Bootstrap 4 + crispy forms workaround
 2018-02-05 07:10:49 -08:00
Dayson Pais
8edcb1cbfe
Merge branch 'master' into update-django-1.11.8-to-2.0 2018-02-05 10:24:58 +00:00
Dayson Pais
d4420e3dd6
Update base.txt 2018-02-05 10:23:10 +00:00
pyup-bot
179adb4f30 Update sphinx from 1.6.6 to 1.6.7 2018-02-04 16:35:06 -08:00
pyup-bot
a0abb0cc22 Update coverage from 4.4.2 to 4.5 2018-02-04 00:26:06 -08:00
pyup-bot
4f4c51d2bf Update coverage from 4.4.2 to 4.5 2018-02-04 00:26:04 -08:00
David
b24d0d0bd8 Fixes wsgi.py app_path to avoid deleting all /config occurrences. (#1467) 2018-02-03 00:01:28 +03:00