Skip to content

Commit 8179b62

Browse files
musa-cfmusa-cf
authored
Merge pull request #2709 from cloudflare/sync/staging-next-2026-04-30
Sync staged changes (curated)
2 parents e4b3835 + 86676bc commit 8179b62

53 files changed

Lines changed: 1296 additions & 601 deletions

Some content is hidden

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

‎.devcontainer/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}
33

44
USER vscode
55

6-
RUN curl -sSf https://rye.astral.sh/get | RYE_VERSION="0.44.0" RYE_INSTALL_OPTION="--yes" bash
7-
ENV PATH=/home/vscode/.rye/shims:$PATH
6+
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
87

98
RUN echo "[[ -d .venv ]] && source .venv/bin/activate || export PATH=\$PATH" >> /home/vscode/.bashrc

‎.devcontainer/devcontainer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"context": ".."
88
},
99

10-
"postStartCommand": "rye sync --all-features",
10+
"postStartCommand": "uv sync --all-extras",
1111

1212
"customizations": {
1313
"vscode": {
@@ -20,7 +20,7 @@
2020
"python.defaultInterpreterPath": ".venv/bin/python",
2121
"python.typeChecking": "basic",
2222
"terminal.integrated.env.linux": {
23-
"PATH": "/home/vscode/.rye/shims:${env:PATH}"
23+
"PATH": "${env:PATH}"
2424
}
2525
}
2626
}

‎.github/workflows/ci.yml‎

Lines changed: 23 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,13 @@ jobs:
2828
steps:
2929
- uses: actions/checkout@v6
3030

31-
- name: Install Rye
32-
run: |
33-
curl -sSf https://rye.astral.sh/get | bash
34-
echo "$HOME/.rye/shims" >> $GITHUB_PATH
35-
env:
36-
RYE_VERSION: '0.44.0'
37-
RYE_INSTALL_OPTION: '--yes'
31+
- name: Install uv
32+
uses: astral-sh/setup-uv@v5
33+
with:
34+
version: '0.10.2'
3835

3936
- name: Install dependencies
40-
run: rye sync --all-features
37+
run: uv sync --all-extras
4138

4239
- name: Run lints
4340
run: ./scripts/lint
@@ -53,19 +50,16 @@ jobs:
5350
steps:
5451
- uses: actions/checkout@v6
5552

56-
- name: Install Rye
57-
run: |
58-
curl -sSf https://rye.astral.sh/get | bash
59-
echo "$HOME/.rye/shims" >> $GITHUB_PATH
60-
env:
61-
RYE_VERSION: '0.44.0'
62-
RYE_INSTALL_OPTION: '--yes'
53+
- name: Install uv
54+
uses: astral-sh/setup-uv@v5
55+
with:
56+
version: '0.10.2'
6357

6458
- name: Install dependencies
65-
run: rye sync --all-features
59+
run: uv sync --all-extras
6660

6761
- name: Run build
68-
run: rye build
62+
run: uv build
6963

7064
- name: Get GitHub OIDC Token
7165
if: |-
@@ -94,19 +88,18 @@ jobs:
9488
steps:
9589
- uses: actions/checkout@v6
9690

97-
- name: Install Rye
98-
run: |
99-
curl -sSf https://rye.astral.sh/get | bash
100-
echo "$HOME/.rye/shims" >> $GITHUB_PATH
101-
env:
102-
RYE_VERSION: '0.44.0'
103-
RYE_INSTALL_OPTION: '--yes'
91+
- name: Install uv
92+
uses: astral-sh/setup-uv@v5
93+
with:
94+
version: '0.10.2'
10495

10596
- name: Bootstrap
10697
run: ./scripts/bootstrap
10798

10899
- name: Run tests
109100
run: ./scripts/test
101+
env:
102+
UV_PYTHON: ">=3.9.0"
110103

111104
examples:
112105
timeout-minutes: 10
@@ -117,21 +110,17 @@ jobs:
117110
steps:
118111
- uses: actions/checkout@v6
119112

120-
- name: Install Rye
121-
run: |
122-
curl -sSf https://rye.astral.sh/get | bash
123-
echo "$HOME/.rye/shims" >> $GITHUB_PATH
124-
env:
125-
RYE_VERSION: '0.44.0'
126-
RYE_INSTALL_OPTION: '--yes'
113+
- name: Install uv
114+
uses: astral-sh/setup-uv@v5
115+
with:
116+
version: '0.10.2'
127117
- name: Install dependencies
128-
run: |
129-
rye sync --all-features
118+
run: uv sync --all-extras
130119

131120
- env:
132121
CLOUDFLARE_ACCOUNT_ID: f037e56e89293a057740de681ac9abbe
133122
CLOUDFLARE_EMAIL: terraform-acceptance-test@cfapi.net
134123
CLOUDFLARE_ZONE_ID: 0da42c8d2132a9ddaf714f9e7c920711
135124
CLOUDFLARE_API_KEY: ${{ secrets.CLOUDFLARE_API_KEY }}
136125
run: |
137-
rye run python ./examples/dns/record.py
126+
uv run python ./examples/dns/record.py

‎.github/workflows/detect-breaking-changes.yml‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,15 @@ jobs:
2222
# Ensure we can check out the pull request base in the script below.
2323
fetch-depth: ${{ env.FETCH_DEPTH }}
2424

25-
- name: Install Rye
26-
run: |
27-
curl -sSf https://rye.astral.sh/get | bash
28-
echo "$HOME/.rye/shims" >> $GITHUB_PATH
29-
env:
30-
RYE_VERSION: '0.44.0'
31-
RYE_INSTALL_OPTION: '--yes'
25+
- name: Install uv
26+
uses: astral-sh/setup-uv@v5
27+
with:
28+
version: '0.10.2'
3229
- name: Install dependencies
33-
run: |
34-
rye sync --all-features
30+
run: uv sync --all-extras
3531
- name: Detect removed symbols
3632
run: |
37-
rye run python scripts/detect-breaking-changes.py "${{ github.event.pull_request.base.sha }}"
33+
uv run python scripts/detect-breaking-changes.py "${{ github.event.pull_request.base.sha }}"
3834
3935
- name: Detect breaking changes
4036
run: |

‎.github/workflows/publish-pypi.yml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,10 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v6
1818

19-
- name: Install Rye
20-
run: |
21-
curl -sSf https://rye.astral.sh/get | bash
22-
echo "$HOME/.rye/shims" >> $GITHUB_PATH
23-
env:
24-
RYE_VERSION: '0.44.0'
25-
RYE_INSTALL_OPTION: '--yes'
19+
- name: Install uv
20+
uses: astral-sh/setup-uv@v5
21+
with:
22+
version: '0.9.13'
2623

2724
- name: Publish to PyPI
2825
run: |

‎.stats.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
configured_endpoints: 2195
22
openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-a6c352830d1270d0abb5bb983058ea21815e1bb7d2e163965335dcb0e706f057.yml
3-
openapi_spec_hash: ffe469d5b0b3f29c20ccb91c0a2862e7
4-
config_hash: a83bae9f0be0219cfe77d38d5af60d4a
3+
openapi_spec_hash: aa452e4dfaec546a7e50ef8665bd39f4
4+
config_hash: d3379006654eb5479a62d9576648acc5

‎Brewfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
brew "rye"
1+
brew "uv"
22

‎CONTRIBUTING.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
## Setting up the environment
22

3-
### With Rye
3+
### With `uv`
44

5-
We use [Rye](https://rye.astral.sh/) to manage dependencies because it will automatically provision a Python environment with the expected Python version. To set it up, run:
5+
We use [uv](https://docs.astral.sh/uv/) to manage dependencies because it will automatically provision a Python environment with the expected Python version. To set it up, run:
66

77
```sh
88
$ ./scripts/bootstrap
99
```
1010

11-
Or [install Rye manually](https://rye.astral.sh/guide/installation/) and run:
11+
Or [install uv manually](https://docs.astral.sh/uv/getting-started/installation/) and run:
1212

1313
```sh
14-
$ rye sync --all-features
14+
$ uv sync --all-extras
1515
```
1616

17-
You can then run scripts using `rye run python script.py` or by activating the virtual environment:
17+
You can then run scripts using `uv run python script.py` or by manually activating the virtual environment:
1818

1919
```sh
20-
# Activate the virtual environment - https://docs.python.org/3/library/venv.html#how-venvs-work
20+
# manually activate - https://docs.python.org/3/library/venv.html#how-venvs-work
2121
$ source .venv/bin/activate
2222

23-
# now you can omit the `rye run` prefix
23+
# now you can omit the `uv run` prefix
2424
$ python script.py
2525
```
2626

27-
### Without Rye
27+
### Without `uv`
2828

29-
Alternatively if you don't want to install `Rye`, you can stick with the standard `pip` setup by ensuring you have the Python version specified in `.python-version`, create a virtual environment however you desire and then install dependencies using this command:
29+
Alternatively if you don't want to install `uv`, you can stick with the standard `pip` setup by ensuring you have the Python version specified in `.python-version`, create a virtual environment however you desire and then install dependencies using this command:
3030

3131
```sh
3232
$ pip install -r requirements-dev.lock
@@ -45,7 +45,7 @@ All files in the `examples/` directory are not modified by the generator and can
4545
```py
4646
# add an example to examples/<your-example>.py
4747

48-
#!/usr/bin/env -S rye run python
48+
#!/usr/bin/env -S uv run python
4949
…
5050
```
5151

@@ -72,7 +72,7 @@ Building this package will create two files in the `dist/` directory, a `.tar.gz
7272
To create a distributable version of the library, all you have to do is run this command:
7373

7474
```sh
75-
$ rye build
75+
$ uv build
7676
# or
7777
$ python -m build
7878
```

‎README.md‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -29,45 +29,6 @@ The REST API documentation can be found on [developers.cloudflare.com](https://d
2929
pip install --pre cloudflare
3030
```
3131

32-
## Authentication
33-
34-
The SDK supports multiple authentication methods. Each can be provided as a constructor argument or read automatically from an environment variable.
35-
36-
### API Token (recommended)
37-
38-
[API tokens](https://developers.cloudflare.com/fundamentals/api/get-started/create-token/) are scoped to specific permissions and are the recommended way to authenticate.
39-
40-
```python
41-
from cloudflare import Cloudflare
42-
43-
client = Cloudflare(api_token="your-api-token")
44-
45-
# Or set the CLOUDFLARE_API_TOKEN environment variable and omit the argument:
46-
client = Cloudflare()
47-
```
48-
49-
### API Key + Email
50-
51-
The [Global API Key](https://developers.cloudflare.com/fundamentals/api/get-started/keys/) authenticates using a key and email pair. Both must be provided together.
52-
53-
```python
54-
from cloudflare import Cloudflare
55-
56-
client = Cloudflare(
57-
api_key="your-global-api-key",
58-
api_email="user@example.com",
59-
)
60-
61-
# Or set CLOUDFLARE_API_KEY and CLOUDFLARE_EMAIL environment variables:
62-
client = Cloudflare()
63-
```
64-
65-
| Parameter | Environment variable | Header sent |
66-
|-----------|---------------------|-------------|
67-
| `api_token` | `CLOUDFLARE_API_TOKEN` | `Authorization: Bearer <token>` |
68-
| `api_key` | `CLOUDFLARE_API_KEY` | `X-Auth-Key: <key>` |
69-
| `api_email` | `CLOUDFLARE_EMAIL` | `X-Auth-Email: <email>` |
70-
7132
## Usage
7233

7334
The full API of this library can be found in [api.md](api.md).

‎bin/publish-pypi‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env bash
22

33
set -eux
4+
rm -rf dist
45
mkdir -p dist
5-
rye build --clean
6-
rye publish --yes --token=$PYPI_TOKEN
6+
uv build
7+
uv publish --token=$PYPI_TOKEN

0 commit comments

Comments
 (0)