Commit 0a4236ffbd335ae62a5b10a060624a75d58b4ff0
1 parent
a6ea3966
Exists in
master
and in
34 other branches
Fix flake8
Signed-off-by: Alexandre Barbosa <alexandreab@live.com> Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
Showing
9 changed files
with
30 additions
and
32 deletions
Show diff stats
README.rst
... | ... | @@ -61,15 +61,15 @@ To run Colab with development server you will have to: |
61 | 61 | .. code-block:: |
62 | 62 | |
63 | 63 | colab-init-config > /etc/colab/settings.py |
64 | - | |
64 | + | |
65 | 65 | 2- Edit the configuration file. Make sure you set everything you need including **database** credentials. |
66 | - | |
67 | -3- Run the development server: | |
66 | + | |
67 | +3- Run the development server: | |
68 | 68 | |
69 | 69 | .. code-block:: |
70 | 70 | |
71 | 71 | colab-admin runserver 0.0.0.0:8000 |
72 | 72 | |
73 | 73 | |
74 | -**NOTE**: In case you want to keep the configuration file else where just set the | |
74 | +**NOTE**: In case you want to keep the configuration file else where just set the | |
75 | 75 | desired location in environment variable **COLAB_SETTINGS**. | ... | ... |
colab_spb/admin.py
colab_spb/models.py
colab_spb/views.py
setup.py
... | ... | @@ -9,6 +9,7 @@ from setuptools import setup |
9 | 9 | if os.environ.get('USER', '') == 'vagrant': |
10 | 10 | del os.link |
11 | 11 | |
12 | + | |
12 | 13 | def read(*parts): |
13 | 14 | return codecs.open(os.path.join(os.path.dirname(__file__), *parts), |
14 | 15 | encoding='utf8').read() |
... | ... | @@ -24,7 +25,7 @@ def find_version(*file_paths): |
24 | 25 | |
25 | 26 | |
26 | 27 | setup( |
27 | - name='colab-spb', | |
28 | + name='colab_spb', | |
28 | 29 | url='https://github.com/colab/colab-spb', |
29 | 30 | description='Yet another Django reverse proxy application.', |
30 | 31 | version=find_version('colab_spb/__init__.py'), |
... | ... | @@ -35,9 +36,9 @@ setup( |
35 | 36 | ], |
36 | 37 | tests_require=['mock'], |
37 | 38 | test_suite="tests.run.runtests", |
38 | - author='Sergio Oliveira', | |
39 | - author_email='sergio@tracy.com.br', | |
40 | - license='GPL 2.0', | |
39 | + author='Macartur Sousa', | |
40 | + author_email='macartur.sc@gmail.com', | |
41 | + license='GPL 3.0', | |
41 | 42 | classifiers=[ |
42 | 43 | 'Development Status :: 3 - Alpha', |
43 | 44 | 'Environment :: Web Environment', | ... | ... |
tests/config_settings.py
1 | 1 | SECRET_KEY = 'ddddddddddddddddddddddddddddddddddddddddddddddddddddddaddddddddd' |
2 | 2 | |
3 | -DATABASES = { | |
4 | - 'default': { | |
5 | - 'ENGINE': 'django.db.backends.sqlite3', | |
6 | - 'NAME': 'colab.sqlite', | |
7 | - } | |
3 | +DATABASES = { | |
4 | + 'default': { | |
5 | + 'ENGINE': 'django.db.backends.sqlite3', | |
6 | + 'NAME': 'colab.sqlite', | |
7 | + } | |
8 | 8 | } |
9 | - | ... | ... |
tests/plugins.d/gitlab.py
... | ... | @@ -1,12 +0,0 @@ |
1 | -from django.utils.translation import ugettext_lazy as _ | |
2 | -from colab.plugins.utils.menu import colab_url_factory | |
3 | - | |
4 | -name = 'colab_spb' | |
5 | -verbose_name = 'Spb plugin' | |
6 | - | |
7 | -urls = { | |
8 | - 'include': 'colab_spb.urls', | |
9 | - 'namespace': 'spb', | |
10 | - 'prefix': 'spb', | |
11 | -} | |
12 | - |
tests/settings.py
... | ... | @@ -29,11 +29,9 @@ LOGGING = { |
29 | 29 | }, |
30 | 30 | } |
31 | 31 | |
32 | -import os | |
33 | 32 | HAYSTACK_CONNECTIONS = { |
34 | 33 | 'default': { |
35 | - 'ENGINE': 'haystack.backends.solr_backend.SolrEngine', | |
34 | + 'ENGINE': 'haystack.backends.solr_backend.SolrEngine', | |
36 | 35 | 'URL': 'http://127.0.0.1:8983/solr' |
37 | 36 | }, |
38 | 37 | } |
39 | - | ... | ... |