Commit Graph

460 Commits

Author SHA1 Message Date
Shupeyko Nikita
4b06fe3958 Node.JS + docker-compose = ♥ (#1128)
* Introduce static asset build infrastructure

* Enhance gulpfile.js

* Introduce node service

* BrowserSync debug-only support

* Remove newline before  BrowserSync debug-only support section

* FIx node Dockerfile package.json COPY

* Try fiixing node Dockerfile package.json COPY ones again

* Switch to `node:7-slim`

* Try switching to node:6

To account for possible node:7 docker-compose incompatibiltiy

* Revert "Try switching to node:6"

This reverts commit 62cc02df1a.

* Try switcging workdir to /app

* Try utilizing relative package.json path

* Resetting to the last version working locally with docker-compose 1.11.x

* Build upon the latest node:7.9-slim

* Stop dockerignoring package.json

* Fix typo

* Try a different package.json path

* Revert "Try a different package.json path"

This reverts commit f29f8500b8.

* Revert "Fix typo"

This reverts commit 02033729b5.

* Revert "Stop dockerignoring package.json"

This reverts commit 63c5491546.

* Upgrade docker-engine and docker-compose used by Travis CI

* Fix .travis.yml comments

* Inline docker-engine and docker-compose versions

* DEBUG: pwd

* Revert "DEBUG: pwd "

This reverts commit 6c2ed4321a.

* Try copying package.json to the same dir as node Dockerfile's

* Revert "Try copying package.json to the same dir as node Dockerfile's"

This reverts commit 24340a0783.

* Try out node:7.9

* Revert "Try out node:7.9"

This reverts commit 32286d33c2.

* Revert "Upgrade docker-engine and docker-compose used by Travis CI"

* Get rid of npm-check-updates

Reason: Reserved for the upcoming PR

* Get rid of npm-check

Reason: Reserved for the upcoming PR

* Get rid of 'standard' npm package

Reason: Reserved for the upcoming PR

* Clean up package.json

* Preserve package.json uncoditionally

Since we now have *unconditional* node.js integration, `package.json` must be out there whenever `node` service gets built

* Upgrade node service image to 7.10

* Document Node.js-Docker integration

* Fix gulpfile.js images region name

* Get rid of Gulp migrate task

* Document Gulp-Docker integration

* Introduce static asset build infrastructure

* Enhance gulpfile.js

* Introduce node service

* BrowserSync debug-only support

* Remove newline before  BrowserSync debug-only support section

* FIx node Dockerfile package.json COPY

* Try fiixing node Dockerfile package.json COPY ones again

* Switch to `node:7-slim`

* Try switching to node:6

To account for possible node:7 docker-compose incompatibiltiy

* Revert "Try switching to node:6"

This reverts commit 62cc02df1a.

* Try switcging workdir to /app

* Try utilizing relative package.json path

* Resetting to the last version working locally with docker-compose 1.11.x

* Build upon the latest node:7.9-slim

* Stop dockerignoring package.json

* Revert "Stop dockerignoring package.json"

This reverts commit 63c5491546.

* Fix typo

* Revert "Fix typo"

This reverts commit 02033729b5.

* Try a different package.json path

* Revert "Try a different package.json path"

This reverts commit f29f8500b8.

* Upgrade docker-engine and docker-compose used by Travis CI

* Fix .travis.yml comments

* Inline docker-engine and docker-compose versions

* DEBUG: pwd

* Revert "DEBUG: pwd "

This reverts commit 6c2ed4321a.

* Try copying package.json to the same dir as node Dockerfile's

* Revert "Try copying package.json to the same dir as node Dockerfile's"

This reverts commit 24340a0783.

* Try out node:7.9

* Revert "Try out node:7.9"

This reverts commit 32286d33c2.

* Revert "Upgrade docker-engine and docker-compose used by Travis CI"

* Get rid of npm-check-updates

Reason: Reserved for the upcoming PR

* Get rid of npm-check

Reason: Reserved for the upcoming PR

* Get rid of 'standard' npm package

Reason: Reserved for the upcoming PR

* Clean up package.json

* Preserve package.json uncoditionally

Since we now have *unconditional* node.js integration, `package.json` must be out there whenever `node` service gets built

* Upgrade node service image to 7.10

* Document Node.js-Docker integration

* Fix gulpfile.js images region name

* Get rid of Gulp migrate task

* Document Gulp-Docker integration

* Remove Gulp-Docker integraton not supported initialization message
2017-06-20 22:48:17 +03:00
Ben Warren
4aff5971d1 Automatic recompilation of Bootstrap with user-defined variables (#1181)
Allow for dynamic bootstrap compilation

Exclude sublime artifacts

Make custom bootstrap vars file

Add custom bootstrap compilation

Add cookiecutter option

Use the right name for the file

Add explanation to generated README

Add self to contributors

Remove sublime exclusion
2017-06-12 19:38:00 +03:00
John Franey
a286e32e2b Gulpfile child process spawn (#1074)
* Update gulpfile to use child_process.spawn

Use child_process.spawn in place of child_process exec to ensure that
console output is captured by Gulp.

Fixes #939

* Remove extra line
2017-06-07 18:46:20 +03:00
pyup.io bot
46af6b4760 Update gevent from 1.2.1 to 1.2.2 (#1186) 2017-06-07 18:26:25 +03:00
Cristian Samaniego
1ddc3fcef8 Fix typo and deprecated option in certbot command (#1185)
The --standalone-supported-challenges option has been deprecated since certbot version 0.9.0.
2017-06-02 22:47:53 +03:00
Fábio C. Barrionuevo da Luz
7762177283 Merge pull request #1182 from pydanny/pyup-update-sphinx-1.6.1-to-1.6.2
Update sphinx to 1.6.2
2017-06-02 09:00:12 -03:00
Fábio C. Barrionuevo da Luz
6ed9ceb232 Merge pull request #1180 from pydanny/pyup-update-raven-6.0.0-to-6.1.0
Update raven to 6.1.0
2017-06-02 08:59:45 -03:00
pyup-bot
798bf0639e Update sphinx from 1.6.1 to 1.6.2 2017-05-28 13:43:56 -07:00
pyup.io bot
890c7cbf4b Update boto from 2.46.1 to 2.47.0 (#1179) 2017-05-26 23:22:55 +03:00
pyup-bot
765764a4a2 Update raven from 6.0.0 to 6.1.0 2017-05-25 15:02:53 -07:00
pyup.io bot
c86989eb96 Update django-anymail from 0.9 to 0.10 (#1177) 2017-05-22 23:51:29 +03:00
pyup.io bot
215879aa30 Update sphinx from 1.5.6 to 1.6.1 (#1171) 2017-05-17 00:08:39 +03:00
pyup.io bot
fa03a69b07 Update werkzeug from 0.12.1 to 0.12.2 (#1170) 2017-05-16 11:08:10 +03:00
Fábio C. Barrionuevo da Luz
96028e3bbe Merge pull request #1168 from pydanny/pyup-update-sphinx-1.5.5-to-1.5.6
Update sphinx to 1.5.6
2017-05-15 08:51:36 -03:00
pyup-bot
eed7233c1b Update coverage from 4.4 to 4.4.1 2017-05-14 23:39:38 -07:00
pyup-bot
3ae3e74aae Update coverage from 4.4 to 4.4.1 2017-05-14 23:39:37 -07:00
pyup-bot
7e084c2a76 Update sphinx from 1.5.5 to 1.5.6 2017-05-14 13:10:35 -07:00
Delio Castillo
89bc1212b3 Fixes docker file when using letsencrypt. Adds ps command to nginx image for start.sh to be able to run without errors (#1154) 2017-05-12 18:23:22 +02:00
Fábio C. Barrionuevo da Luz
cdebc13edc update celery to 3.1.25 2017-05-10 10:51:49 -03:00
Fábio C. Barrionuevo da Luz
b42357966a Merge pull request #1162 from pydanny/pyup-update-coverage-4.3.4-to-4.4
Update coverage to 4.4
2017-05-08 09:13:41 -03:00
pyup-bot
451bee63ac Update coverage from 4.3.4 to 4.4 2017-05-07 22:17:23 -07:00
pyup-bot
64dce4b7d1 Update coverage from 4.3.4 to 4.4 2017-05-07 22:17:21 -07:00
pyup-bot
7125d5c447 Update django-extensions from 1.7.8 to 1.7.9 2017-05-06 05:49:21 -07:00
pyup.io bot
8d7fd5ea06 Update django-debug-toolbar from 1.7 to 1.8 (#1156) 2017-05-06 14:48:47 +02:00
Raphaël Cohen
eb71aecc32 Optimize Django Dockerfile (#1158) 2017-05-06 14:43:26 +02:00
Fábio C. Barrionuevo da Luz
8eb08f553b Merge pull request #1152 from pydanny/pyup-update-ipdb-0.10.2-to-0.10.3
Update ipdb to 0.10.3
2017-04-30 18:48:35 -03:00
Fábio C. Barrionuevo da Luz
90d221e206 Merge pull request #1147 from pydanny/pyup-update-django-allauth-0.31.0-to-0.32.0
Update django-allauth to 0.32.0
2017-04-30 18:35:39 -03:00
pyup-bot
df4bac167f Update ipdb from 0.10.2 to 0.10.3 2017-04-30 14:35:19 -07:00
Fábio C. Barrionuevo da Luz
e02e7b860f Merge pull request #1145 from pydanny/pyup-update-django-redis-4.7.0-to-4.8.0
Update django-redis to 4.8.0
2017-04-30 18:21:17 -03:00
Fábio C. Barrionuevo da Luz
13a19ec2d2 Merge pull request #1149 from pydanny/pyup-update-pillow-4.1.0-to-4.1.1
Update pillow to 4.1.1
2017-04-30 18:17:12 -03:00
Fábio C. Barrionuevo da Luz
fb0aaced34 change [pep8] to [pycodestyle] on setup.cfg
use [pycodestyle] instead of [pep8] on setup.cfg because [pep8] section is deprecated after 2.1.0 version of pycodestyle
2017-04-29 18:57:23 -03:00
Shupeyko Nikita
9037fb57f3 Fix #1150 (#1151)
Fix #1150
2017-04-29 16:59:05 +03:00
pyup-bot
8beb5b40b2 Update pillow from 4.1.0 to 4.1.1 2017-04-28 11:09:13 -07:00
pyup-bot
a2666a8b41 Update django-allauth from 0.31.0 to 0.32.0 2017-04-27 02:18:57 -07:00
pyup-bot
3fe9ebaaf0 Update django-redis from 4.7.0 to 4.8.0 2017-04-25 06:04:16 -07:00
Shupeyko Nikita
f5ccce4ef8 Switch from runtime- to compile-time set production django docker service (#1144)
Extends #971
2017-04-24 23:12:30 +02:00
Shupeyko Nikita
65e64fe364 Fix CELERY_BROKER_URL naming mismatch (#1143)
* Fix CELERY_BROKER_URL naming mismatch

Closes #1116

* Fix all occurences
2017-04-24 19:35:58 +03:00
Shupeyko Nikita
5b75ad6c9d Require celery==3.1.24 instead of celery==4.0.2 (#1140) 2017-04-24 15:26:08 +03:00
Shupeyko Nikita
e78b6fb425 Fix W391 blank line at end of file (#1136) 2017-04-23 01:27:58 +03:00
Daniel Roy Greenfeld
6aced9ba73 Remove Python 2.7 support per #1129 (#1130)
* Remove Python 2.7 support per

* Remove Python 2.7 references

* Remove Python 2.7 references

* remove python 2 entirely
2017-04-21 12:31:45 -07:00
Shupeyko Nikita
23bd99fc5a Pin redis service image version (#1117) 2017-04-21 20:44:06 +03:00
Nikita P. Shupeyko
c4e646214a Workaround flake8 "imported but unused" errors 2017-04-21 18:52:53 +03:00
Daniel Roy Greenfeld
b0fe04fc52 First pass at Bootstrap 4 Alpha 6, just the basic layout 2017-04-20 15:18:30 -07:00
Daniel Roy Greenfeld
8864fffdc7 Update Pillow and django-environ 2017-04-20 14:44:39 -07:00
pyup.io bot
a833a8a358 Update django-model-utils from 2.6.1 to 3.0.0 (#1122) 2017-04-18 09:20:56 +02:00
pyup.io bot
19b4e299cb Update django-anymail from 0.8 to 0.9 (#1108) 2017-04-18 09:20:14 +02:00
Audrey Roy Greenfeld
5d78b32f2b Put local Docker setting into Jinja2 if block 2017-04-17 10:54:01 -07:00
Daniel Roy Greenfeld
8b82dfae8a Change order of modern django debug toolbar. 2017-04-17 10:51:58 -07:00
Daniel Roy Greenfeld
a383fa2378 Document source of unclear links 2017-04-14 11:54:38 -07:00
Daniel Roy Greenfeld
ba2301fc3c Fix multiple imports on one line 2017-04-13 11:30:57 -07:00
Daniel Roy Greenfeld
8673505683 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2017-04-13 11:28:00 -07:00
Daniel Roy Greenfeld
a3b0feec12 Flake8 fix 2017-04-13 11:27:54 -07:00
Shupeyko Nikita
e365c39f2a gitignore generated project's .cache/ dir (#1061) 2017-04-13 10:50:56 -07:00
pyup.io bot
e9d94dbf52 Update sphinx from 1.5.3 to 1.5.5 (#1104) 2017-04-13 10:50:34 -07:00
Shupeyko Nikita
1c1cc9ee9c Prevent PyCharm from formatting raven and opbeat imports (#1063)
* Prevent PyCharm from formatting raven and opbeat imports

Since raven and opbeat are required in production only, imports might (most surely will) be wiped out during PyCharm code clean up started in other environments.

* Prevent PyCharm from formatting raven and opbeat imports

Since raven and opbeat are required in production only, imports might (most surely will) be wiped out during PyCharm code clean up started in other environments.

* Fix line breaks and spaces

* Fix linebreaks
2017-04-13 10:50:11 -07:00
Audrey Roy Greenfeld
6453fea417 Easier placement of apps within the second level directory 2017-04-13 10:48:44 -07:00
Nikita P. Shupeyko
66ffa5c93c Switch to current runtime version
Closes #1094
2017-04-06 19:04:46 +03:00
pyup.io bot
3bbbcea0d0 Update django from 1.10.6 to 1.10.7 (#1110) 2017-04-05 10:36:50 +02:00
Jannis Gebauer
f62e05b95e stay on 1.10.x for now until 1.11 is compatible 2017-04-05 10:28:42 +02:00
pyup.io bot
9af01c50a8 Update django-debug-toolbar from 1.6 to 1.7 (#1069) 2017-04-01 18:14:22 +02:00
pyup.io bot
c5c8b6b5e8 Update django-extensions from 1.7.7 to 1.7.8 (#1096) 2017-04-01 18:12:50 +02:00
pyup.io bot
86922be94b Update pytz from 2016.10 to 2017.2 (#1098) 2017-04-01 18:12:29 +02:00
Wee Liat
0b14104ae0 added btn class to forget password (#1102) 2017-04-01 08:30:24 -07:00
Shupeyko Nikita
7da1bf79b8 Replace links section with depends_on in docker-compose config files (#1092)
Closes #1091
2017-03-24 18:45:31 +01:00
pyup.io bot
26962b41af Update gunicorn from 19.6.0 to 19.7.1 (#1089) 2017-03-24 11:28:12 +01:00
pyup.io bot
5b522d3dee Update werkzeug from 0.11.15 to 0.12.1 (#1080) 2017-03-24 11:28:00 +01:00
pyup.io bot
57e9a223fe Update psycopg2 to 2.7.1 (#1073)
* Update psycopg2 from 2.7 to 2.7.1

* Update psycopg2 from 2.7 to 2.7.1

* Update psycopg2 from 2.7 to 2.7.1
2017-03-24 11:25:36 +01:00
William Archinal
f3ea2570ab Use Argon2 password hashing algorithm by default (#1079) 2017-03-16 19:19:42 -07:00
Shupeyko Nikita
7c7970fac6 Fix autoprefixer options in gulp styles task (#1081)
Fix `'last 2 version'` -> `'last 2 versions'` (https://www.npmjs.com/package/gulp-autoprefixer#usage)
2017-03-16 08:06:09 -07:00
Sam Collins
d307d47995 Updated aws cache type to t2.micro (#1067) 2017-03-04 12:37:26 -08:00
Burhan Khalid
04146d580e version bumps 2017-03-03 09:11:54 +03:00
pyup.io bot
f6236b3aca Update django-coverage-plugin to 1.5.0 (#1048)
* Update django-coverage-plugin from 1.4.2 to 1.5.0

* Update django-coverage-plugin from 1.4.2 to 1.5.0
2017-02-25 14:34:00 +01:00
pyup.io bot
49efbc7075 Update django-extensions from 1.7.6 to 1.7.7 (#1049) 2017-02-25 14:33:50 +01:00
Kenial S. Lee
e079dfe17d Removed dependency of watch task and put it in runSequence; there was no runSequence for it, which makes watch task won’t be run. (#1019) 2017-02-21 11:57:48 -08:00
Reggie Riser
2006605e24 A few cleanups: 1) Fixed common.py references (now called base.py), 2) Made URLs consistent in pointing to dev Django docs as well as https, (#1037) 2017-02-21 11:55:51 -08:00
pyup.io bot
27d441fa7e Update boto from 2.45.0 to 2.46.1 (#1045) 2017-02-21 09:54:10 +01:00
Mounir
489c971123 pycharm doc typo (#1042)
* pycharm doc typo

a very simple typo in the word without

* Update configuration.rst
2017-02-20 14:23:18 +01:00
pyup.io bot
b3896c4f75 Update raven from 5.32.0 to 6.0.0 (#1041) 2017-02-20 14:22:48 +01:00
Fábio C. Barrionuevo da Luz
a0efe83901 fix issue #1039 2017-02-15 18:15:16 -03:00
Mesut YILMAZ
3cd57880e0 Removed redeclared env 2017-02-15 11:17:34 +03:00
Jimmy Gitonga
f4ef73efbf ADDED: HTTPS is on by default (#1025)
ADDED: HTTPS is on by default. This will give a new user an
understanding of why Cookie Django is set up securely for deployment in
a production environment.
2017-02-13 12:27:09 -08:00
Daniel Roy Greenfeld
672f21a0b2 Merge branch 'master' of github.com:pydanny/cookiecutter-django 2017-02-13 10:49:06 -08:00
Daniel Roy Greenfeld
9a837171b6 Merge branch 'make-settings-consistent-w-req' of https://github.com/statwonk/cookiecutter-django into statwonk-make-settings-consistent-w-req 2017-02-13 10:48:10 -08:00
William Martin Stewart
f298ef7722 Inconsistent title case in 404 (#974)
We should either title case it or just capitalise the first letter, imho.
2017-02-13 10:44:02 -08:00
schacki
65611f14ea Updated settings to only include lists and ' (#930)
* Updated settings to only include lists and '

Substituted " with ' in files
Migrated tuples  to lists

* Added trailing slashes

- trailing slashes
- minor cleanups
2017-02-13 10:33:52 -08:00
Nikita P. Shupeyko
d0a21a50df Fix pytest DJANGO_SETTINGS_MODULE
Switch from DJANGO_SETTINGS_MODULE = config.settings.local to DJANGO_SETTINGS_MODULE = config.settings.test
2017-02-10 15:10:41 +03:00
Nikita P. Shupeyko
d4f6f0b99c Fix Docker test PyCharm Run Configurations settings file
Switch from env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" to env name="DJANGO_SETTINGS_MODULE" value="config.settings.test"
2017-02-10 14:33:29 +03:00
Fábio C. Barrionuevo da Luz
69bc96d9ba Merge pull request #985 from pydanny/dot_env_issue
load .env file from root dir only if DJANGO_READ_DOT_ENV_FILE is True
2017-02-09 16:03:17 -03:00
pyup.io bot
51609953a8 Update django-coverage-plugin to 1.4.2 (#1022)
* Update django-coverage-plugin from 1.4.1 to 1.4.2

* Update django-coverage-plugin from 1.4.1 to 1.4.2
2017-02-09 09:10:37 +01:00
pyup.io bot
b430efa0ed Update flake8 to 3.3.0 (#1021)
* Update flake8 from 3.2.1 to 3.3.0

* Update flake8 from 3.2.1 to 3.3.0
2017-02-09 09:10:22 +01:00
pyup.io bot
7a50dcc89a Update collectfast from 0.5.1 to 0.5.2 (#1024) 2017-02-09 09:08:55 +01:00
Fábio C. Barrionuevo da Luz
83900ddfd3 fix typo 2017-02-03 14:12:52 -03:00
pyup.io bot
ce27703731 Update django-compressor from 2.1 to 2.1.1 (#1015) 2017-02-02 14:47:27 +01:00
pyup.io bot
9be889a901 Update django-anymail from 0.7 to 0.8 (#1014) 2017-02-02 14:47:15 +01:00
pyup.io bot
ec3daa58e4 Update django-braces from 1.10.0 to 1.11.0 (#1013) 2017-02-02 14:47:02 +01:00
pyup.io bot
572df4f359 Update django-test-plus to 1.0.17 (#1012)
* Update django-test-plus from 1.0.16 to 1.0.17

* Update django-test-plus from 1.0.16 to 1.0.17
2017-02-02 14:46:50 +01:00
pyup.io bot
cd5a742d50 Update whitenoise from 3.2.3 to 3.3.0 (#1011) 2017-02-02 14:46:25 +01:00
pyup.io bot
01063b8b8b Update sphinx from 1.5.1 to 1.5.2 (#1010) 2017-02-02 14:46:13 +01:00
pyup.io bot
6085feb36c Update django-extensions from 1.7.5 to 1.7.6 (#1006) 2017-01-26 16:15:56 +01:00
pyup.io bot
29e957cd77 Update ipdb from 0.10.1 to 0.10.2 (#1007) 2017-01-26 16:15:45 +01:00