Move package dependencies from optional section

Dependencies marked as optional were not really optional and it is better to have them as a required dependencies. Signed-off-by: Ales Raszka <[email protected]>
tomasbakk · Feb 9, 2024 · b671883 · b671883
1 parent aaaadac
commit b671883
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 55 deletions.
diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
@@ -21,6 +21,10 @@ jobs:
         with:
           python-version: "3.11"
 
+      - name: Install non-python dependencies
+        run: |
+          sudo apt-get install -y libkrb5-dev
+
       - name: Install Hadolint via Brew
         run: |
           NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"

diff --git a/operator-pipeline-images/Dockerfile b/operator-pipeline-images/Dockerfile
@@ -70,14 +70,12 @@ RUN pip3 install --no-cache-dir --upgrade pip setuptools wheel && pip3 install -
 # install dependencies in virtual environment
 COPY ./pdm.lock ./pyproject.toml ./README.md ./
 RUN pdm venv create 3.11 && pdm install --no-lock --no-editable \
-        --group operatorcert \
         --group operatorcert-dev
 
 ENV VIRTUAL_ENV=/home/user/.venv
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
 # set dir ownership
-RUN chgrp -R 0 /home/user /etc/passwd
-RUN chmod -R g=u /home/user /etc/passwd
+RUN chgrp -R 0 /home/user /etc/passwd && chmod -R g=u /home/user /etc/passwd
 
 USER "${USER_UID}"
diff --git a/operator-pipeline-images/operatorcert/entrypoints/apply_test_waivers.py b/operator-pipeline-images/operatorcert/entrypoints/apply_test_waivers.py
@@ -115,7 +115,7 @@ def main() -> None:
         log_level = "DEBUG"
     setup_logger(level=log_level)
 
-    github_auth = Auth.Token(os.environ.get("GITHUB_TOKEN"))
+    github_auth = Auth.Token(os.environ.get("GITHUB_TOKEN") or "")
     github = Github(auth=github_auth)
     configure_test_suite(args, github)
 

diff --git a/operator-pipeline-images/operatorcert/entrypoints/create_github_gist.py b/operator-pipeline-images/operatorcert/entrypoints/create_github_gist.py
@@ -131,7 +131,7 @@ def main() -> None:
     log_level = "DEBUG" if args.verbose else "INFO"
     setup_logger(level=log_level)
 
-    github_auth = Auth.Token(os.environ.get("GITHUB_TOKEN"))
+    github_auth = Auth.Token(os.environ.get("GITHUB_TOKEN") or "")
     github = Github(auth=github_auth)
     gist = create_github_gist(github, args.input_path)
 

diff --git a/operator-pipeline-images/operatorcert/entrypoints/github_labels.py b/operator-pipeline-images/operatorcert/entrypoints/github_labels.py
@@ -67,7 +67,7 @@ def main() -> None:
         log_level = "DEBUG"
     setup_logger(level=log_level)
 
-    github_auth = Auth.Token(os.environ.get("GITHUB_TOKEN"))
+    github_auth = Auth.Token(os.environ.get("GITHUB_TOKEN") or "")
     github = Github(auth=github_auth)
 
     add_or_remove_labels(

diff --git a/operator-pipeline-images/operatorcert/github.py b/operator-pipeline-images/operatorcert/github.py
@@ -8,7 +8,7 @@
 from typing import Any, Dict, List, Optional
 
 import requests
-from github import Github, Label, PullRequest
+from github import Github, Label, PaginatedList, PullRequest
 from operatorcert.utils import add_session_retries
 
 LOGGER = logging.getLogger("operator-cert")
@@ -172,7 +172,8 @@ def remove_labels_from_pull_request(
 
 
 def detect_namespace_labels(
-    current_labels: List[Label.Label], label_namespaces: List[str]
+    current_labels: PaginatedList.PaginatedList[Label.Label],
+    label_namespaces: List[str],
 ) -> List[str]:
     """
     Return a list of current labels that match the given namespaces.

diff --git a/operator-pipeline-images/tests/entrypoints/test_github_wait_labels.py b/operator-pipeline-images/tests/entrypoints/test_github_wait_labels.py
@@ -247,7 +247,7 @@ def test_wait_on_pr_labels_success(
     capsys: Any,
 ) -> None:
     mock_get_pr_labels.side_effect = pr_labels_sequence
-    assert wait_on_pr_labels(None, 1, wait_conditions, 5, 0.1)
+    assert wait_on_pr_labels(MagicMock(), 1, wait_conditions, 5, 0.1)
 
     captured_stdout, _ = capsys.readouterr()
     assert captured_stdout == str.join("\n", pr_labels_sequence[-1]) + "\n"
@@ -267,7 +267,7 @@ def test_wait_on_pr_labels_timeout(
     wait_conditions: list[WaitCondition],
 ) -> None:
     mock_get_pr_labels.return_value = pr_labels
-    assert not wait_on_pr_labels(None, 1, wait_conditions, 1, 0.1)
+    assert not wait_on_pr_labels(MagicMock(), 1, wait_conditions, 1, 0.1)
 
 
 @patch("operatorcert.entrypoints.github_wait_labels.sys.exit")

diff --git a/pdm.lock b/pdm.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -35,6 +35,22 @@ authors = [
 requires-python = ">=3.10"
 readme = "README.md"
 license = { text = "GPLv3" }
+dependencies = [
+    "python-magic>=0.4.24",
+    "pyyaml>=5.4.1",
+    "requests>=2.31.0",
+    "yq>=2.12.2",
+    "giturlparse>=0.10.0",
+    "python-dateutil>=2.8.2",
+    "humanize>=3.12.0",
+    "stomp-py>=8.0.1",
+    "requests-kerberos>=0.14.0",
+    "PyGithub<2.0,>=1.59.0",
+    "GitPython>=3.1.37",
+    "semver>=3.0.1",
+    "operator-repo @ git+https://github.com/mporrato/[email protected]",
+    "urllib3>=2.0.7",
+]
 
 [project.scripts]
 apply-test-waivers = "operatorcert.entrypoints.apply_test_waivers:main"
@@ -69,23 +85,6 @@ verify-pr-title = "operatorcert.entrypoints.verify_pr_title:main"
 verify-pr-uniqueness = "operatorcert.entrypoints.verify_pr_uniqueness:main"
 verify-pr-user = "operatorcert.entrypoints.verify_pr_user:main"
 
-[project.optional-dependencies]
-operatorcert = [
-    "python-magic>=0.4.24",
-    "pyyaml>=5.4.1",
-    "requests>=2.31.0",
-    "yq>=2.12.2",
-    "giturlparse>=0.10.0",
-    "python-dateutil>=2.8.2",
-    "humanize>=3.12.0",
-    "stomp-py>=8.0.1",
-    "requests-kerberos>=0.14.0",
-    "PyGithub>=1.59.0",
-    "GitPython>=3.1.37",
-    "semver>=3.0.1",
-    "operator-repo @ git+https://github.com/mporrato/[email protected]",
-    "urllib3>=2.0.7",
-]
 
 [build-system]
 requires = ["pdm-pep517>=1.0"]

diff --git a/tox.ini b/tox.ini
@@ -21,8 +21,7 @@ skipsdist = True
 extras = dev
 
 [testenv:test]
-groups = operatorcert
-         operatorcert-dev
+groups = operatorcert-dev
 commands = pytest -v \
        --cov {[vars]OPERATOR_MODULE} \
        --cov-report term-missing \
@@ -44,14 +43,13 @@ commands = mypy {[vars]MYPY_SOURCE_ARGS} {[vars]OPERATOR_MODULE}
 [testenv:pylint]
 groups =
     operatorcert-dev
-    operatorcert
 commands = pylint {[vars]OPERATOR_MODULE} \
                   --min-similarity-lines 9 \
                   -d fixme
 
 [testenv:yamllint]
 basepython = python3.11
-groups = operatorcert-dev, operatorcert
+groups = operatorcert-dev
 files =
     .
 commands =