Skip to content

Commit

Permalink
Merge pull request #151 from mistercrunch/lint
Browse files Browse the repository at this point in the history
Linting
  • Loading branch information
mistercrunch committed Feb 29, 2016
2 parents 74b32ac + 0a84259 commit bb46887
Show file tree
Hide file tree
Showing 16 changed files with 94 additions and 199 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Panoramix
[![Join the chat at https://gitter.im/mistercrunch/panoramix](https://badges.gitter.im/mistercrunch/panoramix.svg)](https://gitter.im/mistercrunch/panoramix?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
![img](https://travis-ci.org/mistercrunch/panoramix.svg?branch=master)
[![Coverage Status](https://coveralls.io/repos/mistercrunch/panoramix/badge.svg?branch=master&service=github)](https://coveralls.io/github/mistercrunch/panoramix?branch=master)
[![Code Health](https://landscape.io/github/mistercrunch/panoramix/immune_to_filter/landscape.svg?style=flat)](https://landscape.io/github/mistercrunch/panoramix/immune_to_filter)

Panoramix is a data exploration platform designed to be visual, intuitive
and interactive.
Expand Down
3 changes: 1 addition & 2 deletions panoramix/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
from flask.ext.appbuilder import SQLA, AppBuilder, IndexView
from flask.ext.appbuilder.baseviews import expose
from flask.ext.migrate import Migrate
from panoramix import config


APP_DIR = os.path.dirname(__file__)
Expand Down Expand Up @@ -34,4 +33,4 @@ def index(self):
sm = appbuilder.sm

get_session = appbuilder.get_session
from panoramix import views
from panoramix import config, views
14 changes: 7 additions & 7 deletions panoramix/config.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
"""
All configuration in this file can be overridden by providing a local_config
in your PYTHONPATH.
There' a ``from local_config import *`` at the end of this file.
"""
import os
from flask_appbuilder.security.manager import AUTH_DB
# from flask_appbuilder.security.manager import (
# AUTH_OID, AUTH_REMOTE_USER, AUTH_DB, AUTH_LDAP, AUTH_OAUTH)
BASE_DIR = os.path.abspath(os.path.dirname(__file__))
from dateutil import tz

"""
All configuration in this file can be overridden by providing a local_config
in your PYTHONPATH.
There' a ``from local_config import *`` at the end of this file.
"""

# ---------------------------------------------------------
# Panoramix specifix config
Expand Down Expand Up @@ -133,5 +133,5 @@

try:
from panoramix_config import *
except:
except Exception:
pass
34 changes: 17 additions & 17 deletions panoramix/data/countries.py
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@
"area": 4167,
"cioc": "",
"cca2": "PF",
"capital": "Papeet\u0113",
"capital": u"Papeet\u0113",
"lat": -15,
"lng": -140,
"cca3": "PYF"
Expand Down Expand Up @@ -754,7 +754,7 @@
"area": 56785,
"cioc": "TOG",
"cca2": "TG",
"capital": "Lom\u00e9",
"capital": u"Lom\u00e9",
"lat": 8,
"lng": 1.16666666,
"cca3": "TGO"
Expand All @@ -774,7 +774,7 @@
"area": 549,
"cioc": "GUM",
"cca2": "GU",
"capital": "Hag\u00e5t\u00f1a",
"capital": u"Hag\u00e5t\u00f1a",
"lat": 13.46666666,
"lng": 144.78333333,
"cca3": "GUM"
Expand Down Expand Up @@ -834,7 +834,7 @@
"area": 51100,
"cioc": "CRC",
"cca2": "CR",
"capital": "San Jos\u00e9",
"capital": u"San Jos\u00e9",
"lat": 10,
"lng": -84,
"cca3": "CRI"
Expand All @@ -844,7 +844,7 @@
"area": 475442,
"cioc": "CMR",
"cca2": "CM",
"capital": "Yaound\u00e9",
"capital": u"Yaound\u00e9",
"lat": 6,
"lng": 12,
"cca3": "CMR"
Expand Down Expand Up @@ -1070,7 +1070,7 @@
"cca3": "BLR"
},
{
"name": "Saint Barth\u00e9lemy",
"name": u"Saint Barth\u00e9lemy",
"area": 21,
"cioc": "",
"cca2": "BL",
Expand Down Expand Up @@ -1274,7 +1274,7 @@
"area": 7747,
"cioc": "",
"cca2": "TF",
"capital": "Port-aux-Fran\u00e7ais",
"capital": u"Port-aux-Fran\u00e7ais",
"lat": -49.25,
"lng": 69.167,
"cca3": "ATF"
Expand Down Expand Up @@ -1380,7 +1380,7 @@
"cca3": "PER"
},
{
"name": "R\u00e9union",
"name": u"R\u00e9union",
"area": 2511,
"cioc": "",
"cca2": "RE",
Expand Down Expand Up @@ -1484,7 +1484,7 @@
"area": 1141748,
"cioc": "COL",
"cca2": "CO",
"capital": "Bogot\u00e1",
"capital": u"Bogot\u00e1",
"lat": 4,
"lng": -72,
"cca3": "COL"
Expand Down Expand Up @@ -1534,7 +1534,7 @@
"area": 33846,
"cioc": "MDA",
"cca2": "MD",
"capital": "Chi\u0219in\u0103u",
"capital": u"Chi\u0219in\u0103u",
"lat": 47,
"lng": 29,
"cca3": "MDA"
Expand Down Expand Up @@ -1594,7 +1594,7 @@
"area": 300,
"cioc": "MDV",
"cca2": "MV",
"capital": "Mal\u00e9",
"capital": u"Mal\u00e9",
"lat": 3.25,
"lng": 73,
"cca3": "MDV"
Expand All @@ -1620,7 +1620,7 @@
"cca3": "SPM"
},
{
"name": "Cura\u00e7ao",
"name": u"Cura\u00e7ao",
"area": 444,
"cioc": "",
"cca2": "CW",
Expand Down Expand Up @@ -1704,7 +1704,7 @@
"area": 1393,
"cioc": "",
"cca2": "FO",
"capital": "T\u00f3rshavn",
"capital": u"T\u00f3rshavn",
"lat": 62,
"lng": -7,
"cca3": "FRO"
Expand Down Expand Up @@ -1860,7 +1860,7 @@
"cca3": "TUV"
},
{
"name": "\u00c5land Islands",
"name": u"\u00c5land Islands",
"area": 1580,
"cioc": "",
"cca2": "AX",
Expand Down Expand Up @@ -1914,7 +1914,7 @@
"area": 8515767,
"cioc": "BRA",
"cca2": "BR",
"capital": "Bras\u00edlia",
"capital": u"Bras\u00edlia",
"lat": -10,
"lng": -55,
"cca3": "BRA"
Expand Down Expand Up @@ -2334,7 +2334,7 @@
"area": 266000,
"cioc": "",
"cca2": "EH",
"capital": "El Aai\u00fan",
"capital": u"El Aai\u00fan",
"lat": 24.5,
"lng": -13,
"cca3": "ESH"
Expand Down Expand Up @@ -2394,7 +2394,7 @@
"area": 18575,
"cioc": "",
"cca2": "NC",
"capital": "Noum\u00e9a",
"capital": u"Noum\u00e9a",
"lat": -21.5,
"lng": 165.5,
"cca3": "NCL"
Expand Down
1 change: 0 additions & 1 deletion panoramix/migrations/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from sqlalchemy import engine_from_config, pool
from logging.config import fileConfig
import logging
from panoramix import db, models
from flask.ext.appbuilder import Base

# this is the Alembic Config object, which provides
Expand Down
5 changes: 0 additions & 5 deletions panoramix/migrations/versions/1e2841a4128_.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,10 @@

from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import mysql

def upgrade():
### commands auto generated by Alembic - please adjust! ###
op.add_column('table_columns', sa.Column('expression', sa.Text(), nullable=True))
### end Alembic commands ###


def downgrade():
### commands auto generated by Alembic - please adjust! ###
op.drop_column('table_columns', 'expression')
### end Alembic commands ###
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import mysql

def upgrade():
op.add_column('datasources', sa.Column('offset', sa.Integer(), nullable=True))
Expand Down
1 change: 0 additions & 1 deletion panoramix/migrations/versions/430039611635_log_more.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import mysql

def upgrade():
op.add_column('logs', sa.Column('dashboard_id', sa.Integer(), nullable=True))
Expand Down
3 changes: 2 additions & 1 deletion panoramix/migrations/versions/43df8de3a5f4_dash_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@

from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import mysql


def upgrade():
op.add_column('dashboards', sa.Column('json_metadata', sa.Text(), nullable=True))


def downgrade():
op.drop_column('dashboards', 'json_metadata')
2 changes: 1 addition & 1 deletion panoramix/migrations/versions/5a7bad26f2a7_.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import mysql


def upgrade():
op.add_column('dashboards', sa.Column('css', sa.Text(), nullable=True))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import mysql

def upgrade():
op.add_column('slices', sa.Column('description', sa.Text(), nullable=True))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import mysql


def upgrade():
Expand Down
Loading

0 comments on commit bb46887

Please sign in to comment.