From e7bb76f19bd36680b0d54d44ec7d55c02e7e746a Mon Sep 17 00:00:00 2001 From: unclecode Date: Fri, 17 May 2024 15:52:39 +0800 Subject: [PATCH] chore: Update torch dependency to version 2.3.0 --- requirements.txt | 2 +- setup.py | 59 ++++++------------------------------------------ 2 files changed, 8 insertions(+), 53 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3e0ae0a1..ccd9a41a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,4 +16,4 @@ selenium==4.20.0 uvicorn==0.29.0 transformers==4.40.2 chromedriver-autoinstaller==0.6.4 -torch \ No newline at end of file +torch==2.3.0 \ No newline at end of file diff --git a/setup.py b/setup.py index e285769e..e59ca7f9 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,10 @@ # Read the requirements from requirements.txt with open("requirements.txt") as f: requirements = f.read().splitlines() - + +# Define the requirements for different environments +requirements_without_torch = [req for req in requirements if not req.startswith("torch")] + setup( name="Crawl4AI", version="0.1.2", @@ -16,6 +19,9 @@ license="MIT", packages=find_packages(), install_requires=requirements, + extras_require={ + "colab": requirements_without_torch, # Exclude torch for Colab + }, entry_points={ 'console_scripts': [ 'crawl4ai-download-models=crawl4ai.model_loader:main', @@ -33,54 +39,3 @@ ], python_requires=">=3.7", ) - -from setuptools import setup, find_packages -from setuptools.command.install import install as _install -import subprocess -import sys - -class InstallCommand(_install): - def run(self): - # Run the standard install first - _install.run(self) - # Now handle the dependencies manually - self.manual_dependencies_install() - - def manual_dependencies_install(self): - with open('requirements.txt') as f: - dependencies = f.read().splitlines() - for dependency in dependencies: - subprocess.check_call([sys.executable, '-m', 'pip', 'install', dependency]) - -# setup( -# name="Crawl4AI", -# version="0.1.0", -# description="🔥🕷️ Crawl4AI: Open-source LLM Friendly Web Crawler & Scrapper", -# long_description=open("README.md").read(), -# long_description_content_type="text/markdown", -# url="https://github.com/unclecode/crawl4ai", -# author="Unclecode", -# author_email="unclecode@kidocode.com", -# license="MIT", -# packages=find_packages(), -# install_requires=[], # Leave this empty to avoid default dependency resolution -# cmdclass={ -# 'install': InstallCommand, -# }, -# entry_points={ -# 'console_scripts': [ -# 'crawl4ai-download-models=crawl4ai.model_loader:main', -# ], -# }, -# classifiers=[ -# "Development Status :: 3 - Alpha", -# "Intended Audience :: Developers", -# "License :: OSI Approved :: Apache Software License", -# "Programming Language :: Python :: 3", -# "Programming Language :: Python :: 3.7", -# "Programming Language :: Python :: 3.8", -# "Programming Language :: Python :: 3.9", -# "Programming Language :: Python :: 3.10", -# ], -# python_requires=">=3.7", -# )