Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Sebastian Bindgen
pystencils
Commits
fba38bb2
Commit
fba38bb2
authored
Jun 18, 2020
by
Markus Holzer
Browse files
Fixed pandas deprication warning
parent
c83faa47
Changes
3
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
fba38bb2
...
...
@@ -13,6 +13,7 @@ tests-and-coverage:
-
$ENABLE_NIGHTLY_BUILDS
image
:
i10git.cs.fau.de:5005/pycodegen/pycodegen/full
script
:
-
env
-
pip list
-
export NUM_CORES=$(nproc --all)
-
mkdir -p ~/.config/matplotlib
...
...
@@ -73,6 +74,7 @@ ubuntu:
-
$ENABLE_NIGHTLY_BUILDS
image
:
i10git.cs.fau.de:5005/pycodegen/pycodegen/ubuntu
script
:
-
pip install --upgrade pytest
-
mkdir -p ~/.config/matplotlib
-
echo "backend:template" > ~/.config/matplotlib/matplotlibrc
-
sed -i 's/--doctest-modules //g' pytest.ini
...
...
conftest.py
View file @
fba38bb2
...
...
@@ -151,7 +151,8 @@ class IPyNbFile(pytest.File):
warnings
.
filterwarnings
(
"ignore"
,
"IPython.core.inputsplitter is deprecated"
)
notebook
=
nbformat
.
read
(
notebook_contents
,
4
)
code
,
_
=
exporter
.
from_notebook_node
(
notebook
)
yield
IPyNbTest
.
from_parent
(
name
=
self
.
name
,
parent
=
self
,
code
=
code
)
yield
IPyNbTest
(
self
.
name
,
self
,
code
)
# pytest v 2.4>: yield IPyNbTest.from_parent(name=self.name, parent=self, code=code)
def
teardown
(
self
):
pass
...
...
@@ -160,4 +161,5 @@ class IPyNbFile(pytest.File):
def
pytest_collect_file
(
path
,
parent
):
glob_exprs
=
[
"*demo*.ipynb"
,
"*tutorial*.ipynb"
,
"test_*.ipynb"
]
if
any
(
path
.
fnmatch
(
g
)
for
g
in
glob_exprs
):
return
IPyNbFile
.
from_parent
(
fspath
=
path
,
parent
=
parent
)
return
IPyNbFile
(
path
,
parent
)
# pytest v 2.4 >: return IPyNbFile.from_parent(fspath=path, parent=parent)
pystencils/runhelper/db.py
View file @
fba38bb2
...
...
@@ -120,7 +120,7 @@ class Database:
Returns:
pandas data frame
"""
from
pandas
.io.json
import
json_normalize
from
pandas
import
json_normalize
query_result
=
self
.
filter_params
(
parameter_query
)
attributes
=
[
e
.
attributes
for
e
in
query_result
]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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