Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Qiskit/qiskit-terra into 2349
Browse files Browse the repository at this point in the history
  • Loading branch information
Luciano Bello committed May 8, 2019
2 parents 3767881 + 940d55f commit 5f3d45b
Show file tree
Hide file tree
Showing 133 changed files with 708 additions and 4,126 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ stage_generic: &stage_generic
# Install step for jobs that require compilation and qa.
- pip install -U -r requirements.txt
- pip install -U -r requirements-dev.txt -c constraints.txt
- pip install qiskit-aer
- pip install "qiskit-ibmq-provider==0.1rc3" -c constraints.txt
- pip install -e .
- pip install "qiskit-ibmq-provider" -c constraints.txt
script:
# Compile the executables and run the tests.
- python setup.py build_ext --inplace
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,16 @@ The format is based on `Keep a Changelog`_.
`UNRELEASED`_
=============

Removed
-------
- The previously deprecated functions ``qiksit.visualization.plot_state`` and
``qiskit.visualization.iplot_state`` have been removed. Instead use the
specific functions for each plot type (#2325).
- International documentation of outdated readme etc (#2302)
- Removed deprecated options in execute, transpile, and assemble. Removed deprecated compiler.
- Removed deprecated qcvv in tools. Removed deprecated converters qobj_to_circuits and circuits_to_qobj (#2301)
- The previously deprecated ``qiskit._util`` module has been removed. Use
``qiskit.util`` instead. (#2329)

`0.8.0`_ - 2019-05-02
=====================
Expand Down
12 changes: 3 additions & 9 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,9 @@ install:
throw "There are newer queued builds for this pull request, failing early." }
- "%PYTHON%\\python.exe -m venv venv"
- venv\Scripts\activate.bat
- pip.exe install -r requirements.txt
- pip.exe install vcrpy
- pip.exe install jupyter
- pip.exe install ipywidgets
- pip.exe install cython
- pip.exe install stestr
- pip.exe install qiskit-aer
- pip.exe install "qiskit-ibmq-provider==0.1rc3"
- pip.exe install PyGithub
- pip.exe install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
- pip.exe install -e .
- pip.exe install "qiskit-ibmq-provider" -c constraints.txt
- python setup.py build_ext --inplace
# TODO: uncomment this when testing-cabal/subunit#33 is fixed
# - pip.exe install junitxml
Expand Down
20 changes: 0 additions & 20 deletions docs/de/conf.py

This file was deleted.

216 changes: 0 additions & 216 deletions docs/de/dev_introduction.rst

This file was deleted.

Loading

0 comments on commit 5f3d45b

Please sign in to comment.