Skip to content

Commit f41f9cb

Browse files
authored
remove git https pyproject (#6306)
* remove git https pyproject * 3 10 * Rename step for installing reflex-docs dependencies in integration tests
1 parent 8a35867 commit f41f9cb

File tree

7 files changed

+1951
-3886
lines changed

7 files changed

+1951
-3886
lines changed

.github/workflows/check_outdated_dependencies.yml

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -52,32 +52,18 @@ jobs:
5252
- uses: ./.github/actions/setup_build_env
5353
with:
5454
python-version: 3.13
55-
run-uv-sync: true
5655

57-
- name: Clone Reflex Website Repo
58-
uses: actions/checkout@v4
59-
with:
60-
repository: reflex-dev/reflex-web
61-
ref: main
62-
path: reflex-web
63-
- name: Compile pyproject.toml into requirements.txt
64-
working-directory: ./reflex-web
65-
run: |
66-
uv pip compile pyproject.toml --no-annotate --no-header --no-deps --output-file requirements.txt
67-
uv pip list --format=json | jq -r '"^" + .[].name + "[ =]"' > installed_patterns.txt
68-
grep -ivf installed_patterns.txt requirements.txt > requirements.txt.tmp && mv requirements.txt.tmp requirements.txt
69-
rm installed_patterns.txt
70-
- name: Install Requirements for reflex-web
71-
working-directory: ./reflex-web
72-
run: uv pip install -r requirements.txt
73-
- name: Init Website for reflex-web
74-
working-directory: ./reflex-web
75-
run: uv run reflex init
56+
- name: Install Requirements for reflex-docs
57+
working-directory: ./docs/app
58+
run: uv sync
59+
- name: Init Website for reflex-docs
60+
working-directory: ./docs/app
61+
run: uv run --active --no-sync reflex init
7662
- name: Run Website and Check for errors
7763
run: |
78-
uv run bash scripts/integration.sh ./reflex-web dev
64+
uv run --active --no-sync bash scripts/integration.sh ./docs/app prod
7965
- name: Check outdated frontend dependencies
80-
working-directory: ./reflex-web/.web
66+
working-directory: ./docs/app/.web
8167
run: |
8268
raw_outdated=$(/home/runner/.local/share/reflex/bun/bin/bun outdated)
8369
outdated=$(echo "$raw_outdated" | grep -vE '\|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\|' || true)

.github/workflows/integration_tests.yml

Lines changed: 3 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -146,55 +146,10 @@ jobs:
146146
with:
147147
node-version: 22
148148

149-
# Build git+https deps as wheels outside sfw (avoids sfw MITM cert issues
150-
# with git), then install everything else through sfw for scanning.
151-
# TODO: revisit when https://github.com/SocketDev/sfw-free/issues/30 is resolved.
152-
- name: Pre-install git dependencies (outside sfw)
153-
run: |
154-
# Install git+https deps directly without sfw to avoid MITM cert issues.
155-
# Their transitive registry deps will still be scanned by sfw uv sync.
156-
grep -oP 'git\+https://[^"]+' uv.lock | sort -u > "$RUNNER_TEMP/git-deps.txt" || true
157-
if [ -s "$RUNNER_TEMP/git-deps.txt" ]; then
158-
echo "Installing git dependencies:"
159-
cat "$RUNNER_TEMP/git-deps.txt"
160-
uv pip install --no-deps -r "$RUNNER_TEMP/git-deps.txt"
161-
else
162-
echo "No git dependencies found."
163-
fi
164-
- name: Install Dependencies (scanned by Socket.dev)
149+
- name: Install reflex-docs dependencies
150+
working-directory: ./docs/app
165151
run: sfw uv sync
166152

167-
# TODO: revisit when https://github.com/SocketDev/sfw-free/issues/30 is resolved.
168-
- name: Pre-install reflex-docs git dependencies (outside sfw)
169-
working-directory: ./docs/app
170-
run: |
171-
# Replace reflex-dev/reflex git deps with plain package names (PR version is pre-installed)
172-
sed -i -E 's|"([a-zA-Z0-9_-]+)\s*@\s*git\+https://github\.com/reflex-dev/reflex@[^"]*"|"\1"|g' pyproject.toml
173-
# Install git+https deps from pyproject.toml before pip compile resolves them.
174-
# Exclude reflex itself — the PR version is already installed.
175-
grep -oP 'git\+https://[^"'"'"']+' pyproject.toml | sort -u > git-requirements.txt || true
176-
if [ -s git-requirements.txt ]; then
177-
echo "Installing git dependencies:"
178-
cat git-requirements.txt
179-
uv pip install --no-deps -r git-requirements.txt
180-
fi
181-
- name: Compile and install reflex-docs requirements (scanned by Socket.dev)
182-
working-directory: ./docs/app
183-
run: |
184-
sfw uv pip compile pyproject.toml --no-annotate --no-header --no-deps --output-file requirements.txt
185-
uv pip list --format=json | jq -r '"^" + .[].name + "[ =]"' > installed_patterns.txt
186-
grep -ivf installed_patterns.txt requirements.txt > requirements.txt.tmp && mv requirements.txt.tmp requirements.txt
187-
rm installed_patterns.txt
188-
if [ -s requirements.txt ]; then
189-
sfw uv pip install -r requirements.txt
190-
fi
191-
- name: Verify installed reflex version matches this checkout
192-
run: |
193-
expected_sha="$(git rev-parse --short=8 HEAD)"
194-
installed_version="$(uv run --active --no-sync python -c 'import importlib.metadata as metadata; print(metadata.version("reflex"))')"
195-
echo "Expected checkout SHA: $expected_sha"
196-
echo "Installed reflex version: $installed_version"
197-
[[ "$installed_version" == *"+$expected_sha" ]]
198153
- name: Init Website for reflex-docs
199154
working-directory: ./docs/app
200155
run: uv run --active --no-sync reflex init
@@ -259,18 +214,9 @@ jobs:
259214
- uses: ./.github/actions/setup_build_env
260215
with:
261216
python-version: ${{ matrix.python-version }}
262-
run-uv-sync: true
263-
264-
- name: Install reflex-docs dependencies
265-
working-directory: ./docs/app
266-
run: |
267-
uv pip compile pyproject.toml --no-annotate --no-header --no-deps --output-file requirements.txt
268-
uv pip list --format=json | jq -r '"^" + .[].name + "[ =]"' > installed_patterns.txt
269-
grep -ivf installed_patterns.txt requirements.txt > requirements.txt.tmp && mv requirements.txt.tmp requirements.txt
270-
rm installed_patterns.txt
271217
- name: Install Requirements for reflex-docs
272218
working-directory: ./docs/app
273-
run: uv pip install -r requirements.txt
219+
run: uv sync
274220
- name: Init Website for reflex-docs
275221
working-directory: ./docs/app
276222
run: uv run --active --no-sync reflex init

docs/app/pyproject.toml

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "reflex-docs-app"
33
version = "0.0.1"
44
readme = "README.md"
5-
requires-python = ">=3.11"
5+
requires-python = ">=3.10"
66
dependencies = [
77
"email-validator",
88
"fastapi",
@@ -15,14 +15,14 @@ dependencies = [
1515
"plotly-express",
1616
"psycopg[binary]",
1717
"python-frontmatter",
18-
"reflex @ git+https://github.com/reflex-dev/reflex@main",
19-
"reflex-docgen @ git+https://github.com/reflex-dev/reflex@main#subdirectory=packages/reflex-docgen",
18+
"reflex",
19+
"reflex-docgen",
2020
"reflex-enterprise",
2121
"reflex-hosting-cli",
2222
"reflex-pyplot",
23-
"reflex-integrations-docs @ git+https://github.com/reflex-dev/reflex@main#subdirectory=packages/integrations-docs",
24-
"reflex-ui @ git+https://github.com/reflex-dev/reflex@main#subdirectory=packages/reflex-ui",
25-
"reflex-ui-shared @ git+https://github.com/reflex-dev/reflex@main#subdirectory=packages/reflex-ui-shared",
23+
"reflex-integrations-docs",
24+
"reflex-ui",
25+
"reflex-ui-shared",
2626
"alembic",
2727
"requests",
2828
"ruff-format",
@@ -97,10 +97,3 @@ skip = "data/*"
9797

9898
[tool.uv]
9999
required-version = ">=0.7.0"
100-
101-
[tool.uv.sources]
102-
reflex = { path = "../../", editable = true }
103-
reflex-docgen = { path = "../../packages/reflex-docgen", editable = true }
104-
reflex-ui = { path = "../../packages/reflex-ui", editable = true }
105-
reflex-ui-shared = { path = "../../packages/reflex-ui-shared", editable = true }
106-
reflex-integrations-docs = { path = "../../packages/integrations-docs", editable = true }

0 commit comments

Comments
 (0)