From fb35cf9fdc4335d90c874e7bd42dbb4a3b588ea0 Mon Sep 17 00:00:00 2001 From: toofar Date: Mon, 3 Jun 2024 18:23:09 +1200 Subject: [PATCH] Revert "Add Riverbank Computing as extra index for PyQt requirements" Mostly reverts the below, as the new release is on the main PyPI repo now. Keeps the change to misc_checks.py This reverts commit 470ec752e16fe4f4f1407b90ad5ce66da85a7b63. --- misc/requirements/requirements-pyqt-6.7.txt | 1 - misc/requirements/requirements-pyqt-6.7.txt-raw | 3 --- misc/requirements/requirements-pyqt-6.txt | 1 - misc/requirements/requirements-pyqt-6.txt-raw | 3 --- misc/requirements/requirements-pyqt.txt | 1 - misc/requirements/requirements-pyqt.txt-raw | 3 --- 6 files changed, 12 deletions(-) diff --git a/misc/requirements/requirements-pyqt-6.7.txt b/misc/requirements/requirements-pyqt-6.7.txt index 2ba2ee9b0..3df4abb77 100644 --- a/misc/requirements/requirements-pyqt-6.7.txt +++ b/misc/requirements/requirements-pyqt-6.7.txt @@ -6,4 +6,3 @@ PyQt6-sip==13.6.0 PyQt6-WebEngine==6.7.0 PyQt6-WebEngine-Qt6==6.7.1 PyQt6-WebEngineSubwheel-Qt6==6.7.1 ---extra-index-url https://www.riverbankcomputing.com/pypi/simple/ diff --git a/misc/requirements/requirements-pyqt-6.7.txt-raw b/misc/requirements/requirements-pyqt-6.7.txt-raw index 7df2d49c6..98b1340b2 100644 --- a/misc/requirements/requirements-pyqt-6.7.txt-raw +++ b/misc/requirements/requirements-pyqt-6.7.txt-raw @@ -2,6 +2,3 @@ PyQt6 >= 6.7, < 6.8 PyQt6-Qt6 >= 6.7, < 6.8 PyQt6-WebEngine >= 6.7, < 6.8 PyQt6-WebEngine-Qt6 >= 6.7, < 6.8 - -# WORKAROUND for https://www.riverbankcomputing.com/pipermail/pyqt/2024-April/045832.html -#@ add: --extra-index-url https://www.riverbankcomputing.com/pypi/simple/ diff --git a/misc/requirements/requirements-pyqt-6.txt b/misc/requirements/requirements-pyqt-6.txt index 2ba2ee9b0..3df4abb77 100644 --- a/misc/requirements/requirements-pyqt-6.txt +++ b/misc/requirements/requirements-pyqt-6.txt @@ -6,4 +6,3 @@ PyQt6-sip==13.6.0 PyQt6-WebEngine==6.7.0 PyQt6-WebEngine-Qt6==6.7.1 PyQt6-WebEngineSubwheel-Qt6==6.7.1 ---extra-index-url https://www.riverbankcomputing.com/pypi/simple/ diff --git a/misc/requirements/requirements-pyqt-6.txt-raw b/misc/requirements/requirements-pyqt-6.txt-raw index 16cc342cd..68a5db685 100644 --- a/misc/requirements/requirements-pyqt-6.txt-raw +++ b/misc/requirements/requirements-pyqt-6.txt-raw @@ -2,6 +2,3 @@ PyQt6 PyQt6-Qt6 PyQt6-WebEngine PyQt6-WebEngine-Qt6 - -# WORKAROUND for https://www.riverbankcomputing.com/pipermail/pyqt/2024-April/045832.html -#@ add: --extra-index-url https://www.riverbankcomputing.com/pypi/simple/ diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt index 2ba2ee9b0..3df4abb77 100644 --- a/misc/requirements/requirements-pyqt.txt +++ b/misc/requirements/requirements-pyqt.txt @@ -6,4 +6,3 @@ PyQt6-sip==13.6.0 PyQt6-WebEngine==6.7.0 PyQt6-WebEngine-Qt6==6.7.1 PyQt6-WebEngineSubwheel-Qt6==6.7.1 ---extra-index-url https://www.riverbankcomputing.com/pypi/simple/ diff --git a/misc/requirements/requirements-pyqt.txt-raw b/misc/requirements/requirements-pyqt.txt-raw index 16cc342cd..68a5db685 100644 --- a/misc/requirements/requirements-pyqt.txt-raw +++ b/misc/requirements/requirements-pyqt.txt-raw @@ -2,6 +2,3 @@ PyQt6 PyQt6-Qt6 PyQt6-WebEngine PyQt6-WebEngine-Qt6 - -# WORKAROUND for https://www.riverbankcomputing.com/pipermail/pyqt/2024-April/045832.html -#@ add: --extra-index-url https://www.riverbankcomputing.com/pypi/simple/