updates from gluejar travis work
parent
eba9af93c3
commit
9abb666ce8
|
@ -15,7 +15,8 @@ env:
|
|||
before_install:
|
||||
- sudo mkdir /var/log/django
|
||||
- sudo chmod 777 /var/log/django
|
||||
- openssl aes-256-cbc -K $encrypted_56eb2b7cc527_key -iv $encrypted_56eb2b7cc527_iv -in ~/build/EbookFoundation/regluit/test/common.py.enc -out ~/build/EbookFoundation/regluit/settings/keys/common.py -d
|
||||
- mkdir ~/build/EbookFoundation/regluit/settings/keys/
|
||||
- cp ~/build/EbookFoundation/regluit/settings/dummy/__init__.py - openssl aes-256-cbc -K $encrypted_56eb2b7cc527_key -iv $encrypted_56eb2b7cc527_iv -in ~/build/EbookFoundation/regluit/test/travis-host.py.enc -out ~/build/EbookFoundation/regluit/settings/keys/host.py -d
|
||||
|
||||
install:
|
||||
- pip install -r requirements_versioned.pip
|
||||
|
|
|
@ -3,28 +3,25 @@ Fabric==1.6.0
|
|||
MySQL-python==1.2.5
|
||||
Pillow==3.4.2
|
||||
PyJWT==1.4.1
|
||||
PyPDF2==1.23
|
||||
PyPDF2==1.26
|
||||
PyGithub==1.15.0
|
||||
PyYAML==3.11
|
||||
git+git://github.com/urschrei/pyzotero.git@v0.9.51
|
||||
SPARQLWrapper==1.6.4
|
||||
WebOb==1.2.3
|
||||
WebTest==1.4.0
|
||||
amqp==1.4.9
|
||||
anyjson==0.3.3
|
||||
billiard==3.3.0.23
|
||||
awscli==1.10.26
|
||||
boto==2.42.0
|
||||
#git+ssh://git@github.com/Gluejar/boto.git@2.3.0
|
||||
awscli==1.15.33
|
||||
boto==2.48.0
|
||||
boto3==1.7.33
|
||||
celery==3.1.23
|
||||
certifi==2016.2.28
|
||||
certifi==2018.4.16
|
||||
chardet==3.0.4
|
||||
# pip installing pillow seems to delete distribute
|
||||
# but having distribute in requirements starting to cause problems
|
||||
# distribute==0.6.28
|
||||
django-celery==3.1.17
|
||||
django-ckeditor==4.5.1
|
||||
#django-email-change==0.2.3
|
||||
git+git://github.com/eshellman/django-email-change.git@1e71dd320504d56b1fc7d447ce4cffb550cedce7
|
||||
git+git://github.com/eshellman/django-email-change.git@57169bdef1c8a41d122e2bab2dcd8564b8fb231d
|
||||
django-compat==1.0.10
|
||||
django-contrib-comments==1.7.1
|
||||
django-endless-pagination==2.0
|
||||
|
@ -33,27 +30,25 @@ django-jsonfield==1.0.0
|
|||
#django-kombu==0.9.4
|
||||
django-maintenancemode==0.11.2
|
||||
django-mptt==0.8.5
|
||||
#django-nose-selenium==0.7.3
|
||||
#django-notification==0.2
|
||||
git+git://github.com/eshellman/django-notification.git@412c7a03a327195a1017c2be92c8e2caabc880b6
|
||||
git+git://github.com/eshellman/django-notification.git@a4620e893e2da220994e0189bf5d980bfbdcf0ad
|
||||
django-registration==2.1.2
|
||||
django-selectable==0.9.0
|
||||
django-smtp-ssl==1.0
|
||||
django-storages==1.4.1
|
||||
django-storages==1.5.2
|
||||
django-tastypie==0.13.3
|
||||
django-transmeta==0.7.3
|
||||
feedparser==5.1.2
|
||||
#django-transmeta==0.7.3
|
||||
git+git://github.com/resulto/django-transmeta.git@ad4d7278ba330dcf8c8446f8ae9b2c769ae8684e
|
||||
fef-questionnaire==4.0.1
|
||||
freebase==1.0.8
|
||||
#gitenberg.metadata==0.1.6
|
||||
git+https://github.com/gitenberg-dev/gitberg-build
|
||||
#git+ssh://git@github.com/gitenberg-dev/metadata.git@0.1.11
|
||||
github3.py==0.9.5
|
||||
html5lib==1.0b3
|
||||
html5lib==1.0.1
|
||||
httplib2==0.7.5
|
||||
isodate==0.5.1
|
||||
kombu==3.0.35
|
||||
lxml==2.3.5
|
||||
lxml==4.2.1
|
||||
defusedxml==0.4.1
|
||||
mechanize==0.2.5
|
||||
mimeparse==0.1.3
|
||||
|
@ -66,6 +61,7 @@ paramiko==1.14.1
|
|||
postmonkey==1.0b
|
||||
pycrypto==2.6
|
||||
pymarc==3.0.2
|
||||
pyoai==2.5.0
|
||||
pyparsing==2.0.3
|
||||
python-dateutil==2.5.3
|
||||
python-mimeparse==0.1.4
|
||||
|
@ -75,12 +71,12 @@ pytz==2016.6.1
|
|||
rdflib==4.2.0
|
||||
rdflib-jsonld==0.3
|
||||
redis==2.10.3
|
||||
reportlab==3.1.8
|
||||
requests==2.10.0
|
||||
reportlab==3.4.0
|
||||
requests==2.18.4
|
||||
requests-mock==1.2.0
|
||||
requests-oauthlib==0.6.2
|
||||
selenium==2.53.1
|
||||
six==1.9.0
|
||||
six==1.11.0
|
||||
sorl-thumbnail==12.3
|
||||
ssh==1.7.14
|
||||
stevedore==1.12.0
|
||||
|
@ -89,22 +85,23 @@ virtualenv==1.4.9
|
|||
# virtualenv-clone==0.2.4 not sure why I have this in my env
|
||||
#virtualenvwrapper==3.6
|
||||
wsgiref==0.1.2
|
||||
xhtml2pdf==0.0.6
|
||||
xhtml2pdf==0.2.2
|
||||
webencodings==0.5.1
|
||||
#for urllib3 secure
|
||||
cffi==1.7.0
|
||||
cryptography==2.1.4
|
||||
cryptography==2.2.2
|
||||
enum34==1.1.6
|
||||
idna==2.1
|
||||
idna==2.6
|
||||
ipaddress==1.0.16
|
||||
ndg-httpsclient==0.4.2
|
||||
pyOpenSSL==16.2.0
|
||||
pyOpenSSL==18.0.0
|
||||
pyasn1==0.1.9
|
||||
pycparser==2.14
|
||||
setuptools==25.0.0
|
||||
urllib3==1.16
|
||||
urllib3==1.22
|
||||
beautifulsoup4==4.6.0
|
||||
RISparser==0.4.2
|
||||
# include these 2 for development
|
||||
libsass==0.14.5
|
||||
django-compressor==2.2
|
||||
django-sass-processor==0.7
|
||||
#libsass==0.13.4
|
||||
#django-compressor==2.2
|
||||
django-sass-processor==0.5.6
|
||||
|
|
|
@ -1,54 +0,0 @@
|
|||
# coding=utf-8
|
||||
from .common import *
|
||||
|
||||
DEBUG = True
|
||||
TEMPLATES[0]['OPTIONS']['debug'] = DEBUG
|
||||
IS_PREVIEW = False
|
||||
|
||||
ADMINS = (
|
||||
('Raymond Yee', 'rdhyee+ungluebugs@gluejar.com'),
|
||||
('Eric Hellman', 'eric@gluejar.com'),
|
||||
)
|
||||
|
||||
MANAGERS = ADMINS
|
||||
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.mysql',
|
||||
'NAME': 'regluit',
|
||||
'USER': 'regluit',
|
||||
'PASSWORD': 'regluit',
|
||||
'HOST': '',
|
||||
'PORT': '',
|
||||
'TEST_CHARSET': 'utf8',
|
||||
}
|
||||
}
|
||||
|
||||
TIME_ZONE = 'America/New_York'
|
||||
|
||||
# settings for outbout email
|
||||
# if you have a gmail account you can use your email address and password
|
||||
|
||||
EMAIL_USE_TLS = True
|
||||
EMAIL_HOST = 'smtp.gmail.com'
|
||||
EMAIL_HOST_USER = 'me@gmail.com'
|
||||
EMAIL_HOST_PASSWORD = 'my-password'
|
||||
EMAIL_PORT = 587
|
||||
DEFAULT_FROM_EMAIL = 'info@ebookfoundation.org'
|
||||
|
||||
|
||||
# formerly of settings/common.py to surface old vars
|
||||
# TO DO: invalidate before we open source
|
||||
|
||||
# for use with test google account only
|
||||
GOOGLE_DISPLAY_NAME = 'Unglue.It'
|
||||
REDIRECT_IS_HTTPS = False
|
||||
|
||||
#BASE_URL = 'http://0.0.0.0/'
|
||||
BASE_URL_SECURE = 'http://0.0.0.0/'
|
||||
|
||||
|
||||
|
||||
# use database as queuing service in development
|
||||
BROKER_TRANSPORT = "djkombu.transport.DatabaseTransport"
|
||||
#INSTALLED_APPS += ("djkombu",)
|
|
@ -50,3 +50,18 @@ BROKER_TRANSPORT = "redis"
|
|||
BROKER_HOST = "localhost"
|
||||
BROKER_PORT = 6379
|
||||
BROKER_VHOST = "0"
|
||||
|
||||
# Amazon S3 access
|
||||
AWS_STORAGE_BUCKET_NAME = 'unglueit-testfiles'
|
||||
|
||||
SOCIAL_AUTH_TWITTER_KEY = ''
|
||||
SOCIAL_AUTH_TWITTER_SECRET = ''
|
||||
SOCIAL_AUTH_FACEBOOK_KEY = ''
|
||||
SOCIAL_AUTH_FACEBOOK_SECRET = ''
|
||||
SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = ''
|
||||
SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = ''
|
||||
GOOGLE_BOOKS_API_KEY = ''
|
||||
TEST_INTEGRATION = False
|
||||
LOCAL_TEST = True
|
||||
DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
|
||||
|
||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue