Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion popmon/notebooks/popmon_tutorial_advanced.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
},
"outputs": [],
"source": [
"from IPython.core.display import HTML, display\n",
"from IPython.core.display import HTML\n",
"from IPython.display import display\n",
"\n",
"display(HTML(\"<style>.container { width:80% !important; }</style>\"))\n",
"display(HTML(\"<style>div.output_scroll { height: 44em; }</style>\"))"
Expand Down
3 changes: 2 additions & 1 deletion popmon/notebooks/popmon_tutorial_basic.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
"outputs": [],
"source": [
"# (optional) Adjust the jupyter notebook style for easier navigation of the reports\n",
"from IPython.core.display import HTML, display\n",
"from IPython.core.display import HTML\n",
"from IPython.display import display\n",
"\n",
"# Wider notebook\n",
"display(HTML(\"<style>.container { width:80% !important; }</style>\"))\n",
Expand Down
3 changes: 2 additions & 1 deletion popmon/notebooks/popmon_tutorial_reports.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@
"metadata": {},
"outputs": [],
"source": [
"from IPython.core.display import HTML, display\n",
"from IPython.core.display import HTML\n",
"from IPython.display import display\n",
"\n",
"\n",
"def show_image(plot):\n",
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies = [
"numpy>=1.18.0",
"pandas>=0.25.1",
"scipy>=1.5.2",
"histogrammar>=1.0.34",
"histogrammar>=1.1.1",
"phik",
"jinja2",
"tqdm",
Expand Down
4 changes: 2 additions & 2 deletions tests/popmon/analysis/test_hist_numpy.py
Original file line number Diff line number Diff line change
Expand Up @@ -448,5 +448,5 @@ def test_datatype():
df, hist1, hist2, hist3 = get_test_histograms1()

assert hist1.datatype == str
np.testing.assert_array_equal(hist2.datatype, [np.number, str])
np.testing.assert_array_equal(hist3.datatype, [np.datetime64, np.number, str])
np.testing.assert_array_equal(hist2.datatype, [float, str])
np.testing.assert_array_equal(hist3.datatype, [np.datetime64, float, str])
2 changes: 1 addition & 1 deletion tests/popmon/hist/resource/age.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,4 @@
"nanflow:type": "Count",
"origin": 0.0},
"type": "SparselyBin",
"version": "1.0"}
"version": "1.1"}
2 changes: 1 addition & 1 deletion tests/popmon/hist/resource/company.json
Original file line number Diff line number Diff line change
Expand Up @@ -401,4 +401,4 @@
"bins:type": "Count",
"entries": 400.0},
"type": "Categorize",
"version": "1.0"}
"version": "1.1"}
2 changes: 1 addition & 1 deletion tests/popmon/hist/resource/date.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
"nanflow:type": "Count",
"origin": 1262563200000000000},
"type": "SparselyBin",
"version": "1.0"}
"version": "1.1"}
2 changes: 1 addition & 1 deletion tests/popmon/hist/resource/eyesColor.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
"bins:type": "Count",
"entries": 400.0},
"type": "Categorize",
"version": "1.0"}
"version": "1.1"}
2 changes: 1 addition & 1 deletion tests/popmon/hist/resource/gender.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"bins:type": "Count",
"entries": 400.0},
"type": "Categorize",
"version": "1.0"}
"version": "1.1"}
2 changes: 1 addition & 1 deletion tests/popmon/hist/resource/isActive.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"bins:type": "Count",
"entries": 400.0},
"type": "Categorize",
"version": "1.0"}
"version": "1.1"}
2 changes: 1 addition & 1 deletion tests/popmon/hist/resource/isActive_age.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,4 +156,4 @@
"bins:type": "SparselyBin",
"entries": 400.0},
"type": "Categorize",
"version": "1.0"}
"version": "1.1"}
2 changes: 1 addition & 1 deletion tests/popmon/hist/resource/latitude.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@
"nanflow:type": "Count",
"origin": 0},
"type": "SparselyBin",
"version": "1.0"}
"version": "1.1"}
2 changes: 1 addition & 1 deletion tests/popmon/hist/resource/latitude_longitude.json
Original file line number Diff line number Diff line change
Expand Up @@ -595,4 +595,4 @@
"nanflow:type": "Count",
"origin": 0},
"type": "SparselyBin",
"version": "1.0"}
"version": "1.1"}
2 changes: 1 addition & 1 deletion tests/popmon/hist/resource/longitude.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@
"nanflow:type": "Count",
"origin": 0},
"type": "SparselyBin",
"version": "1.0"}
"version": "1.1"}
2 changes: 1 addition & 1 deletion tests/popmon/hist/resource/transaction.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,5 @@
"nanflow:type": "Count",
"nanflow": 0.0
},
"version": "1.0"
"version": "1.1"
}
4 changes: 2 additions & 2 deletions tests/popmon/hist/test_histogram.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,5 +344,5 @@ def test_datatype():

assert isinstance(None, hist0.datatype)
assert hist1.datatype == str
np.testing.assert_array_equal(hist2.datatype, [np.number, str])
np.testing.assert_array_equal(hist3.datatype, [np.datetime64, np.number, str])
np.testing.assert_array_equal(hist2.datatype, [float, str])
np.testing.assert_array_equal(hist3.datatype, [np.datetime64, float, str])
Loading