Skip to content

Commit

Permalink
Fix tox.ini (backport #9276) (#9277)
Browse files Browse the repository at this point in the history
* fix tox.ini (#9276)

(cherry picked from commit e70ce50)

# Conflicts:
#	tox.ini

* Fix merge conflict

* pin ipywidgets (#9272)

(cherry picked from commit b4f4c34)

Co-authored-by: Takashi Imamichi <31178928+t-imamichi@users.noreply.github.com>
Co-authored-by: Jake Lishman <jake.lishman@ibm.com>
Co-authored-by: Takashi Imamichi <imamichi@jp.ibm.com>
  • Loading branch information
4 people committed Dec 21, 2022
1 parent 1044728 commit 62eaa5d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,7 @@ jinja2==3.0.3
# a seaborn import. This pin can be removed when compatibility with those
# packages is fixed
jupyter-core==4.11.2

# ipywidgets 8.0.3 started emitting deprecation warnings via a seaborn import.
# This pin can be removed when compatibility with those packages is fixed.
ipywidgets<8.0.3
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ hypothesis>=4.24.3
python-constraint>=1.4
ipython<7.22.0
ipykernel<5.5.2
ipywidgets>=7.3.0
ipywidgets>=7.3.0,<8.0.3
jupyter
matplotlib>=3.3
pillow>=4.2.1
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ setenv =
QISKIT_SUPRESS_PACKAGING_WARNINGS=Y
QISKIT_TEST_CAPTURE_STREAMS=1
QISKIT_PARALLEL=FALSE
passenv = RAYON_NUM_THREADS OMP_NUM_THREADS QISKIT_PARALLEL RUST_BACKTRACE SETUPTOOLS_ENABLE_FEATURES
passenv = RAYON_NUM_THREADS, OMP_NUM_THREADS, QISKIT_PARALLEL, RUST_BACKTRACE, SETUPTOOLS_ENABLE_FEATURES
deps = setuptools_rust # This is work around for the bug of tox 3 (see #8606 for more details.)
-r{toxinidir}/requirements.txt
-r{toxinidir}/requirements-dev.txt
Expand Down

0 comments on commit 62eaa5d

Please sign in to comment.