diff --git a/Dockerfile b/Dockerfile index e1220e3b8..22b0c43a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN cd /tmp && /tmp/install_ta-lib.sh && rm -r /tmp/*ta-lib* ENV LD_LIBRARY_PATH /usr/local/lib # Install dependencies -COPY requirements.txt requirements-common.txt requirements-hyperopt.txt /freqtrade/ +COPY requirements.txt requirements-hyperopt.txt /freqtrade/ RUN pip install numpy --no-cache-dir \ && pip install -r requirements-hyperopt.txt --no-cache-dir diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 5c5e4a885..0633008ea 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -17,7 +17,7 @@ RUN cd /tmp && /tmp/install_ta-lib.sh && rm -r /tmp/*ta-lib* ENV LD_LIBRARY_PATH /usr/local/lib # Install dependencies -COPY requirements.txt requirements-common.txt /freqtrade/ +COPY requirements.txt /freqtrade/ RUN pip install numpy --no-cache-dir \ && pip install -r requirements.txt --no-cache-dir diff --git a/requirements-common.txt b/requirements-common.txt deleted file mode 100644 index d0f0ef370..000000000 --- a/requirements-common.txt +++ /dev/null @@ -1,37 +0,0 @@ -# requirements without requirements installable via conda -# mainly used for Raspberry pi installs -ccxt==1.34.11 -SQLAlchemy==1.3.19 -python-telegram-bot==12.8 -arrow==0.16.0 -cachetools==4.1.1 -requests==2.24.0 -urllib3==1.25.10 -wrapt==1.12.1 -jsonschema==3.2.0 -TA-Lib==0.4.18 -tabulate==0.8.7 -pycoingecko==1.3.0 -jinja2==2.11.2 -tables==3.6.1 -blosc==1.9.2 - -# find first, C search in arrays -py_find_1st==1.1.4 - -# Load ticker files 30% faster -python-rapidjson==0.9.1 - -# Notify systemd -sdnotify==0.3.2 - -# Api server -flask==1.1.2 -flask-jwt-extended==3.24.1 -flask-cors==3.0.9 - -# Support for colorized terminal output -colorama==0.4.3 -# Building config files interactively -questionary==1.5.2 -prompt-toolkit==3.0.7 diff --git a/requirements.txt b/requirements.txt index a1a1fb250..73ad7f4ab 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,38 @@ -# Load common requirements --r requirements-common.txt - numpy==1.19.1 pandas==1.1.2 + +ccxt==1.34.11 +SQLAlchemy==1.3.19 +python-telegram-bot==12.8 +arrow==0.16.0 +cachetools==4.1.1 +requests==2.24.0 +urllib3==1.25.10 +wrapt==1.12.1 +jsonschema==3.2.0 +TA-Lib==0.4.18 +tabulate==0.8.7 +pycoingecko==1.3.0 +jinja2==2.11.2 +tables==3.6.1 +blosc==1.9.2 + +# find first, C search in arrays +py_find_1st==1.1.4 + +# Load ticker files 30% faster +python-rapidjson==0.9.1 + +# Notify systemd +sdnotify==0.3.2 + +# Api server +flask==1.1.2 +flask-jwt-extended==3.24.1 +flask-cors==3.0.9 + +# Support for colorized terminal output +colorama==0.4.3 +# Building config files interactively +questionary==1.5.2 +prompt-toolkit==3.0.7 diff --git a/setup.py b/setup.py index 7213d3092..88d754668 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ setup(name='freqtrade', setup_requires=['pytest-runner', 'numpy'], tests_require=['pytest', 'pytest-asyncio', 'pytest-cov', 'pytest-mock', ], install_requires=[ - # from requirements-common.txt + # from requirements.txt 'ccxt>=1.24.96', 'SQLAlchemy', 'python-telegram-bot', @@ -82,7 +82,6 @@ setup(name='freqtrade', 'jinja2', 'questionary', 'prompt-toolkit', - # from requirements.txt 'numpy', 'pandas', 'tables',