Skip to content

Commit 60784ce

Browse files
committed
removes phantomjs as global dependencies and make it a node dependencie
1 parent a09ab8c commit 60784ce

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

core/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ def render_to_response(self, context, **response_kwargs):
354354
from selenium import webdriver
355355
from signal import SIGTERM
356356
from time import gmtime, strftime
357-
from timtec.settings import MEDIA_ROOT, CERTIFICATE_SIZE
357+
from timtec.settings import MEDIA_ROOT, CERTIFICATE_SIZE, PHANTOMJS_PATH
358358
from PIL import Image
359359
import os
360360

@@ -366,7 +366,7 @@ def render_to_response(self, context, **response_kwargs):
366366
pdf_filename = certificate.link_hash + today + '.pdf'
367367
pdf_path = os.path.join(MEDIA_ROOT, pdf_filename)
368368

369-
driver = webdriver.PhantomJS()
369+
driver = webdriver.PhantomJS(executable_path=PHANTOMJS_PATH)
370370
driver.set_window_size(width, height)
371371
driver.get(url)
372372
driver.save_screenshot(filename=png_path)

docs/source/instalacao_e_configuracao/Instalação.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Primeiro, vamos instalar as dependências:
5858

5959
```
6060
$ sudo apt-get update
61-
$ sudo apt-get install -y libpq-dev libjpeg-dev libpng12-dev build-essential python-dev gettext python-virtualenv phantomjs
61+
$ sudo apt-get install -y libpq-dev libjpeg-dev libpng12-dev build-essential python-dev gettext python-virtualenv
6262
```
6363

6464
### Instalando o nodejs

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"grunt-cli": "~0.1.13",
99
"grunt-angular-gettext": "~2.1.11",
1010
"less": "~2.6.1",
11-
"ng-annotate": "~1.2"
11+
"ng-annotate": "~1.2",
12+
"phantomjs-prebuilt": "~2.1.7"
1213
},
1314
"devDependencies": {
1415
"jshint": "~2.9.1"

scripts/bootstrap-ubuntu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ TIMTEC_USER=vagrant
77
# useradd --groups sudo --create-home ${TIMTEC_USER}
88

99
sudo apt-get update
10-
sudo apt-get install -y libpq-dev libjpeg-dev libpng12-dev build-essential python-dev gettext python-virtualenv nodejs npm git phantomjs
10+
sudo apt-get install -y libpq-dev libjpeg-dev libpng12-dev build-essential python-dev gettext python-virtualenv nodejs npm git
1111

1212
# sudo useradd -U -m ${TIMTEC_USER}
1313

timtec/settings.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,7 @@
507507
SOCIALACCOUNT_EMAIL_VERIFICATION = False
508508

509509
CERTIFICATE_SIZE = (862, 596)
510+
PHANTOMJS_PATH = os.path.join(PROJECT_ROOT, 'node_modules/phantomjs-prebuilt/bin/phantomjs')
510511

511512
TWITTER_CONSUMER_KEY = ''
512513
TWITTER_CONSUMER_SECRET = ''

0 commit comments

Comments
 (0)