Improve setup.py for installation (#20)

Signed-off-by: changwangss <[email protected]>

.github/workflows/docker/code-scan.dockerfile

@@ -30,6 +30,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
 
 RUN ln -sf $(which python3) /usr/bin/python
 
+RUN pip install --upgrade pip setuptools==69.5.1
 RUN python -m pip install --no-cache-dir bandit==1.7.8
 RUN wget -O /bin/hadolint https://github.com/hadolint/hadolint/releases/download/v2.12.0/hadolint-Linux-x86_64
 RUN chmod +x /bin/hadolint

.github/workflows/docker/common.dockerfile

@@ -29,6 +29,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
     vim \
     wget
 
+RUN pip install --upgrade pip setuptools==69.5.1
 RUN ln -sf $(which python3) /usr/bin/python
 RUN python -m pip install --no-cache-dir pytest
 

.github/workflows/docker/hpu.dockerfile

@@ -17,7 +17,9 @@ COPY ${REPO_PATH} /genaieval
 RUN if [ "$REPO_PATH" == "" ]; then rm -rf /genaieval/* && rm -rf /genaieval/.* ; git clone --single-branch --branch=${BRANCH} ${REPO} /genaieval ; fi
 
 # Build From Source
+RUN pip install --upgrade pip setuptools==69.5.1
 RUN cd /genaieval && \
+    pip install -r requirements.txt && \
     python setup.py install && \
     pip install --upgrade-strategy eager optimum[habana] && \
     pip list

Docker/hpu.dockerfile

@@ -15,9 +15,11 @@ SHELL ["/bin/bash", "--login", "-c"]
 RUN mkdir -p /GenAIEval
 COPY ${REPO_PATH} /GenAIEval
 RUN if [ "$REPO_PATH" == "" ]; then rm -rf /GenAIEval/* && rm -rf /GenAIEval/.* ; git clone --single-branch --branch=${BRANCH} ${REPO} /GenAIEval ; fi
+RUN pip install --upgrade pip setuptools==69.5.1
 
 # Build From Source
 RUN cd /GenAIEval && \
+    pip install -r requirements.txt && \
     python setup.py install && \
     pip install --upgrade-strategy eager optimum[habana] && \
     pip list

requirements.txt

@@ -1,3 +1,2 @@
-git+https://github.com/bigcode-project/bigcode-evaluation-harness.git@a1b4a7949a24c8e3ef0d05a01097b2d14ffba56e
+bigcode-eval@git+https://github.com/bigcode-project/bigcode-evaluation-harness.git@a1b4a7949a24c8e3ef0d05a01097b2d14ffba56e
 lm-eval==0.4.2
-

setup.py

@@ -19,8 +19,11 @@
 
 from setuptools import find_packages, setup
 
-result = subprocess.Popen("pip install -r requirements.txt", shell=True)
-result.wait()
+
+def parse_requirements(filename):
+    with open(filename, "r") as file:
+        return [line.strip() for line in file if line.strip() and not line.startswith("#")]
+
 
 setup(
     name="GenAIEval",
@@ -32,5 +35,6 @@
     long_description_content_type="text/markdown",
     url="https://github.com/opea-project/GenAIEval",
     packages=find_packages(),
+    install_requires=parse_requirements("requirements.txt"),
     python_requires=">=3.10",
 )