Skip to content

Commit

Permalink
Merge branch 'freqtrade:develop' into freqtrade-develop
Browse files Browse the repository at this point in the history
  • Loading branch information
stash86 authored Dec 3, 2024
2 parents b32af33 + 94e09f9 commit a4761cc
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 10 deletions.
31 changes: 26 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -517,14 +517,14 @@ jobs:
ft_client/dist
retention-days: 10

deploy-pypi:
name: "Deploy to PyPI"
deploy-test-pypi:
name: "Publish Python 🐍 distribution 📦 to TestPyPI"
needs: [ build ]
runs-on: ubuntu-22.04
if: (github.event_name == 'release')
environment:
name: release
url: https://pypi.org/p/freqtrade
name: testpypi
url: https://test.pypi.org/p/freqtrade
permissions:
id-token: write

Expand All @@ -538,12 +538,33 @@ jobs:
path: dist
merge-multiple: true


- name: Publish to PyPI (Test)
uses: pypa/[email protected]
with:
repository-url: https://test.pypi.org/legacy/


deploy-pypi:
name: "Publish Python 🐍 distribution 📦 to PyPI"
needs: [ build ]
runs-on: ubuntu-22.04
if: (github.event_name == 'release')
environment:
name: pypi
url: https://pypi.org/p/freqtrade
permissions:
id-token: write

steps:
- uses: actions/checkout@v4

- name: Download artifact 📦
uses: actions/download-artifact@v4
with:
pattern: freqtrade*-build
path: dist
merge-multiple: true

- name: Publish to PyPI
uses: pypa/[email protected]

Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion freqtrade/data/history/history_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ def download_data(
Download data function. Used from both cli and API.
"""
timerange = TimeRange()
if "days" in config:
if "days" in config and config["days"] is not None:
time_since = (datetime.now() - timedelta(days=config["days"])).strftime("%Y%m%d")
timerange = TimeRange.parse_timerange(f"{time_since}-")

Expand Down
2 changes: 1 addition & 1 deletion freqtrade/exchange/binance.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def get_historic_ohlcv(

if (
self._config["exchange"].get("only_from_ccxt", False)
and
or
# only download timeframes with significant improvements,
# otherwise fall back to rest API
not (
Expand Down
2 changes: 1 addition & 1 deletion freqtrade/exchange/binance_public_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ async def download_archive_ohlcv(
)
except Exception as e:
logger.warning(
"An exception occurred during fast download from Binance, falling back to"
"An exception occurred during fast download from Binance, falling back to "
"the slower REST API, this can take more time.",
exc_info=e,
)
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
-r docs/requirements-docs.txt

coveralls==4.0.1
ruff==0.8.0
ruff==0.8.1
mypy==1.13.0
pre-commit==4.0.1
pytest==8.3.4
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jinja2==3.1.4
tables==3.10.1
joblib==1.4.2
rich==13.9.4
pyarrow==18.0.0; platform_machine != 'armv7l'
pyarrow==18.1.0; platform_machine != 'armv7l'

# find first, C search in arrays
py_find_1st==1.1.6
Expand Down

0 comments on commit a4761cc

Please sign in to comment.