Skip to content

Commit

Permalink
remove PySide2 from CI + tools (do not remove PySide2 from the code)
Browse files Browse the repository at this point in the history
  • Loading branch information
t20100 committed Oct 27, 2022
1 parent f834579 commit 8f880ec
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 19 deletions.
10 changes: 0 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@ jobs:
strategy:
matrix:
include:
- name-suffix: "PySide2 sdist"
os: ubuntu-20.04
python-version: '3.7'
BUILD_COMMAND: sdist
QT_BINDING: PySide2
RUN_TESTS_OPTIONS: --qt-binding=PySide2 --no-opengl --low-mem

- name-suffix: "PyQt5 sdist"
os: ubuntu-20.04
python-version: '3.7'
Expand Down Expand Up @@ -131,9 +124,6 @@ jobs:
pip install -r ci/requirements-pinned.txt;
fi
pip install --pre -r requirements.txt
if [ "${{ matrix.QT_BINDING }}" == "PySide2" ]; then
pip install --pre pyside2;
fi
if [ "${{ matrix.QT_BINDING }}" == "PySide6" ]; then
pip install --pre pyside6;
fi
Expand Down
6 changes: 0 additions & 6 deletions ci/appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@ environment:
WITH_GL_TEST: True
PIP_OPTIONS: "-q --pre"

# Python 3.8
- PYTHON_DIR: "C:\\Python38-x64"
QT_BINDING: "PySide2"
WITH_GL_TEST: True
PIP_OPTIONS: "-q"

# Python 3.7
- PYTHON_DIR: "C:\\Python37-x64"
QT_BINDING: "PySide6"
Expand Down
2 changes: 1 addition & 1 deletion ci/info_platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
print(" %s max_workgroup_size is %s" % (d, d.max_work_group_size))


for binding_name in ("PyQt5", "PySide2", "PySide6", "PyQt6"):
for binding_name in ("PyQt5", "PySide6", "PyQt6"):
# Check Qt version in subprocess to avoid issues with importing multiple Qt bindins
cmd = [
sys.executable,
Expand Down
2 changes: 1 addition & 1 deletion doc/source/license.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Note:
silx uses the Qt library for its graphical user interfaces.
A word of caution is to be provided.
If users develop and distribute software using modules accessing Qt by means of Riverbank Computing Qt bindings PyQt4 or PyQt5, those users will be conditioned by the license of their PyQt4/5 software (GPL or commercial).
If the end user does not own a commercial license of PyQt4 or PyQt5 and wishes to be free of any distribution condition, (s)he should be able to use PySide2 because it uses the LGPL license.
If the end user does not own a commercial license of PyQt4 or PyQt5 and wishes to be free of any distribution condition, (s)he should be able to use PySide6 because it uses the LGPL license.

The following list provides the copyright and license of the different source files of the project:

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

--trusted-host www.silx.org
--find-links http://www.silx.org/pub/wheelhouse/
--only-binary numpy,h5py,scipy,PySide2,PyQt5,PySide6,PyQt6
--only-binary numpy,h5py,scipy,PyQt5,PySide6,PyQt6

# Required dependencies (from setup.py setup_requires and install_requires)
numpy >= 1.12
Expand Down

0 comments on commit 8f880ec

Please sign in to comment.