Remove requirements.txt, pyproject.toml handles it

fix huggingface_hub since this package exists as well. make install use --no-deps Signed-off-by: Daniel J Walsh <[email protected]>
rhatdan · Oct 11, 2024 · 3656d75 · 3656d75
1 parent 6226362
commit 3656d75
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -35,7 +35,7 @@ help:
 
 .PHONY:
 install-requirements:
-	pipx install tqdm black flake8 argcomplete wheel omlmd huggingface_hub[cli] codespell
+	pipx install tqdm black flake8 argcomplete wheel omlmd huggingface_hub codespell
 
 .PHONY:
 install-completions:
@@ -69,7 +69,7 @@ completions:
 .PHONY:
 install: docs completions
 	RAMALAMA_VERSION=$(RAMALAMA_VERSION) \
-	pip install . --root $(DESTDIR) --prefix ${PREFIX}
+	pip install . --no-deps --root $(DESTDIR) --prefix ${PREFIX}
 
 .PHONY:
 build:

diff --git a/container-images/cpuonly/Containerfile b/container-images/cpuonly/Containerfile
@@ -21,7 +21,7 @@ RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.n
     rm -rf /var/cache/*dnf*
 
 RUN /usr/bin/python3 --version
-RUN pip install "huggingface_hub[cli]==${HUGGINGFACE_HUB_VERSION}"
+RUN pip install "huggingface_hub==${HUGGINGFACE_HUB_VERSION}"
 RUN pip install "omlmd==${OMLMD_VERSION}"
 RUN pip install "tqdm==${TQDM_VERSION}"
 

diff --git a/container-images/cuda/Containerfile b/container-images/cuda/Containerfile
@@ -19,7 +19,7 @@ RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.n
     rm -rf /var/cache/*dnf*
 
 RUN /usr/bin/python3 --version
-RUN pip install "huggingface_hub[cli]==${HUGGINGFACE_HUB_VERSION}"
+RUN pip install "huggingface_hub==${HUGGINGFACE_HUB_VERSION}"
 RUN pip install "omlmd==${OMLMD_VERSION}"
 
 # Build wouldn't complete couldn't find libcuda so made a systemlink

diff --git a/install.sh b/install.sh
@@ -47,7 +47,7 @@ check_platform() {
 }
 
 install_mac_dependencies() {
-  pipx install huggingface_hub[cli] omlmd argcomplete
+  pipx install huggingface_hub omlmd argcomplete
   brew install llama.cpp
 }
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -5,7 +5,7 @@ dependencies = [
   "argcomplete",
   "tqdm",
   "omlmd",
-  "huggingface_hub[cli]",
+  "huggingface_hub",
 ]
 requires-python = ">= 3.8"
 maintainers = [

diff --git a/ramalama/huggingface.py b/ramalama/huggingface.py
@@ -6,7 +6,7 @@
 Huggingface models requires the huggingface-cli and tqdm modules.
 These modules can be installed via PyPi tools like pip, pip3, pipx or via
 distribution package managers like dnf or apt. Example:
-pip install huggingface_hub[cli] tqdm
+pip install huggingface_hub tqdm
 """
 
 

diff --git a/requirements.txt b/requirements.txt
diff --git a/rpm/python-ramalama.spec b/rpm/python-ramalama.spec
@@ -40,7 +40,12 @@ BuildRequires: python%{python3_pkgversion}-pip
 BuildRequires: python%{python3_pkgversion}-setuptools
 BuildRequires: python%{python3_pkgversion}-wheel
 BuildRequires: python%{python3_pkgversion}-argcomplete
+Requires: python%{python3_pkgversion}-argcomplete
 Recommends: podman
+Recommends: python%{python3_pkgversion}-huggingface-hub
+Recommends: python%{python3_pkgversion}-tqdm
+
+
 Summary: %{summary}
 Provides: %{pypi_name} = %{version}-%{release}
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}