Merge branch 'master' into fix-bind-params

Author: nonhermitian

.github/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing
 
-If you would like to contribute to the Qiskit-tutorials, there are a number of ways to 
+If you would like to contribute to the Qiskit IQX tutorials, there are a number of ways to 
 get involved:
 
 * **Issues**: Issues can be reported with GitHub [issue
@@ -11,7 +11,7 @@ get involved:
 * **Notebooks**: If you would like to contribute a notebook, please 
   create a [fork](https://help.github.com/articles/fork-a-repo/) of the repository 
   from the `master` branch and create a 
-  [pull requests](https://help.github.com/articles/about-pull-requests) for your change.
+  [pull request](https://help.github.com/articles/about-pull-requests) for your change.
   Note that new notebooks should be placed in the relevant part of the 
   [Community](./community/) section.
 

.gitignore

@@ -2,13 +2,8 @@
 __pycache__/
 .cache/
 
-.ipynb_checkpoints/*
-
-qiskit/*/.ipynb_checkpoints/*
-qiskit/*/*/.ipynb_checkpoints/*
-community/*/.ipynb_checkpoints/*
-community/*/*/.ipynb_checkpoints/*
-community/*/*/*/.ipynb_checkpoints/*
+# ignores any checkpoints folder anywhere
+.ipynb_checkpoints/
 
 Qconfig.py
 qiskit/basics/Qconfig_IBMQ_experience.py
@@ -31,4 +26,4 @@ qiskit/basics/Qconfig_IBMQ_experience_staging.py
 qiskit/basics/Qconfig_IBMQ_network-dev.py
 .DS_Store
 
-qiskit/.ipynb_checkpoints/start_here-checkpoint.ipynb
+.stestr/

.stestr.conf

@@ -0,0 +1,2 @@
+[DEFAULT]
+test_path=./utils/test

INSTALL.md

@@ -9,34 +9,45 @@
 
 **Get the tutorials**<BR>
 
-For the full experience, you can start by downloading the latest release of the tutorials from [here](https://github.com/Qiskit/qiskit-tutorials/releases). Unzip the archive in the directory of your choice (this is the recommended way). 
+For the full experience, you can start by downloading the latest release of the
+tutorials from [here](https://github.com/Qiskit/qiskit-iqx-tutorials/releases).
+Unzip the archive in the directory of your choice (this is the recommended
+way).
 
-To properly view and run the tutorials, you will need to install [Jupyter Notebook](https://jupyter.readthedocs.io/en/latest/install.html).
+To properly view and run the tutorials, you will need to install [Jupyter
+Notebook](https://jupyter.readthedocs.io/en/latest/install.html).
 
 ## 2. Install Qiskit, Qiskit Aqua and Qiskit Aqua Chemistry
 
-At least [Python 3.5 or later](https://www.python.org/downloads/) is required to install and use Qiskit. If you have multiple Python versions installed (and particularly if the command `python --version` returns an incompatble version), you will need to ensure that your versions are [managed correctly](https://conda.io/projects/conda/en/latest/user-guide/getting-started.html#managing-python). This can be done using the `environment.yml` file, as detailed below.
+At least [Python 3.5 or later](https://www.python.org/downloads/) is required
+to install and use Qiskit. If you have multiple Python versions installed (and
+particularly if the command `python --version` returns an incompatible
+version), you will need to ensure that your versions are [managed
+correctly](https://conda.io/projects/conda/en/latest/user-guide/getting-started.html#managing-python).
+This can be done using the `environment.yml` file, as detailed below.
 
 When there are no issues with dependencies, Qiskit can be installed using
 
 ```
 pip install qiskit
 ```
 
-Or, pre-installed Qiskit can be updated using
+Or, a pre-installed Qiskit can be updated using
 
 ```
 pip install -U qiskit
 ```
 
-However, in case of issues with dependencies, we recommend the following installation procedure:
+However, in case of issues with dependencies, we recommend the following
+installation procedure:
 
 1. **Install [conda](https://conda.io/docs/index.html)**
 
-2. **Create conda environment for Qiskit and install packages** (with the accompanying `environment.yml` file)
+2. **Create conda environment for Qiskit and install packages** (with the
+   accompanying `environment.yml` file)
 
 ```
-cd qiskit-tutorial
+cd qiskit-iqx-tutorials
 conda env create -f environment.yml
 ```
 
@@ -51,35 +62,36 @@ conda env update -f environment.yml
 
 -  Create an [IBM Q](https://quantumexperience.ng.bluemix.net) account if
    you haven't already done so
--  Get an API token from the IBM Q website under “My
-   Account” > “Advanced”
--  We are now going to add the necessary credentials to Qiskit. Take your token, here called `MY_API_TOKEN`, 
-   and pass it to the `IBMQ.save_account()` function:
+-  Get an API token from the IBM Q website under “My Account" > "Qiskit in
+   local environment"
+-  We are now going to add the necessary credentials to Qiskit. Take your
+   token, here called `MY_API_TOKEN`, and pass it to the `IBMQ.save_account()`
+   function:
 
 ```python
     from qiskit import IBMQ
 
     IBMQ.save_account('MY_API_TOKEN')
 ```
 
--  Your credentials will be stored on disk. Once they are stored, at any point in the future you can load and use 
-   them via:
+-  Your credentials will be stored on disk. Once they are stored, at any point
+   in the future you can load and use them via:
 
 ```python
     from qiskit import IBMQ
 
-    IBMQ.load_accounts()
+    provider = IBMQ.load_account()
 ```
 
 -  For those who do not want to save their credentials to disk, please use
 
 ```python
     from qiskit import IBMQ
 
-    IBMQ.enable_account('MY_API_TOKEN')
+    provider = IBMQ.enable_account('MY_API_TOKEN')
 ```
 
-and the token will only be active for the session. 
+and the token will only be active for the session.
 
 
 ## 4. Explore the Tutorials
@@ -97,7 +109,8 @@ For Windows, run:
 activate Qiskitenv
 ```
 **Note for conda users**<BR>
-Verify that you have installed the right Jupyter Kernel, because in the last conda version it's not installed by default.
+Verify that you have installed the right Jupyter Kernel, because in the last
+conda version it's not installed by default.
 
 ```
 python -m ipykernel install --user --name Qiskitenv --display-name "Python (Qiskitenv)"
@@ -110,27 +123,31 @@ jupyter notebook index.ipynb
 ```
 
 ## 5. [Optional] Visualizing Circuits with LaTeX
-You can visualize your quantum circuits directly from Qiskit. Qiskit circuit drawers support text, LaTeX and matplotlib. The text and matplotlib version is entirely native to Python, and thus easy to use. The LaTeX version produces publication-quality circuit images, but relies on some pre-requisite software. These include the `pdflatex` compiler for rendering LaTeX documents, and the Poppler library for converting PDF to image. To get these:
+You can visualize your quantum circuits directly from Qiskit. Qiskit circuit
+drawers support text, LaTeX and matplotlib. The text and matplotlib version is
+entirely native to Python, and thus easy to use. The LaTeX version produces
+publication-quality circuit images, but relies on some pre-requisite software.
+These include the `pdflatex` compiler for rendering LaTeX documents, and the
+Poppler library for converting PDF to image. To get these:
 
 On Linux:
 
 - Install [MiKTeX](https://miktex.org/download#unx)
 - Install Poppler:
-	- Run: ```apt-get install -y poppler-utils```
+	- Run: `apt-get install -y poppler-utils`
 
 On MacOS:
 
 - Install [MiKTeX](https://miktex.org/download).
 - Install Poppler:
-	- Run:```brew install poppler```
+	- Run: `brew install poppler`
 
 On Windows:
 
 - Install [MiKTeX](https://miktex.org/download).
 - Install Poppler:
 	- Download the [latest binary](http://blog.alivate.com.au/wp-content/uploads/2017/01/poppler-0.51_x86.7z).
-	- Extract the downloaded `.7z` file into user directory:
-`c:\Users\<user_name>\`.
+	- Extract the downloaded `.7z` file into user directory: `c:\Users\<user_name>\`.
 Note: You will need to have the [7zip software](https://www.7-zip.org/download.html) for this.
 	- Add to PATH:
 		- Right click on "This PC" -> Properties -> Advanced System Settings -> Environment Variables

README.md

@@ -1,43 +1,68 @@
-# Qiskit Tutorials
+# Qiskit IQX Tutorials
 
-[![License](https://img.shields.io/github/license/Qiskit/qiskit-tutorials.svg?style=popout-square)](https://opensource.org/licenses/Apache-2.0)[![](https://img.shields.io/github/release/Qiskit/qiskit-tutorials.svg?style=popout-square)](https://github.com/Qiskit/qiskit-tutorials/releases)
+[![License](https://img.shields.io/github/license/Qiskit/qiskit-iqx-tutorials.svg?style=popout-square)](https://opensource.org/licenses/Apache-2.0)[![](https://img.shields.io/github/release/Qiskit/qiskit-iqx-tutorials.svg?style=popout-square)](https://github.com/Qiskit/qiskit-iqx-tutorials/releases)
 
-Welcome to the [Qiskit](https://www.qiskit.org/) tutorials!
+Welcome to the [Qiskit](https://www.qiskit.org/) IQX Tutorials!
 
-In this repository, we've put together a collection of Jupyter notebooks aimed at teaching people who want to use Qiskit for writing quantum computing programs, and executing them on one of several backends (online quantum processors, online simulators, and local simulators). The online quantum processors are the [IBM Q](https://quantum-computing.ibm.com) devices.
+In this repository, we've put together a collection of Jupyter notebooks aimed
+at teaching people who want to use Qiskit for writing quantum computing
+programs, and executing them on one of several backends (online quantum
+processors, online simulators, and local simulators). The online quantum
+processors are the [IBM Q](https://quantum-computing.ibm.com) devices.
 
-For our community-contributed tutorials, please check out the [qiskit-community-tutorials](https://github.com/Qiskit/qiskit-tutorials-community) repository.
+For our community-contributed tutorials, please check out the
+[qiskit-community-tutorials](https://github.com/Qiskit/qiskit-community-tutorials)
+repository.
 
 ## Installation
 
-The notebooks for these tutorials can be viewed here on GitHub...but for the full experience, you'll want to interact with them!
+The notebooks for these tutorials can be viewed here on GitHub...but for the
+full experience, you'll want to interact with them!  The easiest way to do this
+is by logging into the [IBM Quantum
+Experience](https://quantum-computing.ibm.com/), which lets you use Jupyter
+notebooks, including these tutorials, via the web.
 
-The easiest way to do this is using [the Binder image](https://mybinder.org/v2/gh/qiskit/qiskit-tutorials/master?filepath=./qiskit/start_here.ipynb), which lets you use the notebooks via the web. This means that you don't need to download or install anything, but it also means that you should not insert any private information into the notebooks (such as your API key). We recommend, as pointed out in [issue #231](https://github.com/Qiskit/qiskit-tutorials/issues/231), that after you are done using mybinder that you regenerate your token.
-
-Please refer to this [installation guide](INSTALL.md) for setting up Qiskit and the tutorials on your own machine (this is the recommended way).
+Please refer to this [installation guide](INSTALL.md) for setting up Qiskit and
+the tutorials on your own machine (this is the recommended way).
 
 ## Contents
 
-We've collected a core reference set of notebooks in this section outlining the features of Qiskit. We will be keeping them up to date with the latest Qiskit version.  
-- [Basics](qiskit/fundamentals) is meant for those who are getting started.
-- [Terra](qiskit/advanced/terra) is meant for those who want to study circuits.
-- [Aer](qiskit/advanced/aer) is meant for those who want to simulate quantum circuits.
-- [Ignis](qiskit/advanced/ignis) is meant for those who want to study noise.
-- [Aqua](qiskit/advanced/aqua) is meant for those who want to develop applications on NISQ computers.
+We've collected a core reference set of notebooks in this section outlining the
+features of Qiskit. We will be keeping them up to date with the latest Qiskit
+version.
+
+- [Basics](qiskit/fundamentals) is for those who are getting started.
+- [Terra](qiskit/advanced/terra) is for those who want to study circuits.
+- [Aer](qiskit/advanced/aer) is for those who want to simulate quantum circuits.
+- [Ignis](qiskit/advanced/ignis) is for those who want to study noise.
+- [Aqua](qiskit/advanced/aqua) is for those who want to develop applications on NISQ computers.
 
-To go through the Qiskit examples, load up the [start_here.ipynb](qiskit/1_start_here.ipynb) notebook and start seeing how Qiskit works.
+To go through the Qiskit examples, load up the
+[start_here.ipynb](qiskit/1_start_here.ipynb) notebook and start seeing how
+Qiskit works.
 
 ## Contribution Guidelines
 
-If you'd like to contribute to Qiskit Tutorials, please take a look at our
-[contribution guidelines](.github/CONTRIBUTING.md). This project adheres to Qiskit's [code of conduct](.github/CODE_OF_CONDUCT.md). By participating, you are expect to uphold to this code.
+If you'd like to contribute to Qiskit IQX Tutorials, please take a look at our
+[contribution guidelines](.github/CONTRIBUTING.md). This project adheres to
+Qiskit's [code of conduct](.github/CODE_OF_CONDUCT.md). By participating, you
+are expect to uphold to this code.
 
-We use [GitHub issues](https://github.com/Qiskit/qiskit-tutorials/issues) for tracking requests and bugs. Please use our [slack](https://qiskit.slack.com) for discussion and simple questions. To join our Slack community, use the [link](https://join.slack.com/t/qiskit/shared_invite/enQtNDc2NjUzMjE4Mzc0LTMwZmE0YTM4ZThiNGJmODkzN2Y2NTNlMDIwYWNjYzA2ZmM1YTRlZGQ3OGM0NjcwMjZkZGE0MTA4MGQ1ZTVmYzk). For questions that are more suited for a forum, we use the Qiskit tag in the [Stack Exchange](https://quantumcomputing.stackexchange.com/questions/tagged/qiskit).
+We use [GitHub issues](https://github.com/Qiskit/qiskit-iqx-tutorials/issues) for
+tracking requests and bugs. Please use our [Slack](https://qiskit.slack.com)
+for discussion and simple questions. To join our Slack community, use the
+[link](https://join.slack.com/t/qiskit/shared_invite/enQtNDc2NjUzMjE4Mzc0LTMwZmE0YTM4ZThiNGJmODkzN2Y2NTNlMDIwYWNjYzA2ZmM1YTRlZGQ3OGM0NjcwMjZkZGE0MTA4MGQ1ZTVmYzk).
+For questions that are more suited for a forum, we use the Qiskit tag in the
+[Stack
+Exchange](https://quantumcomputing.stackexchange.com/questions/tagged/qiskit).
 
 ## Authors and Citation
 
-Qiskit Tutorials is the work of [many people](https://github.com/Qiskit/qiskit-tutorials/graphs/contributors) who contribute
-to the project at different levels. If you use Qiskit, please cite as per the included [BibTeX file](https://github.com/Qiskit/qiskit/blob/master/Qiskit.bib).
+Qiskit IQX Tutorials is the work of [many
+people](https://github.com/Qiskit/qiskit-iqx-tutorials/graphs/contributors) who
+contribute to the project at different levels. If you use Qiskit, please cite
+as per the included [BibTeX
+file](https://github.com/Qiskit/qiskit/blob/master/Qiskit.bib).
 
 ## License
 

environment.yml

@@ -1,6 +1,6 @@
 name: Qiskitenv
 dependencies:
-- python==3.6
+- python>=3.5
 - pip=18
 - matplotlib
 - notebook