From 0a4236ffbd335ae62a5b10a060624a75d58b4ff0 Mon Sep 17 00:00:00 2001 From: Alexandre Barbosa Date: Tue, 4 Aug 2015 15:53:00 -0300 Subject: [PATCH] Fix flake8 --- README.rst | 8 ++++---- colab_spb/admin.py | 2 +- colab_spb/models.py | 2 +- colab_spb/views.py | 2 +- setup.py | 9 +++++---- tests/config_settings.py | 11 +++++------ tests/plugins.d/gitlab.py | 12 ------------ tests/plugins.d/spb.py | 12 ++++++++++++ tests/settings.py | 4 +--- 9 files changed, 30 insertions(+), 32 deletions(-) delete mode 100644 tests/plugins.d/gitlab.py create mode 100644 tests/plugins.d/spb.py diff --git a/README.rst b/README.rst index 9564760..3eeca9f 100644 --- a/README.rst +++ b/README.rst @@ -61,15 +61,15 @@ To run Colab with development server you will have to: .. code-block:: colab-init-config > /etc/colab/settings.py - + 2- Edit the configuration file. Make sure you set everything you need including **database** credentials. - -3- Run the development server: + +3- Run the development server: .. code-block:: colab-admin runserver 0.0.0.0:8000 -**NOTE**: In case you want to keep the configuration file else where just set the +**NOTE**: In case you want to keep the configuration file else where just set the desired location in environment variable **COLAB_SETTINGS**. diff --git a/colab_spb/admin.py b/colab_spb/admin.py index 8c38f3f..4185d36 100644 --- a/colab_spb/admin.py +++ b/colab_spb/admin.py @@ -1,3 +1,3 @@ -from django.contrib import admin +# from django.contrib import admin # Register your models here. diff --git a/colab_spb/models.py b/colab_spb/models.py index 71a8362..0b4331b 100644 --- a/colab_spb/models.py +++ b/colab_spb/models.py @@ -1,3 +1,3 @@ -from django.db import models +# from django.db import models # Create your models here. diff --git a/colab_spb/views.py b/colab_spb/views.py index 91ea44a..fd0e044 100644 --- a/colab_spb/views.py +++ b/colab_spb/views.py @@ -1,3 +1,3 @@ -from django.shortcuts import render +# from django.shortcuts import render # Create your views here. diff --git a/setup.py b/setup.py index 57b1d39..a61c2f9 100644 --- a/setup.py +++ b/setup.py @@ -9,6 +9,7 @@ from setuptools import setup if os.environ.get('USER', '') == 'vagrant': del os.link + def read(*parts): return codecs.open(os.path.join(os.path.dirname(__file__), *parts), encoding='utf8').read() @@ -24,7 +25,7 @@ def find_version(*file_paths): setup( - name='colab-spb', + name='colab_spb', url='https://github.com/colab/colab-spb', description='Yet another Django reverse proxy application.', version=find_version('colab_spb/__init__.py'), @@ -35,9 +36,9 @@ setup( ], tests_require=['mock'], test_suite="tests.run.runtests", - author='Sergio Oliveira', - author_email='sergio@tracy.com.br', - license='GPL 2.0', + author='Macartur Sousa', + author_email='macartur.sc@gmail.com', + license='GPL 3.0', classifiers=[ 'Development Status :: 3 - Alpha', 'Environment :: Web Environment', diff --git a/tests/config_settings.py b/tests/config_settings.py index 98ad124..eebffe0 100644 --- a/tests/config_settings.py +++ b/tests/config_settings.py @@ -1,9 +1,8 @@ SECRET_KEY = 'ddddddddddddddddddddddddddddddddddddddddddddddddddddddaddddddddd' -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': 'colab.sqlite', - } +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': 'colab.sqlite', + } } - diff --git a/tests/plugins.d/gitlab.py b/tests/plugins.d/gitlab.py deleted file mode 100644 index 0af12cd..0000000 --- a/tests/plugins.d/gitlab.py +++ /dev/null @@ -1,12 +0,0 @@ -from django.utils.translation import ugettext_lazy as _ -from colab.plugins.utils.menu import colab_url_factory - -name = 'colab_spb' -verbose_name = 'Spb plugin' - -urls = { - 'include': 'colab_spb.urls', - 'namespace': 'spb', - 'prefix': 'spb', -} - diff --git a/tests/plugins.d/spb.py b/tests/plugins.d/spb.py new file mode 100644 index 0000000..157d1a8 --- /dev/null +++ b/tests/plugins.d/spb.py @@ -0,0 +1,12 @@ +from colab.plugins.utils.menu import colab_url_factory + +name = 'colab_spb' +verbose_name = 'Spb plugin' + +urls = { + 'include': 'colab_spb.urls', + 'namespace': 'spb', + 'prefix': 'spb', +} + +url = colab_url_factory("spb") diff --git a/tests/settings.py b/tests/settings.py index d7670d2..3ddd7a0 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -29,11 +29,9 @@ LOGGING = { }, } -import os HAYSTACK_CONNECTIONS = { 'default': { - 'ENGINE': 'haystack.backends.solr_backend.SolrEngine', + 'ENGINE': 'haystack.backends.solr_backend.SolrEngine', 'URL': 'http://127.0.0.1:8983/solr' }, } - -- libgit2 0.21.2