Merge remote-tracking branch 'origin/master'

Makefile

@@ -23,7 +23,7 @@ develop:
 	@echo "--> Installing / updating python dependencies for development"
 	pip install -q pip-tools
 	pip-sync requirements.txt
-	pip install -q -r requirements.txt
+	pip install -q -r requirements.txt -r dev-requirements.txt
 	pip install -e .
 	@echo ""
 
@@ -69,3 +69,14 @@ update-deps:
 	pip-compile -U > /dev/null
 	pip-compile > /dev/null
 	git --no-pager diff requirements.txt
+
+sync-deps:
+	pip install -r requirements.txt -r dev-requirements.txt -e .
+
+release:
+	git push --tags
+	rm -rf /tmp/olapy
+	git clone . /tmp/olapy
+	cd /tmp/olapy ; python setup.py sdist
+	cd /tmp/olapy ; python setup.py sdist upload
+

dev-requirements.txt

+# Tools / dev / testing
+tox
+pytest
+pytest-cov
+xmla
+pip-tools
+flake8
+flake8-tidy-imports
+mccabe
+isort
+yapf
+pylint
+PrettyTable
+py-cpuinfo
+gprof2dot
+

olapy/core/mdx/executor/execute.py

@@ -15,7 +15,7 @@ import pandas.io.sql as psql
 from ..tools.config_file_parser import ConfigParser
 from ..tools.connection import MyDB
 
-RUNNING_TOX = 'RUNTING_TOX' in os.environ
+RUNNING_TOX = 'RUNNING_TOX' in os.environ
 
 
 class MdxEngine:
@@ -121,7 +121,7 @@ class MdxEngine:
     def _get_tables_name(self):
         """
         get all tables names
-        
+
         :return: list tables names
         """
         return self.tables_loaded.keys()
@@ -318,7 +318,7 @@ class MdxEngine:
     def _get_star_schema_dataframe(self, cube_name):
         """
         merge all DataFrames as star schema
-        
+
         :param cube_name: cube name with which we want to generate a star schema model
         :return: star schema DataFrame
         """
@@ -358,7 +358,7 @@ class MdxEngine:
     def get_cube(self):
         """
         get path to the cube (example /home_directory/your_user_name/olapy-data/cubes)
-        
+
         :return: path to the cube
         """
         return os.path.join(self.cube_path, self.cube)
@@ -367,27 +367,27 @@ class MdxEngine:
     def get_tuples(self, query, start=None, stop=None):
         """
         get all tuples in the mdx query
-        
+
         example:
-        
-        
+
+
             SELECT {[Geography].[Geography].[All Continent].Members,
                     [Geography].[Geography].[Continent].[Europe]
-     
+
             } ON COLUMNS,
-            
+
                    {[Product].[Product].[Company]
-                    
+
             } ON ROWS
-            
+
             FROM {sales}
-            
+
         It returns [ ['Geography','Geography','Continent'],
                     ['Geography','Geography','Continent','Europe'],
                     ['Product','Product','Company']
                 ]
-                    
-            
+
+
         :param query: mdx query
         :param start: key-word in the query where we start (examples start = SELECT)
         :param stop:  key-word in the query where we stop (examples start = ON ROWS)
@@ -417,7 +417,7 @@ class MdxEngine:
     def decorticate_query(self, query):
         """
         get all tuples that exists in the MDX Query by axes
-        
+
         :param query: MDX Query
         :return: dict of axis as key and tuples as value
         """

requirements.in

@@ -19,18 +19,3 @@ Flask-WTF==0.12
 plotly==1.12.9
 XlsxWriter==0.9.3
 
-# Tools / dev / testing
-tox<3
-pytest<4
-pytest-cov
-xmla
-pip-tools
-flake8
-flake8-tidy-imports
-mccabe
-isort
-yapf
-pylint
-PrettyTable
-py-cpuinfo
-gprof2dot
\ No newline at end of file

requirements.txt

@@ -4,62 +4,29 @@
 #
 #    pip-compile --output-file requirements.txt requirements.in
 #
-astroid==1.5.2            # via pylint
-backports.functools-lru-cache==1.3  # via astroid, pylint
-click==6.7                # via flask, pip-tools
-configparser==3.5.0       # via flake8, pylint
-coverage==4.3.4           # via pytest-cov
-enum34==1.1.6             # via astroid, flake8
-first==2.0.1              # via pip-tools
-flake8-tidy-imports==1.0.6
-flake8==3.3.0
-flask-login==0.3.2
-flask-script==2.0.5
-flask-session==0.3.0
-flask-sqlalchemy==2.1
-flask-wtf==0.12
+click==6.7                # via flask
+Flask-Login==0.3.2
+Flask-Script==2.0.5
+Flask-Session==0.3.0
+Flask-SQLAlchemy==2.1
+Flask-WTF==0.12
 flask==0.12.1
-gprof2dot==2016.10.13
 grako==3.22.0
-isort==4.2.5
 itsdangerous==0.24        # via flask
 jinja2==2.9.6             # via flask
-lazy-object-proxy==1.2.2  # via astroid
 lxml==3.6.0
 markupsafe==1.0           # via jinja2
-mccabe==0.6.1
 numpy==1.12.1             # via pandas
-olap==0.3                 # via xmla
 pandas==0.19.2
-pip-tools==1.9.0
 plotly==1.12.9
-pluggy==0.4.0             # via tox
-prettytable==0.7.2
 psycopg2==2.7.1
-py-cpuinfo==3.2.0
-py==1.4.33                # via pytest, tox
-pycodestyle==2.3.1        # via flake8
-pyflakes==1.5.0           # via flake8
-pylint==1.7.1
-pytest-cov==2.4.0
-pytest==3.0.7
 python-dateutil==2.6.0    # via pandas
 pytz==2017.2              # via pandas, plotly, spyne
-requests==1.2.3           # via plotly, xmla
-singledispatch==3.4.0.3   # via astroid, pylint
-six==1.10.0               # via astroid, pip-tools, plotly, pylint, python-dateutil, singledispatch
+requests==2.13.0          # via plotly
+six==1.10.0               # via plotly, python-dateutil
 spyne==2.12.14
 sqlalchemy==1.0.17
-suds==0.4                 # via xmla
-tox==2.7.0
 treelib==1.3.5
-virtualenv==15.1.0        # via tox
 werkzeug==0.12.1          # via flask, flask-wtf
-wrapt==1.10.10            # via astroid
 wtforms==2.1
-xlsxwriter==0.9.3
-xmla==0.7.2
-yapf==0.16.1
-zope.event==4.2.0         # via zope.schema
-zope.interface==4.4.0     # via olap, zope.schema
-zope.schema==4.4.2        # via olap
+XlsxWriter==0.9.3

setup.py

@@ -9,7 +9,7 @@ from pip.download import PipSession
 from pip.req import parse_requirements
 from setuptools import find_packages, setup
 
-RUNNING_TOX = 'RUNTING_TOX' in os.environ
+RUNNING_TOX = 'RUNNING_TOX' in os.environ
 
 session = PipSession()
 _install_requires = parse_requirements('requirements.txt', session=session)

tests/test_xmla_notox.py

@@ -15,7 +15,7 @@ from tests.xs0_responses import TEST_QUERY_AXIS0
 
 HOST = "127.0.0.1"
 PORT = 8230
-RUNNING_TOX = 'RUNTING_TOX' in os.environ
+RUNNING_TOX = 'RUNNING_TOX' in os.environ
 
 
 class Member(object):

tox.ini

@@ -4,11 +4,11 @@ envlist = py27
 
 [testenv]
 setenv=
-  RUNTING_TOX=true
+  RUNNING_TOX=true
   HOME_DIR = {homedir}
 whitelist_externals=
   make
 commands=
-  pip install -q -r requirements.txt
+  pip install -q -r requirements.txt -r dev-requirements.txt
   pytest tests
   make lint