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

Consistent import from top-level and first-level namespace of qcodes #1962

Merged
merged 28 commits into from Mar 27, 2020
Merged

Consistent import from top-level and first-level namespace of qcodes #1962

merged 28 commits into from Mar 27, 2020

Commits on Mar 23, 2020

  1. Import legacy api to qcodes main namespace only when specified in config

    @lakhotiaharshit
    lakhotiaharshit committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    d241c1a View commit details
    Browse the repository at this point in the history

  2. Copy data related to import to qcodes.data

    @lakhotiaharshit
    lakhotiaharshit committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    fd4333b View commit details
    Browse the repository at this point in the history

  3. Fix tests to not import legacy api from main namespace of qcodes

    @lakhotiaharshit
    lakhotiaharshit committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    98a4602 View commit details
    Browse the repository at this point in the history

  4. Copy dataset related to import to qcodes.dataset

    @lakhotiaharshit
    lakhotiaharshit committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    d217e76 View commit details
    Browse the repository at this point in the history

  5. Copy instrument related to import to qcodes.instrument

    @lakhotiaharshit
    lakhotiaharshit committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    06c3e49 View commit details
    Browse the repository at this point in the history

  6. Copy intrument_drivers related to import to qcodes.instrument_drivers

    @lakhotiaharshit
    lakhotiaharshit committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    ec0857b View commit details
    Browse the repository at this point in the history

  7. Copy utils related to import to qcodes.utils

    @lakhotiaharshit
    lakhotiaharshit committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    9d4b3ef View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2020

  1. Fix imports in all the notebooks

    @lakhotiaharshit
    lakhotiaharshit committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    45e97ef View commit details
    Browse the repository at this point in the history

  2. Add black lines

    @lakhotiaharshit
    lakhotiaharshit committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    036e5b3 View commit details
    Browse the repository at this point in the history

  3. Remove unnecessary import

    @lakhotiaharshit
    lakhotiaharshit committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    d71269d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into qcodes_init

    @lakhotiaharshit
    lakhotiaharshit committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    7413a45 View commit details
    Browse the repository at this point in the history

  5. Fix imports utils.slack

    @lakhotiaharshit
    lakhotiaharshit committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    cb6ea6f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'qcodes_init' of https://github.com/lakhotiaharshit/Qcodes… 

    … into qcodes_init
    @lakhotiaharshit
    lakhotiaharshit committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    cfe9979 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2020

  1. Relative imports to break circular imports and appease travis

    @lakhotiaharshit
    lakhotiaharshit committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    05193ce View commit details
    Browse the repository at this point in the history

  2. Move .data imports to legacy and fix tests

    @lakhotiaharshit
    lakhotiaharshit committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    8f6a4d8 View commit details
    Browse the repository at this point in the history

  3. Fix relative imports

    @lakhotiaharshit
    lakhotiaharshit committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    e862756 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into qcodes_init

    @lakhotiaharshit
    lakhotiaharshit committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    161068e View commit details
    Browse the repository at this point in the history

  5. Fix legacy imports in the location formatter notebook

    @lakhotiaharshit
    lakhotiaharshit committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    c2eab1f View commit details
    Browse the repository at this point in the history

  6. Copy import of data to one level down

    @lakhotiaharshit
    lakhotiaharshit committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    c95d651 View commit details
    Browse the repository at this point in the history

  7. Fix legacy imports in notebook Tutorial.ipynb

    @lakhotiaharshit
    lakhotiaharshit committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    2fed096 View commit details
    Browse the repository at this point in the history

  8. Fix circular imports

    @lakhotiaharshit
    lakhotiaharshit committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    1e98093 View commit details
    Browse the repository at this point in the history

  9. Fix import of Measure in Keithley

    @lakhotiaharshit
    lakhotiaharshit committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    1a2da8c View commit details
    Browse the repository at this point in the history

  10. Fix circular import issue from data_set

    @lakhotiaharshit
    lakhotiaharshit committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    c2dcd9e View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into qcodes_init

    @jenshnielsen
    jenshnielsen committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    ae2f47f View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2020

  1. Add changelog

    @lakhotiaharshit
    lakhotiaharshit committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    c5742bc View commit details
    Browse the repository at this point in the history

  2. Make all module level imports relative

    @lakhotiaharshit
    lakhotiaharshit committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    59b039b View commit details
    Browse the repository at this point in the history

  3. Fix codacy be happy

    @lakhotiaharshit
    lakhotiaharshit committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    f4248a3 View commit details
    Browse the repository at this point in the history

  4. Update 0.13.0.rst 

    Fix change log
    @lakhotiaharshit
    lakhotiaharshit committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    264aaca View commit details
    Browse the repository at this point in the history