Skip to content

Commit 8d68b0d

Browse files
committed
Merge branch 'main' into lendemor/support_python_3_13
2 parents 8aa17a3 + 51ca89b commit 8d68b0d

File tree

321 files changed

+20251
-11048
lines changed

Some content is hidden

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

321 files changed

+20251
-11048
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@reflex-dev/reflex-team

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
name: Bug report
33
about: Create a report to help us improve
44
title: ''
5-
labels: bug
65
assignees: ''
76

87
---

.github/workflows/check_node_latest.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ jobs:
1818
strategy:
1919
matrix:
2020
python-version: ['3.12']
21+
split_index: [1, 2]
2122
node-version: ['node']
23+
fail-fast: false
24+
2225
steps:
2326
- uses: actions/checkout@v4
2427
- uses: ./.github/actions/setup_build_env
@@ -30,11 +33,11 @@ jobs:
3033
with:
3134
node-version: ${{ matrix.node-version }}
3235
- run: |
33-
poetry run uv pip install pyvirtualdisplay pillow
36+
poetry run uv pip install pyvirtualdisplay pillow pytest-split
3437
poetry run playwright install --with-deps
3538
- run: |
3639
poetry run pytest tests/test_node_version.py
37-
poetry run pytest tests/integration
40+
poetry run pytest tests/integration --splits 2 --group ${{matrix.split_index}}
3841
3942

4043

.github/workflows/check_outdated_dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
echo "$outdated"
7575
7676
# Ignore 3rd party dependencies that are not updated.
77-
filtered_outdated=$(echo "$outdated" | grep -vE 'Package|@chakra-ui|lucide-react|@splinetool/runtime|ag-grid-react|framer-motion|react-markdown|remark-math|remark-gfm|rehype-katex|rehype-raw' || true)
77+
filtered_outdated=$(echo "$outdated" | grep -vE 'Package|@chakra-ui|lucide-react|@splinetool/runtime|ag-grid-react|framer-motion|react-markdown|remark-math|remark-gfm|rehype-katex|rehype-raw|remark-unwrap-images' || true)
7878
no_extra=$(echo "$filtered_outdated" | grep -vE '\|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-' || true)
7979
8080

.github/workflows/integration_app_harness.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ concurrency:
66

77
on:
88
push:
9-
branches: ['main']
9+
branches: ["main"]
1010
paths-ignore:
11-
- '**/*.md'
11+
- "**/*.md"
1212
pull_request:
13-
branches: ['main']
13+
branches: ["main"]
1414
paths-ignore:
15-
- '**/*.md'
15+
- "**/*.md"
1616

1717
permissions:
1818
contents: read
@@ -24,6 +24,8 @@ jobs:
2424
matrix:
2525
state_manager: ['redis', 'memory']
2626
python-version: ['3.11.5', '3.12.0', '3.13.0']
27+
split_index: [1, 2]
28+
fail-fast: false
2729
runs-on: ubuntu-22.04
2830
services:
2931
# Label used to access the service container
@@ -45,13 +47,14 @@ jobs:
4547
python-version: ${{ matrix.python-version }}
4648
run-poetry-install: true
4749
create-venv-at-path: .venv
48-
- run: poetry run uv pip install pyvirtualdisplay pillow
50+
- run: poetry run uv pip install pyvirtualdisplay pillow pytest-split
4951
- name: Run app harness tests
5052
env:
51-
SCREENSHOT_DIR: /tmp/screenshots
53+
SCREENSHOT_DIR: /tmp/screenshots/${{ matrix.state_manager }}/${{ matrix.python-version }}/${{ matrix.split_index }}
5254
REDIS_URL: ${{ matrix.state_manager == 'redis' && 'redis://localhost:6379' || '' }}
5355
run: |
54-
poetry run pytest tests/integration
56+
poetry run playwright install --with-deps
57+
poetry run pytest tests/integration --splits 2 --group ${{matrix.split_index}}
5558
- uses: actions/upload-artifact@v4
5659
name: Upload failed test screenshots
5760
if: always()

.github/workflows/integration_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
fail-fast: false
123123
matrix:
124124
# Show OS combos first in GUI
125-
os: [ubuntu-latest, windows-latest]
125+
os: [ubuntu-latest]
126126
python-version: ['3.10.11', '3.11.4']
127127

128128
env:
@@ -145,7 +145,7 @@ jobs:
145145

146146
- name: Install Requirements for reflex-web
147147
working-directory: ./reflex-web
148-
run: poetry run uv pip install -r requirements.txt
148+
run: poetry run uv pip install $(grep -ivE "reflex " requirements.txt)
149149
- name: Install additional dependencies for DB access
150150
run: poetry run uv pip install psycopg2-binary
151151
- name: Init Website for reflex-web

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ fail_fast: true
33
repos:
44

55
- repo: https://github.com/charliermarsh/ruff-pre-commit
6-
rev: v0.6.9
6+
rev: v0.7.4
77
hooks:
88
- id: ruff-format
99
args: [reflex, tests]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ You can create a multi-page app by adding more pages.
228228

229229
<div align="center">
230230

231-
📑 [Docs](https://reflex.dev/docs/getting-started/introduction) &nbsp; | &nbsp; 🗞️ [Blog](https://reflex.dev/blog) &nbsp; | &nbsp; 📱 [Component Library](https://reflex.dev/docs/library) &nbsp; | &nbsp; 🖼️ [Gallery](https://reflex.dev/docs/gallery) &nbsp; | &nbsp; 🛸 [Deployment](https://reflex.dev/docs/hosting/deploy-quick-start) &nbsp;
231+
📑 [Docs](https://reflex.dev/docs/getting-started/introduction) &nbsp; | &nbsp; 🗞️ [Blog](https://reflex.dev/blog) &nbsp; | &nbsp; 📱 [Component Library](https://reflex.dev/docs/library) &nbsp; | &nbsp; 🖼️ [Templates](https://reflex.dev/templates/) &nbsp; | &nbsp; 🛸 [Deployment](https://reflex.dev/docs/hosting/deploy-quick-start) &nbsp;
232232

233233
</div>
234234

benchmarks/benchmark_lighthouse.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ def get_lighthouse_scores(directory_path: str | Path) -> dict:
4242
try:
4343
for filename in directory_path.iterdir():
4444
if filename.suffix == ".json" and filename.stem != "manifest":
45-
file_path = directory_path / filename
46-
data = json.loads(file_path.read_text())
45+
data = json.loads(filename.read_text())
4746
# Extract scores and add them to the dictionary with the filename as key
4847
scores[data["finalUrl"].replace("http://localhost:3000/", "/")] = {
4948
"performance_score": data["categories"]["performance"]["score"],

benchmarks/test_benchmark_compile_pages.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ def app_with_one_page(
210210
Yields:
211211
an AppHarness instance
212212
"""
213-
root = tmp_path_factory.mktemp(f"app1")
213+
root = tmp_path_factory.mktemp("app1")
214214

215-
yield AppHarness.create(root=root, app_source=AppWithOnePage) # type: ignore
215+
yield AppHarness.create(root=root, app_source=AppWithOnePage)
216216

217217

218218
@pytest.fixture(scope="session")
@@ -227,7 +227,7 @@ def app_with_ten_pages(
227227
Yields:
228228
an AppHarness instance
229229
"""
230-
root = tmp_path_factory.mktemp(f"app10")
230+
root = tmp_path_factory.mktemp("app10")
231231
yield AppHarness.create(
232232
root=root,
233233
app_source=functools.partial(
@@ -249,7 +249,7 @@ def app_with_hundred_pages(
249249
Yields:
250250
an AppHarness instance
251251
"""
252-
root = tmp_path_factory.mktemp(f"app100")
252+
root = tmp_path_factory.mktemp("app100")
253253

254254
yield AppHarness.create(
255255
root=root,
@@ -272,11 +272,11 @@ def app_with_thousand_pages(
272272
Yields:
273273
an AppHarness instance
274274
"""
275-
root = tmp_path_factory.mktemp(f"app1000")
275+
root = tmp_path_factory.mktemp("app1000")
276276

277277
yield AppHarness.create(
278278
root=root,
279-
app_source=functools.partial( # type: ignore
279+
app_source=functools.partial(
280280
AppWithThousandPages,
281281
render_comp=render_multiple_pages, # type: ignore
282282
),
@@ -295,7 +295,7 @@ def app_with_ten_thousand_pages(
295295
Yields:
296296
running AppHarness instance
297297
"""
298-
root = tmp_path_factory.mktemp(f"app10000")
298+
root = tmp_path_factory.mktemp("app10000")
299299

300300
yield AppHarness.create(
301301
root=root,

docker-example/production-app-platform/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# Stage 1: init
2626
FROM python:3.11 as init
2727

28-
ARG uv=/root/.cargo/bin/uv
28+
ARG uv=/root/.local/bin/uv
2929

3030
# Install `uv` for faster package boostrapping
3131
ADD --chmod=755 https://astral.sh/uv/install.sh /install.sh

docker-example/production-compose/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Stage 1: init
55
FROM python:3.11 as init
66

7-
ARG uv=/root/.cargo/bin/uv
7+
ARG uv=/root/.local/bin/uv
88

99
# Install `uv` for faster package boostrapping
1010
ADD --chmod=755 https://astral.sh/uv/install.sh /install.sh

0 commit comments

Comments
 (0)