Skip to content

Commit 08db635

Browse files
committed
Merge main into fix/python-cached-full-scans
Resolve the version conflict by riding main's unreleased 3.6.2 instead of bumping to 3.7.0, and add the full-scan polling notes to the 3.6.2 changelog entry.
2 parents 18b1212 + 27f8b33 commit 08db635

17 files changed

Lines changed: 430 additions & 651 deletions

‎.github/actions/setup-hatch/action.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ runs:
99
- shell: bash
1010
run: |
1111
python -m pip install --upgrade pip
12-
pip install "virtualenv<20.36"
13-
pip install hatchling==1.27.0 hatch==1.14.0
12+
python -m pip install "hatch==1.18.1" "hatchling==1.32.4" "virtualenv==21.14.7"

‎.github/actions/setup-sfw/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ runs:
2424
using: "composite"
2525
steps:
2626
- if: ${{ inputs.python == 'true' || inputs.uv == 'true' }}
27-
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
27+
uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0
2828
with:
2929
python-version: "3.12"
3030

‎.github/workflows/api-drift-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
fetch-depth: 1
2727
persist-credentials: false
2828

29-
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
29+
- uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0
3030
with:
3131
python-version: "3.12"
3232

‎.github/workflows/dependency-review.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ jobs:
181181
182182
- name: Upload SFW report artifact
183183
if: always()
184-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
184+
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
185185
with:
186186
name: socket-firewall-free-${{ github.event.pull_request.number }}
187187
path: sfw-artifacts/
@@ -259,7 +259,7 @@ jobs:
259259
260260
- name: Upload SFW report artifact
261261
if: always()
262-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
262+
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
263263
with:
264264
name: socket-firewall-enterprise-${{ github.event.pull_request.number }}
265265
path: sfw-artifacts/

‎.github/workflows/package-check.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
fetch-depth: 1
2424
persist-credentials: false
2525

26-
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
26+
- uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0
2727
with:
2828
python-version: "3.12"
2929

@@ -50,7 +50,7 @@ jobs:
5050
"$RUNNER_TEMP/package-check/bin/python" -c "import socketdev; from socketdev.version import __version__; print('wheel smoke OK', __version__)"
5151
5252
- name: Upload distributions
53-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
53+
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
5454
with:
5555
name: socketdev-${{ github.sha }}
5656
path: dist/*

‎.github/workflows/pr-preview.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
fetch-depth: 0
9393
persist-credentials: false
9494

95-
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
95+
- uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0
9696
with:
9797
python-version: "3.12"
9898

@@ -127,7 +127,7 @@ jobs:
127127
"$RUNNER_TEMP/preview-check/bin/python" -c "import socketdev; from socketdev.version import __version__; print('preview wheel smoke OK', __version__)"
128128
129129
- name: Upload preview distributions
130-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
130+
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
131131
with:
132132
name: socketdev-preview-${{ github.run_id }}-${{ github.run_attempt }}
133133
path: dist/*
@@ -144,13 +144,13 @@ jobs:
144144
pull-requests: write
145145
steps:
146146
- name: Download preview distributions
147-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
147+
uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
148148
with:
149149
name: socketdev-preview-${{ github.run_id }}-${{ github.run_attempt }}
150150
path: dist
151151

152152
- name: Publish to TestPyPI
153-
uses: pypa/gh-action-pypi-publish@dc37677b2e1c63e2034f94d8a5b11f265b73ba33 # v1.14.2
153+
uses: pypa/gh-action-pypi-publish@7245906fb61fa33a13554f9d5fb856fe61758086 # v1.14.3
154154
with:
155155
repository-url: https://test.pypi.org/legacy/
156156
verbose: true

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
with:
1515
fetch-depth: 0
1616
persist-credentials: false
17-
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
17+
- uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7.1.0
1818
with:
1919
python-version: '3.13'
2020

@@ -53,7 +53,7 @@ jobs:
5353
5454
- name: Publish to PyPI
5555
if: steps.version_check.outputs.pypi_exists != 'true'
56-
uses: pypa/gh-action-pypi-publish@dc37677b2e1c63e2034f94d8a5b11f265b73ba33 # v1.14.2
56+
uses: pypa/gh-action-pypi-publish@7245906fb61fa33a13554f9d5fb856fe61758086 # v1.14.3
5757

5858
- name: Verify package is installable
5959
id: verify_package

‎CHANGELOG.md‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,62 @@
11
# Changelog
22

3+
## 3.6.2
4+
5+
### Fixed: reject retired API credentials before use
6+
7+
- The SDK rejects the retired API credential before storing or encoding it.
8+
9+
### Fixed: full-scan reads wait for analysis to finish
10+
11+
- `fullscans.stream()` now requests cached results (`?cached=true`) and polls
12+
while the API answers `202 Processing`, instead of treating the first `202`
13+
as a failed result. Polling backs off from 5s to 10s between attempts and
14+
stops when the budget runs out, raising `APITimeout`.
15+
- The polling budget defaults to the SDK's configured `timeout`. Callers can
16+
tune it with the new keyword-only arguments `poll_timeout_seconds`,
17+
`poll_initial_interval_seconds` and `poll_max_interval_seconds`. Each
18+
individual request is capped at 30 seconds or the remaining budget,
19+
whichever is shorter.
20+
- Transient failures (HTTP 408/502/503/504, timeouts, dropped connections) are
21+
retried within the budget. Authorization, not-found and quota errors still
22+
raise immediately.
23+
- Invalid polling settings (zero, negative, non-finite, booleans, or an
24+
initial interval above the maximum) raise `ValueError` before any request is
25+
sent.
26+
- The organization slug and full scan ID are now URL-encoded in the request
27+
path.
28+
- `API.do_request()` accepts an optional keyword-only `request_timeout` that
29+
overrides the configured timeout for a single call.
30+
31+
## 3.6.1
32+
33+
### Security: patched releases of certifi, uv and virtualenv
34+
35+
- Updated the locked versions of `certifi` (2025.11.12 → 2026.10.19), `uv`
36+
(0.11.17 → 0.13.4) and `virtualenv` (20.36.1 → 21.14.7) to pick up fixes for
37+
critical vulnerabilities. These versions are pinned in `uv.lock`, which
38+
controls the development and CI environment.
39+
- socketdev now requires `certifi>=2026.10.19`, so installing it also upgrades
40+
the CA bundle `requests` uses. Older bundles trust the compromised eMudhra
41+
intermediate CAs.
42+
- The release build toolchain (`.github/actions/setup-hatch`) now installs
43+
`virtualenv==21.14.7` and `hatchling==1.32.4`, matching `uv.lock` and the
44+
`[build-system]` pin. Published artifacts are built with the patched versions.
45+
- Raised the `requests` floor to `>=2.33.0`.
46+
47+
### Changed: Python 3.10 or newer is required
48+
49+
- `requires-python` is now `>=3.10` (previously `>=3.9`). The patched
50+
dependency releases no longer support Python 3.9, which reached end of life
51+
in October 2025. On Python 3.9, pip continues to resolve socketdev 3.6.0.
52+
53+
### Maintenance
54+
55+
- Pinned the `hatchling` build backend to 1.32.4 and capped built
56+
distributions at core metadata 2.4 so the locked Twine can validate them.
57+
- Raised the dev and test extras floors to `hatch>=1.18.1` and
58+
`pytest>=9.0.3`.
59+
360
## 3.6.0
461

562
### Changed: every API-sourced enum now tolerates unknown values

‎README.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
socketdev
33
#########
44

5+
Supported Python versions
6+
-------------------------
7+
8+
This SDK supports Python 3.10 and newer.
9+
510
Purpose
611
-------
712

‎pyproject.toml‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
[build-system]
2-
# 1.27.0 is the newest hatchling that supports Python 3.9, which this
3-
# package's requires-python still includes.
4-
requires = ["hatchling==1.32.0"]
2+
requires = ["hatchling==1.32.4"]
53
build-backend = "hatchling.build"
64

75
[project]
86
name = "socketdev"
97
dynamic = ["version"]
10-
requires-python = ">= 3.9"
8+
requires-python = ">= 3.10"
119
dependencies = [
12-
'requests>=2.32.5,<3',
13-
'typing-extensions>=4.12.2,<5'
10+
'requests>=2.33.0,<3',
11+
'typing-extensions>=4.12.2,<5',
12+
# requests' CA bundle. 2026.10.19 drops the roots behind the compromised
13+
# eMudhra intermediates; a floor, so later trust-store fixes still apply.
14+
'certifi>=2026.10.19'
1415
]
1516
readme = "README.rst"
1617
license = {file = "LICENSE"}
@@ -37,17 +38,21 @@ path = "socketdev/version.py"
3738

3839
[tool.hatch.build.targets.wheel]
3940
packages = ["socketdev"]
41+
core-metadata-version = "2.4"
42+
43+
[tool.hatch.build.targets.sdist]
44+
core-metadata-version = "2.4"
4045

4146
# modern, faster linter and language server. install with `pip install -e ".[dev]"`
4247
[project.optional-dependencies]
4348
dev = [
4449
"ruff>=0.3.0",
45-
"hatch>=1.14.0",
50+
"hatch>=1.18.1",
4651
"hatchling>=1.27.0",
4752
"twine>=4.0.0"
4853
]
4954
test = [
50-
"pytest>=7.0.0",
55+
"pytest>=9.0.3",
5156
"pytest-cov>=4.0.0"
5257
]
5358

0 commit comments

Comments
 (0)