Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: "3.11"
- name: Install ruff
Expand All @@ -35,9 +35,9 @@ jobs:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
- name: Install package with test dependencies
Expand All @@ -50,9 +50,9 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: "3.11"
- name: Install dependencies
Expand All @@ -67,9 +67,9 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: "3.11"
- name: Build sdist and wheel
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: "3.11"
- name: Build sdist and wheel
Expand All @@ -42,7 +42,7 @@ jobs:
exit 1
fi
- name: Upload distribution artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7 # keep paired with download-artifact@v8 in the publish job
with:
name: dist
path: dist/
Expand All @@ -60,7 +60,7 @@ jobs:
id-token: write # required for Trusted Publishing (OIDC)
steps:
- name: Download distribution artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8 # keep paired with upload-artifact@v7 in the build job
with:
name: dist
path: dist/
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ to follow [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

### Changed
- Refreshed documentation copyright metadata and moved GitHub Actions workflow dependencies to current Node 24-backed major versions (#60).

### Fixed
- `Manager.monitor_connection` no longer crashes its monitoring thread when the connection drops. Pinging a downed connection raised `ManagerSocketError` (broken socket) or `ManagerError` (the liveness check inside `send_action` failing when the connection dropped just after the loop's own check) inside the thread, which dumped a traceback to stderr and killed the monitor. The monitor now catches both and stops cleanly, logging the reason at debug level when a logger is set. The method also returns the monitoring thread so callers can join it (#3).
- `Manager.send_action` no longer raises a raw `AttributeError` when a concurrent `disconnect()` clears the connection between the liveness check and the send. It now drops the just-registered request and raises `ManagerSocketError` instead (#3).
Expand Down
3 changes: 2 additions & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

project = "pystrix"
copyright = module.COPYRIGHT
copyright_holder = module.COPYRIGHT.split(", ", 1)[1]
version = re.match(r"^(\d+\.\d+)", module.VERSION).group(1)
release = module.VERSION

Expand All @@ -41,7 +42,7 @@
"index",
"pystrix.tex",
"pystrix Documentation",
re.search(", (.*?) <", module.COPYRIGHT).group(1),
copyright_holder,
"manual",
),
]
2 changes: 1 addition & 1 deletion pystrix/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@
import pystrix.ami

VERSION = "1.3.0"
COPYRIGHT = "2013, Neil Tallim <flan@uguu.ca>"
COPYRIGHT = "2026, IVR Technology Group"