Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Merging in Master branch changes to sql-engine branch #347

Merged
merged 7 commits into from
Apr 8, 2021
Merged

Merging in Master branch changes to sql-engine branch #347

merged 7 commits into from
Apr 8, 2021

Commits on Mar 27, 2021

  1. Revert "Revert "Update LuxSQLTable __len__() and metadata computation"" 

    This reverts commit b5998c7.
    @thyneb19
    thyneb19 committed Mar 27, 2021
    Configuration menu
    Copy the full SHA
    6f597c2 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2021

  1. Clean up Matplotlib code: remove altair code and replace pandas code (l… 

    …ux-org#326)

* rec series

* rec

* add changes back

* fix tests

* rm

* change

* set plotting_style

* nice

* black

* rm

* change rec

* reuse export

* remove altair

* nice

* rm

* fix

* fix merge

* rm

* black

Co-authored-by: Caitlyn Chen <caitlynachen@berkeley.edu>
    @caitlynachen
    caitlynachen and Caitlyn Chen authored Mar 30, 2021
    Configuration menu
    Copy the full SHA
    2525d71 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2021

  1. Fix Metadata Propagation with Overridden Pandas Methods (lux-org#332) 

    * fix repr to display string of df

* replace repr_html to move widget into Out

* replace repr_html in other files

* fix issue for LuxSeries

* fix overridden pandas functions
    @westernguy2
    westernguy2 authored Apr 2, 2021
    Configuration menu
    Copy the full SHA
    e96bf62 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2021

  1. Cleaned up datatype and SQLExecutor checks 

    Updated _is_datetime_number() in the PandasExecutor to use the is_integer_dtype() function to check if a series is of int dtype.

Cleaned up SQLExecutor checks in frame.py
    @thyneb19
    thyneb19 committed Apr 3, 2021
    Configuration menu
    Copy the full SHA
    7999ad6 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2021

  1. Update README.md

    @dorisjlee
    dorisjlee authored Apr 5, 2021
    Configuration menu
    Copy the full SHA
    1a72332 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2021

  1. Merge branch 'sql-engine' into Database-Executor

    @thyneb19
    thyneb19 committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    e92dbd6 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into Database-Executor

    @thyneb19
    thyneb19 committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    5399097 View commit details
    Browse the repository at this point in the history