Merge branch 'master' into fix/hdf5

microsoft · Feb 11, 2019 · 69d99b5 · 69d99b5
2 parents a03c90d + d2bba3d
commit 69d99b5
Show file tree

Hide file tree

Showing 28 changed files with 5,649 additions and 663 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -41,12 +41,14 @@ script:
     - |
       pip uninstall -y qcodes
       pip install -e .
-      cd qcodes/tests/dataset/legacy_DB_generation
+      cd ..
+      git clone https://github.com/QCoDeS/qcodes_generate_test_db.git
+      cd qcodes_generate_test_db
       python generate_version_0.py
       python generate_version_1.py
       python generate_version_2.py
       python generate_version_3.py
-      cd ../../../..
+      cd $TRAVIS_BUILD_DIR
       pip uninstall -y qcodes
       pip install .
     - cd qcodes

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -29,11 +29,13 @@ jobs:
           mypy qcodes
         displayName: "mypy"
       - script: |
-          cd qcodes
-          python tests\dataset\legacy_DB_generation\generate_version_0.py
-          python tests\dataset\legacy_DB_generation\generate_version_1.py
-          python tests\dataset\legacy_DB_generation\generate_version_2.py
-          python tests\dataset\legacy_DB_generation\generate_version_3.py
+          cd ..
+          git clone https://github.com/QCoDeS/qcodes_generate_test_db.git
+          cd qcodes_generate_test_db
+          python generate_version_0.py
+          python generate_version_1.py
+          python generate_version_2.py
+          python generate_version_3.py
         displayName: "Generate db fixtures"
       - script: |
           cd qcodes

diff --git a/docs/api/public.rst b/docs/api/public.rst
@@ -95,7 +95,9 @@ DataSet
     qcodes.dataset.database.initialise_database
     qcodes.dataset.database.initialise_or_create_database_at
 
+    qcodes.dataset.data_set.DataSet
     qcodes.dataset.data_set.load_by_id
+    qcodes.dataset.data_set.load_by_guid
 
     qcodes.dataset.plotting.plot_by_id
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -358,6 +358,7 @@
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
+    'pandas': ('https://pandas.pydata.org/pandas-docs/stable/', None),
     'matplotlib': ('https://matplotlib.org/', None),
     'python': ('https://docs.python.org/3.6', None),
     'numpy': ('https://docs.scipy.org/doc/numpy', None),

diff --git a/docs/examples/DataSet/Dataset Context Manager.ipynb b/docs/examples/DataSet/Dataset Context Manager.ipynb