Преглед изворни кода

[core] remove PPC-related code as PPC builds are no longer supported (#4224)

Ayush Goyal пре 3 месеци
родитељ
комит
088cce729f
4 измењених фајлова са 1 додато и 66 уклоњено
  1. 0 2
      Makefile
  2. 0 2
      Makefile.vars
  3. 0 21
      desktop/core/generate_requirements.py
  4. 1 41
      desktop/core/generate_requirements_test.py

+ 0 - 2
Makefile

@@ -77,7 +77,6 @@
 # Global variables
 ###################################
 ROOT := $(realpath .)
-PPC64LE := $(shell uname -m)
 
 include $(ROOT)/Makefile.vars.priv
 
@@ -146,7 +145,6 @@ $(info "BLD_DIR_ENV is $(BLD_DIR_ENV)")
 $(info "REQUIREMENT_FILE is $(REQUIREMENT_FILE)")
 $(info "INSTALL_DIR is $(INSTALL_DIR)")
 $(info "INST_DIR_ENV is $(INST_DIR_ENV)")
-$(info "PPC64LE is $(PPC64LE)")
 ###################################
 # virtual-env
 # Enhanced to support building and packaging Hue for multiple Python versions.

+ 0 - 2
Makefile.vars

@@ -168,12 +168,10 @@ ifeq ($(PYTHON_VER),python3.8)
   PIP_VERSION := 22.2.2
   VIRTUAL_ENV_VERSION := 20.24.4
   VIRTUAL_ENV_RELOCATABLE_VERSION := 0.0.1
-  REQUIREMENT_PPC64LE_FILE := $(ROOT)/desktop/core/requirements_ppc64le.txt
 else ifeq ($(PYTHON_VER),python3.9)
   PIP_VERSION := 22.2.2
   VIRTUAL_ENV_VERSION := 20.19.0
   VIRTUAL_ENV_RELOCATABLE_VERSION := 0.0.1
-  REQUIREMENT_PPC64LE_FILE := $(ROOT)/desktop/core/requirements_ppc64le_py39.txt
 else ifeq ($(PYTHON_VER),python3.10)
   PIP_VERSION := 22.2.2
   VIRTUAL_ENV_VERSION := 20.24.4

+ 0 - 21
desktop/core/generate_requirements.py

@@ -121,26 +121,6 @@ class RequirementsGenerator:
       "git+https://github.com/gethue/thrift.git",
     ]
 
-    self.ppc64le_requirements = {
-      "default": [],
-      "3.8": [
-        "http://ibm-ppc-builds.s3.amazonaws.com/silx-py-libs/cryptography-41.0.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl",
-        "http://ibm-ppc-builds.s3.amazonaws.com/silx-py-libs/lxml-4.6.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl",
-        "http://ibm-ppc-builds.s3.amazonaws.com/silx-py-libs/numpy-1.23.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl",
-        "http://ibm-ppc-builds.s3.amazonaws.com/silx-py-libs/pandas-1.4.3-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl",
-        "Markdown==3.1",
-        "PyYAML==5.4.1",
-      ],
-      "3.9": [
-        "http://ibm-ppc-builds.s3.amazonaws.com/silx-py-libs/cryptography-41.0.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl",
-        "http://ibm-ppc-builds.s3.amazonaws.com/silx-py-libs/lxml-4.6.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl",
-        "http://ibm-ppc-builds.s3.amazonaws.com/silx-py-libs/numpy-1.23.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl",
-        "http://ibm-ppc-builds.s3.amazonaws.com/silx-py-libs/pandas-1.4.3-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl",
-        "Markdown==3.8",
-        "PyYAML==6.0.1",
-      ],
-    }
-
     self.x86_64_requirements = {
       "default": [
         "cryptography==42.0.8",
@@ -198,7 +178,6 @@ class RequirementsGenerator:
       ],
     }
     self.arch_requirements_map = {
-      "ppc64le": self.ppc64le_requirements,
       "x86_64": self.x86_64_requirements,
       "aarch64": self.aarch64_requirements,
       "arm64": self.aarch64_requirements,  # arm64 is treated as aarch64

+ 1 - 41
desktop/core/generate_requirements_test.py

@@ -77,7 +77,7 @@ class TestRequirementsGenerator:
     assert isinstance(generator.requirements, list)
     assert isinstance(generator.local_requirements, list)
     assert "x86_64" in generator.arch_requirements_map
-    assert "ppc64le" in generator.arch_requirements_map
+
     assert "aarch64" in generator.arch_requirements_map
 
   @mock.patch("generate_requirements.this_dir", create=True)
@@ -164,46 +164,6 @@ class TestRequirementsGenerator:
 
       assert result == f"{self.temp_dir}/requirements-x86_64-3.9.txt"
 
-  @mock.patch("generate_requirements.this_dir")
-  @mock.patch("builtins.open", new_callable=mock.mock_open)
-  def test_generate_requirements_ppc64le(self, mock_open, mock_this_dir):
-    """Test generating requirements for ppc64le architecture."""
-
-    # Need to make this_dir return the string value directly, not a MagicMock
-    mock_this_dir.__str__.return_value = self.temp_dir
-
-    with mock.patch.object(RequirementsGenerator, "__init__", return_value=None):
-      generator = RequirementsGenerator()
-      generator.arch = "ppc64le"
-      generator.python_version_string = "3.8"
-      generator.requirements = ["setuptools==70.0.0"]
-      generator.local_requirements = []
-      generator.arch_requirements_map = {
-        "ppc64le": {
-          "default": [],
-          "3.8": [
-            "http://ibm-ppc-builds.s3.amazonaws.com/silx-py-libs/numpy-1.23.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl",
-            "Markdown==3.1",
-          ],
-        }
-      }
-
-      generator.copy_local_requirements = mock.MagicMock(return_value=[])
-
-      generator.generate_requirements()
-
-      mock_open.assert_called_once_with(f"{self.temp_dir}/requirements-ppc64le-3.8.txt", "w")
-
-      expected_requirements = "\n".join(
-        [
-          "setuptools==70.0.0",
-          "http://ibm-ppc-builds.s3.amazonaws.com/silx-py-libs/numpy-1.23.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl",
-          "Markdown==3.1",
-        ]
-      )
-
-      mock_open().write.assert_called_once_with(expected_requirements)
-
   @mock.patch("generate_requirements.this_dir")
   @mock.patch("builtins.open", new_callable=mock.mock_open)
   def test_generate_requirements_with_local_requirements(self, mock_open, mock_this_dir):