Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
pystencils
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stephan Seitz
pystencils
Commits
fba38bb2
Commit
fba38bb2
authored
4 years ago
by
Markus Holzer
Browse files
Options
Downloads
Patches
Plain Diff
Fixed pandas deprication warning
parent
c83faa47
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+2
-0
2 additions, 0 deletions
.gitlab-ci.yml
conftest.py
+4
-2
4 additions, 2 deletions
conftest.py
pystencils/runhelper/db.py
+1
-1
1 addition, 1 deletion
pystencils/runhelper/db.py
with
7 additions
and
3 deletions
.gitlab-ci.yml
+
2
−
0
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
...
...
This diff is collapsed.
Click to expand it.
conftest.py
+
4
−
2
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)
This diff is collapsed.
Click to expand it.
pystencils/runhelper/db.py
+
1
−
1
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
]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment