Skip to content

Sync Fork from Upstream Repo #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 90 commits into from
Aug 14, 2021
Merged
Changes from 1 commit
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
2a2ee8b
DOC: Add histogram category order example (#2779)
hweecat Oct 2, 2020
5334bf0
Merge remote-tracking branch 'upstream/master' into doc-histogram-cat…
hweecat Jan 2, 2021
6a6286a
fix for chromium renderer on linux systems (issue #2348)
c-chaitanya Jun 25, 2021
668b282
formating using the black formatter
c-chaitanya Jun 25, 2021
758e3ce
Fix typo: missing 'as'
jamespeapen Jul 12, 2021
08f6952
add some extra options to various demo datasets
nicolaskruchten Jul 16, 2021
ee03bcc
changelog
nicolaskruchten Jul 17, 2021
1b4f698
Merge pull request #3299 from jamespeapen/patch-2
nicolaskruchten Jul 17, 2021
612d3f9
Merge pull request #3305 from plotly/extended_data
nicolaskruchten Jul 17, 2021
9a7adc7
fix silly bug
nicolaskruchten Jul 18, 2021
ab622e3
fix pandas warnings
nicolaskruchten Jul 20, 2021
712684c
addressing comments on the pull request, modifying the exception stat…
c-chaitanya Jul 21, 2021
2c2dd6a
Merge pull request #3278 from c-chaitanya/chromium-browser-renderer-fix
nicolaskruchten Jul 21, 2021
a547e37
improve browser error messages
nicolaskruchten Jul 21, 2021
e7a3809
revert test change
nicolaskruchten Jul 21, 2021
72a949c
fix test
nicolaskruchten Jul 21, 2021
458554a
tweak tests
nicolaskruchten Jul 21, 2021
1e24ca0
better tests
nicolaskruchten Jul 21, 2021
6ed555b
Merge pull request #3310 from plotly/chromium_followup
nicolaskruchten Jul 21, 2021
e0fdb39
Remove duplicate import
fortierq Jul 24, 2021
ce1bf36
Merge pull request #3316 from fortierq/patch-1
nicolaskruchten Jul 25, 2021
f680f80
ability to show markers on lines
nicolaskruchten Aug 3, 2021
f2dbe5a
black
nicolaskruchten Aug 3, 2021
80509d5
improve scatter and line docs
nicolaskruchten Aug 3, 2021
1cafc5f
add all datasets to PX export for docs
nicolaskruchten Aug 3, 2021
3befb2c
more line docs
nicolaskruchten Aug 3, 2021
c67f800
Merge pull request #3326 from plotly/px_line_marker
nicolaskruchten Aug 3, 2021
44d437d
ma and ewm trendlines
nicolaskruchten Oct 26, 2020
1019985
extract trendline function API
nicolaskruchten Dec 25, 2020
560fad7
ols log options checkpoint
nicolaskruchten Dec 25, 2020
50572d5
move trendline code to own module
nicolaskruchten Dec 29, 2020
d1001c6
get trendline_functions into apidoc
nicolaskruchten Dec 30, 2020
2d3e8b0
tests for new trendlines
nicolaskruchten Dec 30, 2020
81a76c7
apidoc and tests
nicolaskruchten Dec 30, 2020
16a9c63
fix up tests
nicolaskruchten Dec 31, 2020
c413a31
docstrings
nicolaskruchten Jan 1, 2021
aad79b4
docstrings
nicolaskruchten Jan 1, 2021
ce73f31
docstrings
nicolaskruchten Jan 2, 2021
1fa9fac
add PX utility functions to apidoc
nicolaskruchten Jan 4, 2021
d0ab458
refactor new trendlines
nicolaskruchten Aug 2, 2021
619c693
clarify
nicolaskruchten Aug 3, 2021
744afb9
docstring
nicolaskruchten Aug 3, 2021
e7a2fbc
bugfix
nicolaskruchten Aug 3, 2021
b6806ff
trendline_scope
nicolaskruchten Aug 5, 2021
6ef46bf
black
nicolaskruchten Aug 5, 2021
f37eb06
changelog
nicolaskruchten Aug 5, 2021
03c146c
changelog
nicolaskruchten Aug 5, 2021
bd0d368
validate trendline_options
nicolaskruchten Aug 5, 2021
860a321
tweak docstrings
nicolaskruchten Aug 5, 2021
d7e7dbf
Unpin six in requirements.txt
maresb Aug 10, 2021
aca0020
Set minimal version for six
maresb Aug 10, 2021
6fc1002
try embedding SciPy talk video
nicolaskruchten Aug 10, 2021
dedecd3
try embedding SciPy talk video
nicolaskruchten Aug 10, 2021
20adc4e
Merge pull request #3341 from maresb/patch-1
nicolaskruchten Aug 10, 2021
b820672
Bump tar from 6.1.0 to 6.1.7 in /packages/javascript/jupyterlab-plotly
dependabot[bot] Aug 10, 2021
9192a68
Bump path-parse in /packages/javascript/jupyterlab-plotly
dependabot[bot] Aug 10, 2021
ab0e0ab
positive values only for logs
nicolaskruchten Aug 11, 2021
f42c5af
docs for trendlines
nicolaskruchten Aug 12, 2021
78ddc06
bump Plotly.js to 2.3.1
nicolaskruchten Aug 13, 2021
9f8633a
Merge pull request #3342 from plotly/dependabot/npm_and_yarn/packages…
nicolaskruchten Aug 13, 2021
ed48215
Merge pull request #2997 from plotly/trendlines2
nicolaskruchten Aug 13, 2021
700e83f
wip
nicolaskruchten Jan 8, 2021
538f18e
mostly finished ECDF
nicolaskruchten Jan 10, 2021
807b828
wip
nicolaskruchten Jan 11, 2021
5f0ac8b
finishing up ECDF
nicolaskruchten Aug 6, 2021
dfe6216
primitive KDE implementation, matches though
nicolaskruchten Aug 6, 2021
9df2302
wip
nicolaskruchten Aug 6, 2021
9fd2f6b
kde labelling
nicolaskruchten Aug 6, 2021
d4a733c
work out line shape for ecdfmode
nicolaskruchten Aug 11, 2021
b3c6c5d
wip
nicolaskruchten Aug 12, 2021
542ed5a
docs sweep
nicolaskruchten Aug 13, 2021
33381b1
back out KDE
nicolaskruchten Aug 13, 2021
787b16d
changelog
nicolaskruchten Aug 13, 2021
dcbd39f
EPS file change due to gl pixel ratio
nicolaskruchten Aug 13, 2021
2d43ac7
Merge pull request #3330 from plotly/distfuncs2
nicolaskruchten Aug 13, 2021
9f4c5d0
Merge pull request #3346 from plotly/js2.3.1
nicolaskruchten Aug 13, 2021
8cebd31
Merge pull request #3343 from plotly/dependabot/npm_and_yarn/packages…
nicolaskruchten Aug 13, 2021
09017f3
Update troubleshooting.md
nicolaskruchten Aug 13, 2021
796e9f1
Merge branch 'doc-prod'
nicolaskruchten Aug 13, 2021
91e75a1
Merge pull request #2802 from hweecat/doc-histogram-categoryorder
nicolaskruchten Aug 13, 2021
744930c
changelog
nicolaskruchten Aug 13, 2021
1c4b1f5
Merge branch 'doc-prod'
nicolaskruchten Aug 13, 2021
f724e3b
doc tweak
nicolaskruchten Aug 13, 2021
76826f0
add pretty_names option to datasets
nicolaskruchten Aug 13, 2021
e42bd37
Merge pull request #3347 from plotly/pretty_names
nicolaskruchten Aug 13, 2021
18252a2
release 5.2.0
nicolaskruchten Aug 13, 2021
d943d62
fix up build process
nicolaskruchten Aug 13, 2021
c116672
release 5.2.1
nicolaskruchten Aug 13, 2021
87e6457
doc bumps to 5.2.1
nicolaskruchten Aug 14, 2021
c8bd6ee
doc bumps to 5.2.1
nicolaskruchten Aug 14, 2021
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
Prev Previous commit
Next Next commit
fix silly bug
  • Loading branch information
nicolaskruchten committed Jul 18, 2021
commit 9a7adc7b117bae2e0af38d20b2c69b8b7c28ffef
4 changes: 2 additions & 2 deletions packages/python/plotly/plotly/data/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ def gapminder(datetimes=False, centroids=False, year=None):
If `year` is an integer, the dataset will be filtered for that year
"""
df = _get_dataset("gapminder")
if year:
df = df.query("year == %d" % year)
if datetimes:
df["year"] = (df["year"].astype(str) + "-01-01").astype("datetime64[ns]")
if not centroids:
df.drop(["centroid_lat", "centroid_lon"], axis=1, inplace=True)
if year:
df = df.query("year == %d" % year)
return df


Expand Down