Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
olapy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
2
Merge Requests
2
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
olapy
Commits
34029657
Commit
34029657
authored
Apr 20, 2017
by
Mouadh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tox tests fix
parent
892e6892
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
14 deletions
+9
-14
olapy/core/mdx/executor/execute.py
olapy/core/mdx/executor/execute.py
+8
-14
tox.ini
tox.ini
+1
-0
No files found.
olapy/core/mdx/executor/execute.py
View file @
34029657
...
@@ -17,7 +17,6 @@ from ..tools.connection import MyDB
...
@@ -17,7 +17,6 @@ from ..tools.connection import MyDB
RUNNING_TOX
=
'RUNTING_TOX'
in
os
.
environ
RUNNING_TOX
=
'RUNTING_TOX'
in
os
.
environ
class
MdxEngine
:
class
MdxEngine
:
"""
"""
The principal class for executing a query
The principal class for executing a query
...
@@ -75,14 +74,12 @@ class MdxEngine:
...
@@ -75,14 +74,12 @@ class MdxEngine:
'''
'''
# get csv files folders (cubes)
# get csv files folders (cubes)
# toxworkdir does not expanduser properly
if
RUNNING_TOX
:
if
RUNNING_TOX
:
location
=
os
.
path
.
join
(
home_directory
=
os
.
environ
.
get
(
'HOME_DIR'
)
os
.
path
.
abspath
(
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
".."
,
".."
,
".."
,
".."
)),
MdxEngine
.
CUBE_FOLDER
)
else
:
else
:
home_directory
=
expanduser
(
"~"
)
home_directory
=
expanduser
(
"~"
)
location
=
os
.
path
.
join
(
home_directory
,
'olapy-data'
,
location
=
os
.
path
.
join
(
home_directory
,
'olapy-data'
,
cls
.
CUBE_FOLDER
)
cls
.
CUBE_FOLDER
)
...
@@ -113,13 +110,10 @@ class MdxEngine:
...
@@ -113,13 +110,10 @@ class MdxEngine:
def
_get_default_cube_directory
(
self
):
def
_get_default_cube_directory
(
self
):
if
RUNNING_TOX
:
if
RUNNING_TOX
:
return
os
.
path
.
join
(
home_directory
=
os
.
environ
.
get
(
'HOME_DIR'
)
os
.
path
.
abspath
(
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
".."
,
".."
,
".."
,
".."
)),
MdxEngine
.
CUBE_FOLDER
)
else
:
else
:
home_directory
=
expanduser
(
"~"
)
home_directory
=
expanduser
(
"~"
)
return
os
.
path
.
join
(
home_directory
,
'olapy-data'
,
self
.
cube_folder
)
return
os
.
path
.
join
(
home_directory
,
'olapy-data'
,
self
.
cube_folder
)
def
_get_tables_name
(
self
):
def
_get_tables_name
(
self
):
...
...
tox.ini
View file @
34029657
...
@@ -5,6 +5,7 @@ envlist = py27
...
@@ -5,6 +5,7 @@ envlist = py27
[testenv]
[testenv]
setenv
=
setenv
=
RUNTING_TOX
=
true
RUNTING_TOX
=
true
HOME_DIR
=
{homedir}
whitelist_externals
=
whitelist_externals
=
make
make
commands
=
commands
=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment