arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-24 23:28:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #325 from nottinghamtec/travis-fix

Browse Source 
Bump chrome and chromedriver, update recaptcha keys, add --no-sandbox to chrome
This commit is contained in:
David Taylor
2018-03-24 23:52:43 +00:00
committed by GitHub
parent 85edba03a2 ad3b38d222
commit 05feb7df1c
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@@ -4,10 +4,10 @@ python:
cache: pip cache: pip
addons: addons:
chrome: beta chrome: stable
install: install:
- wget http://chromedriver.storage.googleapis.com/2.32/chromedriver_linux64.zip - wget https://chromedriver.storage.googleapis.com/2.36/chromedriver_linux64.zip
- unzip chromedriver_linux64.zip - unzip chromedriver_linux64.zip
- export PATH=$PATH:$(pwd) - export PATH=$PATH:$(pwd)
- chmod +x chromedriver - chmod +x chromedriver

4
PyRIGS/settings.py
View File

@@ -162,8 +162,8 @@ LOGOUT_URL = '/user/logout/'
ACCOUNT_ACTIVATION_DAYS = 7 ACCOUNT_ACTIVATION_DAYS = 7
# reCAPTCHA settings # reCAPTCHA settings
RECAPTCHA_PUBLIC_KEY = os.environ.get('RECAPTCHA_PUBLIC_KEY', None) RECAPTCHA_PUBLIC_KEY = os.environ.get('RECAPTCHA_PUBLIC_KEY', "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI") # If not set, use development key
RECAPTCHA_PRIVATE_KEY = os.environ.get('RECAPTCHA_PRIVATE_KEY', None) RECAPTCHA_PRIVATE_KEY = os.environ.get('RECAPTCHA_PRIVATE_KEY', "6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe") # If not set, use development key
NOCAPTCHA = True NOCAPTCHA = True
# Email # Email

1
RIGS/test_functional.py
View File

@@ -32,6 +32,7 @@ def create_browser():
options.add_argument("--window-size=1920,1080") options.add_argument("--window-size=1920,1080")
if os.environ.get('CI', False): if os.environ.get('CI', False):
options.add_argument("--headless") options.add_argument("--headless")
options.add_argument("--no-sandbox")
driver = webdriver.Chrome(chrome_options=options) driver = webdriver.Chrome(chrome_options=options)
return driver return driver

2
requirements.txt
View File

@@ -24,7 +24,7 @@ python-dateutil==2.6.1
pytz==2017.3 pytz==2017.3
raven==6.3.0 raven==6.3.0
reportlab==3.4.0 reportlab==3.4.0
selenium==3.7.0 selenium==3.11.0
simplejson==3.13.2 simplejson==3.13.2
six==1.11.0 six==1.11.0
sqlparse==0.2.4 sqlparse==0.2.4