diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5934ad8..628c6e8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,10 +12,13 @@ jobs: uses: Drakkar-Software/.github/.github/workflows/python3_lint_workflow.yml@master with: project_main_package: octobot_services + use_full_requirements: true tests: needs: lint uses: Drakkar-Software/.github/.github/workflows/python3_tests_workflow.yml@master + with: + use_full_requirements: true secrets: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} @@ -23,6 +26,8 @@ jobs: needs: tests if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') uses: Drakkar-Software/.github/.github/workflows/python3_sdist_workflow.yml@master + with: + use_full_requirements: true secrets: PYPI_OFFICIAL_UPLOAD_URL: ${{ secrets.PYPI_OFFICIAL_UPLOAD_URL }} PYPI_USERNAME: __token__ diff --git a/CHANGELOG.md b/CHANGELOG.md index cd5eb00..3806385 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.6.29] - 2024-11-26 +### Added +[Requirements] [full] requirements installation + ## [1.6.28] - 2025-10-28 ### Added - Add `data_cache` to `AbstractServiceFeed` diff --git a/MANIFEST.in b/MANIFEST.in index 417fbeb..bc2ec01 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,3 +4,4 @@ include README.md include LICENSE include CHANGELOG.md include requirements.txt +include full_requirements.txt diff --git a/README.md b/README.md index a96864f..812eeca 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# OctoBot-Services [1.6.28](https://github.com/Drakkar-Software/OctoBot-Services/tree/master/docs/CHANGELOG.md) +# OctoBot-Services [1.6.29](https://github.com/Drakkar-Software/OctoBot-Services/tree/master/docs/CHANGELOG.md) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/31a1caa6e5384d80bf890dba5c9b5e4b)](https://app.codacy.com/gh/Drakkar-Software/OctoBot-Services?utm_source=github.com&utm_medium=referral&utm_content=Drakkar-Software/OctoBot-Services&utm_campaign=Badge_Grade_Dashboard) [![PyPI](https://img.shields.io/pypi/v/OctoBot-Services.svg)](https://pypi.python.org/pypi/OctoBot-Services/) [![Github-Action-CI](https://github.com/Drakkar-Software/OctoBot-Services/workflows/OctoBot-Services-CI/badge.svg)](https://github.com/Drakkar-Software/OctoBot-Services/actions) diff --git a/full_requirements.txt b/full_requirements.txt new file mode 100644 index 0000000..35286e2 --- /dev/null +++ b/full_requirements.txt @@ -0,0 +1,43 @@ +# Drakkar-Software requirements +OctoBot-Commons[full]>=1.9.88, <1.10 +OctoBot-Trading[full]>=2.4.232, <2.5 + +# Services +# Reddit +asyncpraw==7.8.1 +# Telegram +python-telegram-bot==22.3 # update alongside supabase for httpx requirement +telethon==1.24.0 +# Twitter (associated tentacles are disabled as starting from feb 9 2023, API is now paid only). +# see https://twitter.com/TwitterDev/status/1621026986784337922 +# Python-Twitter==3.5 +# Google +simplifiedpytrends>=1.1.2 +# Ngrok +pyngrok==7.3.0 +# Web +## http server +flask==3.1.1 +werkzeug == 3.1.3 +# Flask templates +jinja2==3.1.6 +## flask minification +flask-compress==1.18 +## flask cache +flask-caching==2.3.1 +## flask user authentication management +flask-login==0.6.3 +## flask CORS management +flask-cors==6.0.1 +## user form validators +WTForms==3.2.1 +Flask-WTF==1.2.2 +## websockets +### used by the webhook service and flask-socketio for the web interface +gevent==25.5.1 +### used by flask-socketio with gevent (listed here because multiple libs are usable, force this one) +gevent-websocket==0.10.1 +flask-socketio==5.5.1 + +# Analysis tools +vaderSentiment==3.3.2 diff --git a/requirements.txt b/requirements.txt index f61526c..7c8327f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,46 +1,7 @@ # Drakkar-Software requirements Async-Channel>=2.2, <2.3 -OctoBot-Commons>=1.9, <1.10 -OctoBot-Trading>=2.4.211, <2.5 +OctoBot-Commons>=1.9.88, <1.10 +OctoBot-Trading>=2.4.232, <2.5 -# Services -# Reddit -asyncpraw==7.8.1 -# Telegram -python-telegram-bot==22.3 # update alongside supabase for httpx requirement -telethon==1.24.0 -# Twitter (associated tentacles are disabled as starting from feb 9 2023, API is now paid only). -# see https://twitter.com/TwitterDev/status/1621026986784337922 -# Python-Twitter==3.5 -# Google -simplifiedpytrends>=1.1.2 -# Ngrok -pyngrok==7.3.0 # chatgpt openai==1.99.9 -# Web -## http server -flask==3.1.1 -werkzeug == 3.1.3 -# Flask templates -jinja2==3.1.6 -## flask minification -flask-compress==1.18 -## flask cache -flask-caching==2.3.1 -## flask user authentication management -flask-login==0.6.3 -## flask CORS management -flask-cors==6.0.1 -## user form validators -WTForms==3.2.1 -Flask-WTF==1.2.2 -## websockets -### used by the webhook service and flask-socketio for the web interface -gevent==25.5.1 -### used by flask-socketio with gevent (listed here because multiple libs are usable, force this one) -gevent-websocket==0.10.1 -flask-socketio==5.5.1 - -# Analysis tools -vaderSentiment==3.3.2 diff --git a/setup.py b/setup.py index ad357f6..d179fff 100644 --- a/setup.py +++ b/setup.py @@ -26,6 +26,7 @@ DESCRIPTION = f.read() REQUIRED = open('requirements.txt').readlines() +FULL_REQUIRED = open('full_requirements.txt').readlines() REQUIRES_PYTHON = '>=3.8' setup( @@ -44,6 +45,9 @@ zip_safe=False, data_files=[], install_requires=REQUIRED, + extras_require={ + 'full': FULL_REQUIRED, + }, python_requires=REQUIRES_PYTHON, classifiers=[ 'Development Status :: 5 - Production/Stable',