Skip to content

Commit 73054ba

Browse files
committed
Remove django_gulp as dependency
1 parent e2ed527 commit 73054ba

File tree

8 files changed

+9
-7
lines changed

8 files changed

+9
-7
lines changed

Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@ RUN npm install
2727

2828
# Compile all the static files
2929
RUN npm rebuild node-sass
30+
RUN npm run gulp build
3031
RUN python ./tabbycat/manage.py collectstatic --no-input

bin/docker-run.sh

+1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ python ./manage.py migrate --no-input
99

1010
# Run the server
1111
# python ./manage.py runserver 0.0.0.0:8000
12+
npm run gulp build
1213
python ./manage.py runserver 0.0.0.0:8000

bin/post_compile

+3
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,7 @@ python manage.py clearcache
1313
echo "-----> Running dynamic preferences checks"
1414
python manage.py checkpreferences
1515

16+
echo "-----> Running gulp compilation"
17+
npm run gulp build
18+
1619
echo "-----> Post-compile done"

bin/serve_local

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/usr/bin/env bash
22
set -eo pipefail
33

4+
npm run gulp build
45
cd ./tabbycat/
56
waitress-serve --threads=12 --host=127.0.0.1 --port=8000 wsgi:application

docs/install/linux.rst

+2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ Then create local_settings.py as described :ref:`below <local-settings-linux>`,
4949
npm install
5050
cd tabbycat
5151
dj migrate
52+
npm run gulp build
5253
dj collectstatic
5354
dj createsuperuser
5455
waitress-serve wsgi:application
@@ -194,6 +195,7 @@ Almost there!
194195

195196
$ cd tabbycat
196197
$ dj migrate
198+
$ npm run gulp build
197199
$ dj collectstatic
198200
$ dj createsuperuser
199201

docs/install/osx.rst

+1
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ Almost there!
130130

131131
$ cd tabbycat
132132
$ dj migrate
133+
$ npm run gulp build
133134
$ dj collectstatic
134135
$ dj createsuperuser
135136

requirements_common.txt

-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,5 @@ sqlparse==0.2.4 # Parsing SQL statements
2525

2626
# Pipeline
2727

28-
django-gulp==3.0.0 # Run gulp tasks with dj r/collectstatic
2928
whitenoise==3.3.1 # Static file serving
3029
waitress==1.1.0 # For web serving

tabbycat/settings.py

-6
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
'django.contrib.auth',
7474
'django.contrib.contenttypes',
7575
'django.contrib.sessions',
76-
'django_gulp', # Asset compilation; must be before staticfiles
7776
'whitenoise.runserver_nostatic', # Use whitenoise with runserver
7877
'raven.contrib.django.raven_compat', # Client for Sentry error tracking
7978
'django.contrib.staticfiles',
@@ -158,11 +157,6 @@
158157
# Whitenoise Gzipping and unique names
159158
STATICFILES_STORAGE = 'utils.misc.SquashedWhitenoiseStorage'
160159

161-
# When running server side always use build not watch
162-
GULP_PRODUCTION_COMMAND = "export NODE_ENV=production && npm run gulp build -- --production"
163-
GULP_DEVELOP_COMMAND = "npm run gulp build -- --development"
164-
165-
166160
# ==============================================================================
167161
# Logging
168162
# ==============================================================================

0 commit comments

Comments
 (0)