Skip to content

Commit 5c42c89

Browse files
committed
Merge branch 'develop' into pr/Axel-CH/10062
2 parents d37e23f + 9953903 commit 5c42c89

File tree

95 files changed

+6948
-2207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+6948
-2207
lines changed

.github/workflows/ci.yml

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -276,14 +276,23 @@ jobs:
276276
with:
277277
python-version: ${{ matrix.python-version }}
278278

279-
- name: Pip cache (Windows)
280-
uses: actions/cache@v4
279+
- name: Install uv
280+
uses: astral-sh/setup-uv@v4
281281
with:
282-
path: ~\AppData\Local\pip\Cache
283-
key: pip-${{ matrix.os }}-${{ matrix.python-version }}
282+
enable-cache: true
283+
cache-dependency-glob: "requirements**.txt"
284+
cache-suffix: "${{ matrix.python-version }}"
285+
prune-cache: false
284286

285287
- name: Installation
286288
run: |
289+
uv venv
290+
.venv\Scripts\activate
291+
# persist the venv path for future steps
292+
"$(pwd)/.venv/Scripts" >> $env:GITHUB_PATH
293+
294+
function uvpipFunction { uv pip $args }
295+
Set-Alias -name pip -value uvpipFunction
287296
./build_helpers/install_windows.ps1
288297
289298
- name: Tests
@@ -517,14 +526,14 @@ jobs:
517526
ft_client/dist
518527
retention-days: 10
519528

520-
deploy-pypi:
521-
name: "Deploy to PyPI"
529+
deploy-test-pypi:
530+
name: "Publish Python 🐍 distribution 📦 to TestPyPI"
522531
needs: [ build ]
523532
runs-on: ubuntu-22.04
524533
if: (github.event_name == 'release')
525534
environment:
526-
name: release
527-
url: https://pypi.org/p/freqtrade
535+
name: testpypi
536+
url: https://test.pypi.org/p/freqtrade
528537
permissions:
529538
id-token: write
530539

@@ -538,14 +547,35 @@ jobs:
538547
path: dist
539548
merge-multiple: true
540549

541-
542550
- name: Publish to PyPI (Test)
543-
uses: pypa/[email protected].2
551+
uses: pypa/[email protected].3
544552
with:
545553
repository-url: https://test.pypi.org/legacy/
546554

555+
556+
deploy-pypi:
557+
name: "Publish Python 🐍 distribution 📦 to PyPI"
558+
needs: [ build ]
559+
runs-on: ubuntu-22.04
560+
if: (github.event_name == 'release')
561+
environment:
562+
name: pypi
563+
url: https://pypi.org/p/freqtrade
564+
permissions:
565+
id-token: write
566+
567+
steps:
568+
- uses: actions/checkout@v4
569+
570+
- name: Download artifact 📦
571+
uses: actions/download-artifact@v4
572+
with:
573+
pattern: freqtrade*-build
574+
path: dist
575+
merge-multiple: true
576+
547577
- name: Publish to PyPI
548-
uses: pypa/[email protected].2
578+
uses: pypa/[email protected].3
549579

550580

551581
deploy-docker:

.pre-commit-config.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ repos:
1717
- types-cachetools==5.5.0.20240820
1818
- types-filelock==3.2.7
1919
- types-requests==2.32.0.20241016
20-
- types-tabulate==0.9.0.20240106
21-
- types-python-dateutil==2.9.0.20241003
20+
- types-tabulate==0.9.0.20241207
21+
- types-python-dateutil==2.9.0.20241206
2222
- SQLAlchemy==2.0.36
2323
# stages: [push]
2424

@@ -31,7 +31,7 @@ repos:
3131

3232
- repo: https://github.com/charliermarsh/ruff-pre-commit
3333
# Ruff version.
34-
rev: 'v0.8.0'
34+
rev: 'v0.8.3'
3535
hooks:
3636
- id: ruff
3737
- id: ruff-format
@@ -56,6 +56,11 @@ repos:
5656
.*\.md
5757
)$
5858
59+
- repo: https://github.com/stefmolin/exif-stripper
60+
rev: 0.6.1
61+
hooks:
62+
- id: strip-exif
63+
5964
- repo: https://github.com/codespell-project/codespell
6065
rev: v2.3.0
6166
hooks:
-547 KB
Binary file not shown.
-3.17 MB
Binary file not shown.
-549 KB
Binary file not shown.
-543 KB
Binary file not shown.

build_helpers/install_windows.ps1

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
# vendored Wheels compiled via https://github.com/xmatthias/ta-lib-python/tree/ta_bundled_040
22

3-
python -m pip install --upgrade pip wheel
3+
python -m pip install --upgrade pip
4+
python -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')"
45

5-
$pyv = python -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')"
6-
7-
8-
pip install --find-links=build_helpers\ --prefer-binary TA-Lib
6+
pip install -U wheel "numpy<2"
7+
pip install --only-binary ta-lib --find-links=build_helpers\ ta-lib
98

109
pip install -r requirements-dev.txt
1110
pip install -e .

build_helpers/pyarrow-18.0.0-cp311-cp311-linux_armv7l.whl renamed to build_helpers/pyarrow-18.1.0-cp311-cp311-linux_armv7l.whl

15 MB
Binary file not shown.

build_helpers/schema.json

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,17 @@
102102
},
103103
"dry_run_wallet": {
104104
"description": "Initial wallet balance for dry run mode.",
105-
"type": "number",
106-
"default": 1000
105+
"type": [
106+
"number",
107+
"object"
108+
],
109+
"default": 1000,
110+
"patternProperties": {
111+
"^[a-zA-Z0-9]+$": {
112+
"type": "number"
113+
}
114+
},
115+
"additionalProperties": false
107116
},
108117
"cancel_open_orders_on_exit": {
109118
"description": "Cancel open orders when exiting.",
1.62 MB
Binary file not shown.

0 commit comments

Comments
 (0)