Skip to content

Commit

Permalink
Updated module level config
Browse files Browse the repository at this point in the history
  • Loading branch information
ntezak committed Dec 13, 2017
1 parent dc3765e commit c228526
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 4 deletions.
33 changes: 32 additions & 1 deletion LICENSE
Expand Up @@ -199,4 +199,35 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
----------------------------------------------------------------------------
state_histogram in the tomography.utils module has adapted from the qutip library,
whose licence is below.

Copyright (c) 2011 and later, Paul D. Nation and Robert J. Johansson.
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. Neither the name of the QuTiP: Quantum Toolbox in Python nor the names of
its contributors may be used to endorse or promote products derived from this
software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8 changes: 8 additions & 0 deletions requirements.txt
Expand Up @@ -21,3 +21,11 @@ codeclimate-test-reporter
# docs
sphinx
sphinx_rtd_theme

# tomography
# You may have to install numpy separately first before installing cvxpy
cython==0.24.1
qutip==4.1
cvxpy
scs==1.2.6
tqdm
1 change: 1 addition & 0 deletions setup.py
Expand Up @@ -29,6 +29,7 @@
install_requires=[
'numpy',
'scipy',
'cython',
'pyquil >= 1.4.0',
'mock',
'networkx',
Expand Down
5 changes: 2 additions & 3 deletions tox.ini
Expand Up @@ -7,13 +7,12 @@ recreate=
setenv =
PYTHONPATH = {toxinidir}:{toxinidir}/grove
deps=
-rrequirements.txt
numpy
commands=
pip install -r requirements.txt
; unit tests
py.test --cov=grove
; check docs build correctly
sphinx-build -b html docs/ docs/_build
; test example notebooks work
./demo_tests.sh


0 comments on commit c228526

Please sign in to comment.