Download as
Browse Code »

Commit 2bcbd241340494e9b8f292e556ab66d984f7c3c7

Authored by Sergio Oliveira
1 parent beb229f0
Exists in master and in 33 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_header, fixed_gitlab_import, go_to_profile_panel, mobile_user_scalable, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, split_screen, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Removed settings yaml

Showing 7 changed files with 20 additions and 114 deletions   Show diff stats
@@ -7,8 +7,7 @@ python: @@ -7,8 +7,7 @@ python:
7 7
8 env: 8 env:
9 global: 9 global:
10 - - DJANGO_SETTINGS_MODULE=tests.settings  
11 - - COLAB_SETTINGS=tests/settings.yaml 10 + - DJANGO_SETTINGS_MODULE=tests.settings
12 11
13 install: 12 install:
14 - pip install coveralls flake8 13 - pip install coveralls flake8
colab/settings.py
  Diff comments   View file @2bcbd24
@@ -279,14 +279,8 @@ CONVERSEJS_SHOW_ONLY_ONLINE_USERS = True @@ -279,14 +279,8 @@ CONVERSEJS_SHOW_ONLY_ONLINE_USERS = True
279 # Tastypie settings 279 # Tastypie settings
280 TASTYPIE_DEFAULT_FORMATS = ['json', ] 280 TASTYPIE_DEFAULT_FORMATS = ['json', ]
281 281
282 -from .utils.conf import load_yaml_settings  
283 -from .utils.conf import load_py_settings  
284 from .utils.conf import load_colab_apps 282 from .utils.conf import load_colab_apps
285 283
286 -locals().update(load_yaml_settings())  
287 -  
288 -locals().update(load_py_settings())  
289 -  
290 if locals().get('RAVEN_DSN', False): 284 if locals().get('RAVEN_DSN', False):
291 RAVEN_CONFIG = { 285 RAVEN_CONFIG = {
292 'dsn': RAVEN_DSN + '?timeout=30', # noqa 286 'dsn': RAVEN_DSN + '?timeout=30', # noqa
colab/utils/conf.py
  Diff comments   View file @2bcbd24
@@ -4,68 +4,12 @@ import sys @@ -4,68 +4,12 @@ import sys
4 4
5 import warnings 5 import warnings
6 6
7 -import yaml  
8 -  
9 -import yamlordereddictloader  
10 -  
11 from django.core.exceptions import ImproperlyConfigured 7 from django.core.exceptions import ImproperlyConfigured
12 8
13 import importlib 9 import importlib
14 10
15 11
16 -USING_YAML_SETTINGS = False  
17 -  
18 -  
19 -class InaccessibleYAMLSettings(ImproperlyConfigured):  
20 - """Settings YAML is Inaccessible.  
21 -  
22 - Check if the file exists and if you have read permissions."""  
23 -  
24 -  
25 -def _load_yaml_file(yaml_path):  
26 - try:  
27 - with open(yaml_path) as yaml_file:  
28 - yaml_settings = yaml.load(yaml_file.read(),  
29 - yamlordereddictloader.Loader)  
30 - except IOError:  
31 - msg = ('Could not open settings file {}. Please '  
32 - 'check if the file exists and if user '  
33 - 'has read rights.').format(yaml_path)  
34 - raise InaccessibleYAMLSettings(msg)  
35 -  
36 - return yaml_settings  
37 -  
38 -  
39 -def load_yaml_settings():  
40 - settings_dir = '/etc/colab/settings.d'  
41 - yaml_path = os.getenv('COLAB_YAML_SETTINGS', '/etc/colab/settings.yaml')  
42 -  
43 - if os.path.exists(yaml_path):  
44 - global USING_YAML_SETTINGS  
45 - USING_YAML_SETTINGS = True  
46 - warnings.warn("YAML Settings file is deprecated. Use Py file instead.")  
47 - else:  
48 - return {}  
49 -  
50 - yaml_settings = _load_yaml_file(yaml_path)  
51 -  
52 - parse_yml_menus(yaml_settings)  
53 -  
54 - # Try to read settings from settings.d  
55 - if os.path.exists(settings_dir):  
56 - for file_name in os.listdir(settings_dir):  
57 - if file_name.endswith('.yaml') or file_name.endswith('yml'):  
58 - file_path = os.path.join(settings_dir, file_name)  
59 - yaml_settings_d = _load_yaml_file(file_path)  
60 -  
61 - parse_yml_menus(yaml_settings_d)  
62 -  
63 - yaml_settings.update(yaml_settings_d)  
64 -  
65 - return yaml_settings or {}  
66 -  
67 -  
68 -class InaccessiblePySettings(ImproperlyConfigured): 12 +class InaccessibleSettings(ImproperlyConfigured):
69 """Settings.py is Inaccessible. 13 """Settings.py is Inaccessible.
70 14
71 Check if the file exists and if you have read permissions.""" 15 Check if the file exists and if you have read permissions."""
@@ -82,11 +26,11 @@ def _load_py_file(py_path, path): @@ -82,11 +26,11 @@ def _load_py_file(py_path, path):
82 msg = ('Could not open settings file {}. Please ' 26 msg = ('Could not open settings file {}. Please '
83 'check if the file exists and if user ' 27 'check if the file exists and if user '
84 'has read rights.').format(py_path) 28 'has read rights.').format(py_path)
85 - raise InaccessiblePySettings(msg) 29 + raise InaccessibleSettings(msg)
86 30
87 except SyntaxError as excpt: 31 except SyntaxError as excpt:
88 msg = ('Syntax Error: {}'.format(excpt)) 32 msg = ('Syntax Error: {}'.format(excpt))
89 - raise InaccessiblePySettings(msg) 33 + raise InaccessibleSettings(msg)
90 34
91 finally: 35 finally:
92 sys.path = original_path 36 sys.path = original_path
@@ -103,12 +47,9 @@ def load_py_settings(): @@ -103,12 +47,9 @@ def load_py_settings():
103 settings_module = settings_file.split('.')[-2].split('/')[-1] 47 settings_module = settings_file.split('.')[-2].split('/')[-1]
104 py_path = "/".join(settings_file.split('/')[:-1]) 48 py_path = "/".join(settings_file.split('/')[:-1])
105 49
106 - global USING_YAML_SETTINGS  
107 - if not os.path.exists(py_path) and not USING_YAML_SETTINGS: 50 + if not os.path.exists(py_path):
108 msg = "The py file {} does not exist".format(py_path) 51 msg = "The py file {} does not exist".format(py_path)
109 - raise InaccessiblePySettings(msg)  
110 - elif USING_YAML_SETTINGS:  
111 - return {} 52 + raise InaccessibleSettings(msg)
112 53
113 py_settings = _load_py_file(settings_module, py_path) 54 py_settings = _load_py_file(settings_module, py_path)
114 55
@@ -128,10 +69,6 @@ def load_py_settings(): @@ -128,10 +69,6 @@ def load_py_settings():
128 def load_colab_apps(): 69 def load_colab_apps():
129 plugins_dir = os.getenv('COLAB_PLUGINS', '/etc/colab/plugins.d/') 70 plugins_dir = os.getenv('COLAB_PLUGINS', '/etc/colab/plugins.d/')
130 71
131 - global USING_YAML_SETTINGS  
132 - if USING_YAML_SETTINGS:  
133 - return {}  
134 -  
135 COLAB_APPS = {} 72 COLAB_APPS = {}
136 73
137 # Try to read settings from plugins.d 74 # Try to read settings from plugins.d
@@ -159,23 +96,3 @@ def load_colab_apps(): @@ -159,23 +96,3 @@ def load_colab_apps():
159 COLAB_APPS[app_name][key] = value 96 COLAB_APPS[app_name][key] = value
160 97
161 return {'COLAB_APPS': COLAB_APPS} 98 return {'COLAB_APPS': COLAB_APPS}
162 -  
163 -  
164 -def parse_yml_menus(yaml_settings):  
165 - if 'COLAB_APPS' in yaml_settings:  
166 - for key, plugin in yaml_settings['COLAB_APPS'].items():  
167 - if 'menu' in plugin:  
168 - parse_yml_tuples(yaml_settings['COLAB_APPS'][key]['menu'])  
169 -  
170 -  
171 -def parse_yml_tuples(menu):  
172 - dict_links = menu['links']  
173 - dict_auth_links = menu['auth_links']  
174 - menu['links'] = tuple()  
175 - menu['auth_links'] = tuple()  
176 -  
177 - for key, value in dict_links.items():  
178 - menu['links'] += ((key, value),)  
179 -  
180 - for key, value in dict_auth_links.items():  
181 - menu['auth_links'] += ((key, value),)  
@@ -24,8 +24,6 @@ REQUIREMENTS = [ @@ -24,8 +24,6 @@ REQUIREMENTS = [
24 'django-tastypie==0.11.0', 24 'django-tastypie==0.11.0',
25 'gunicorn==19.1.0', 25 'gunicorn==19.1.0',
26 'eventlet==0.15.2', 26 'eventlet==0.15.2',
27 - 'PyYAML==3.11',  
28 - 'yamlordereddictloader==0.1.1',  
29 27
30 # Deps for sentry client (raven) 28 # Deps for sentry client (raven)
31 'raven==3.5.2', 29 'raven==3.5.2',
tests/config_settings.py
View file @beb229f
@@ -1,11 +0,0 @@ @@ -1,11 +0,0 @@
1 -SECRET_KEY = 'ddddddddddddddddddddddddddddddddddddddddddddddddddddddaddddddddd'  
2 -  
3 -DATABASES = {  
4 - 'default': {  
5 - 'ENGINE': 'django.db.backends.postgresql_psycopg2',  
6 - 'HOST': 'localhost',  
7 - 'NAME': 'colab',  
8 - 'USER': 'colab',  
9 - 'PASSWORD': 'colab',  
10 - }  
11 -}  
@@ -4,11 +4,9 @@ import os @@ -4,11 +4,9 @@ import os
4 import sys 4 import sys
5 5
6 os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings' 6 os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
7 -os.environ['COLAB_SETTINGS'] = 'tests/config_settings.py'  
8 -os.environ['COLAB_YAML_SETTINGS'] = 'tests/settings.yaml'  
9 os.environ['COLAB_PLUGINS'] = 'tests/plugins.d' 7 os.environ['COLAB_PLUGINS'] = 'tests/plugins.d'
10 os.environ['COVERAGE_PROCESS_START'] = '.coveragerc' 8 os.environ['COVERAGE_PROCESS_START'] = '.coveragerc'
11 -os.environ['REUSE_DB'] = '0' 9 +
12 10
13 import django 11 import django
14 import coverage 12 import coverage
tests/settings.py
  Diff comments   View file @2bcbd24
@@ -32,8 +32,19 @@ LOGGING = { @@ -32,8 +32,19 @@ LOGGING = {
32 import os 32 import os
33 HAYSTACK_CONNECTIONS = { 33 HAYSTACK_CONNECTIONS = {
34 'default': { 34 'default': {
35 - 'ENGINE': 'haystack.backends.solr_backend.SolrEngine',  
36 - 'URL': 'http://127.0.0.1:8983/solr' 35 + 'ENGINE': 'haystack.backends.solr_backend.SolrEngine',
  36 + 'URL': 'http://127.0.0.1:8983/solr',
37 }, 37 },
38 } 38 }
39 39
  40 +SECRET_KEY = 'not-a-secret'
  41 +
  42 +DATABASES = {
  43 + 'default': {
  44 + 'ENGINE': 'django.db.backends.postgresql_psycopg2',
  45 + 'HOST': 'localhost',
  46 + 'NAME': 'colab',
  47 + 'USER': 'colab',
  48 + 'PASSWORD': 'colab',
  49 + }
  50 +}