fixes: #510 deleted the var completely

Signed-off-by: Shobhit Kumar <[email protected]>
Qiskit · Aug 30, 2023 · 4bb1dc8 · 4bb1dc8
1 parent 51644de
commit 4bb1dc8
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 53 deletions.
diff --git a/ecosystem/manager.py b/ecosystem/manager.py
@@ -324,10 +324,6 @@ def _run_python_tests(
         repo_url: str,
         tier: str,
         python_version: str,
-<<<<<<< HEAD
-=======
-        qiskit: str,
->>>>>>> 2b284cffea465cb413ac35b655efce9f5be03546
         test_type: str,
         ecosystem_deps: Optional[List[str]] = None,
         ecosystem_additional_commands: Optional[List[str]] = None,
@@ -342,10 +338,6 @@ def _run_python_tests(
             repo_url: repository url
             tier: tier of project
             python_version: ex: py36, py37 etc
-<<<<<<< HEAD
-=======
-            qiskit: qiskit
->>>>>>> 2b284cffea465cb413ac35b655efce9f5be03546
             test_type: [dev, stable]
             ecosystem_deps: extra dependencies to install for tests
             ecosystem_additional_commands: extra commands to run before tests
@@ -370,10 +362,6 @@ def _run_python_tests(
             ecosystem_deps=ecosystem_deps,
             ecosystem_additional_commands=ecosystem_additional_commands,
             python_version=python_version,
-<<<<<<< HEAD
-=======
-            qiskit=qiskit,
->>>>>>> 2b284cffea465cb413ac35b655efce9f5be03546
             repo_config=repo_configuration,
         )
         qiskit_version, results = runner.run()
@@ -556,10 +544,6 @@ def python_dev_tests(
             repo_url=repo_url,
             tier=tier,
             python_version=python_version,
-<<<<<<< HEAD
-=======
-            qiskit=package,
->>>>>>> 2b284cffea465cb413ac35b655efce9f5be03546
             test_type=TestType.DEV_COMPATIBLE,
             ecosystem_deps=[],
             ecosystem_additional_commands=additional_commands,
@@ -595,10 +579,6 @@ def python_stable_tests(
             repo_url=repo_url,
             tier=tier,
             python_version=python_version,
-<<<<<<< HEAD
-=======
-            qiskit="qiskit",
->>>>>>> 2b284cffea465cb413ac35b655efce9f5be03546
             test_type=TestType.STABLE_COMPATIBLE,
             ecosystem_deps=qiskit_latest_deps,
             ecosystem_additional_commands=additional_commands,
@@ -629,10 +609,6 @@ def python_standard_tests(
             repo_url=repo_url,
             tier=tier,
             python_version=python_version,
-<<<<<<< HEAD
-=======
-            qiskit="qiskit",
->>>>>>> 2b284cffea465cb413ac35b655efce9f5be03546
             test_type=TestType.STANDARD,
             logs_link=logs_link,
         )

diff --git a/ecosystem/models/configuration.py b/ecosystem/models/configuration.py
@@ -177,10 +177,6 @@ def default(cls) -> "PythonRepositoryConfiguration":
     def render_tox_file(
         self,
         ecosystem_deps: list[str] = None,
-<<<<<<< HEAD
-=======
-        qiskit: str = "qiskit",
->>>>>>> 2b284cffea465cb413ac35b655efce9f5be03546
         ecosystem_additional_commands: list[str] = None,
     ):
         """Renders tox template from configuration."""
@@ -191,10 +187,6 @@ def render_tox_file(
                 **self.to_dict(),
                 **{
                     "ecosystem_deps": ecosystem_deps,
-<<<<<<< HEAD
-=======
-                    "qiskit": qiskit,
->>>>>>> 2b284cffea465cb413ac35b655efce9f5be03546
                     "ecosystem_additional_commands": ecosystem_additional_commands,
                 },
             }

diff --git a/ecosystem/runners/python_tests_runner.py b/ecosystem/runners/python_tests_runner.py
@@ -22,20 +22,12 @@ def __init__(
         ecosystem_deps: Optional[List[str]] = None,
         ecosystem_additional_commands: Optional[List[str]] = None,
         python_version: str = "py39",
-<<<<<<< HEAD
-=======
-        qiskit: str = "qiskit",
->>>>>>> 2b284cffea465cb413ac35b655efce9f5be03546
         repo_config: Optional[RepositoryConfiguration] = None,
     ):
         super().__init__(
             repo=repo, working_directory=working_directory, repo_config=repo_config
         )
         self.python_version = python_version
-<<<<<<< HEAD
-=======
-        self.qiskit = qiskit
->>>>>>> 2b284cffea465cb413ac35b655efce9f5be03546
         self.ecosystem_deps = (
             ecosystem_deps if ecosystem_deps is not None else ["qiskit"]
         )

diff --git a/ecosystem/runners/runner.py b/ecosystem/runners/runner.py
@@ -56,10 +56,6 @@ def configure_repo(
         files_fault: List[str],
         ecosystem_deps: Optional[List[str]] = None,
         ecosystem_additional_commands: Optional[List[str]] = None,
-<<<<<<< HEAD
-=======
-        qiskit: str = "qiskit",
->>>>>>> 2b284cffea465cb413ac35b655efce9f5be03546
     ):
         """Configuring the different templates:
             - tox.ini
@@ -71,11 +67,6 @@ def configure_repo(
             files_fault: list of default name replacement
             ecosystem_deps: list of dependencies
             ecosystem_additional_commands: additional commands to run before tests
-<<<<<<< HEAD
-=======
-            qiskit: package to check the version of qiskit
->>>>>>> 2b284cffea465cb413ac35b655efce9f5be03546
-
         No return
         """
         if len(files) != len(files_fault):
@@ -124,10 +115,6 @@ def configure_repo(
                         repo_config.render_tox_file(
                             ecosystem_deps=ecosystem_deps,
                             ecosystem_additional_commands=ecosystem_additional_commands,
-<<<<<<< HEAD
-=======
-                            qiskit=qiskit,
->>>>>>> 2b284cffea465cb413ac35b655efce9f5be03546
                         )
                     )
                 elif destination_file_name == FilesTemplates.LINT_FILE_NAME: