Skip to content

Commit ceb5d54

Browse files
committed
Fix setuptools version to avoid runtime issues with CLIP imports
1 parent 770671e commit ceb5d54

4 files changed

Lines changed: 10 additions & 6 deletions

File tree

CHANGELOG.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
1010
- Added enable/disable toggle for environment variables in Settings, allowing variables to be temporarily disabled without deleting them
1111
- Added single-instance window activation signaling so reopening the app restores and focuses the existing desktop window instead of launching a duplicate instance
1212
- Added notification system with localizable banner and markdown detail dialog UI
13-
- Added warning in data directory selector when an OneDrive folder is selected
13+
- Added warning in data directory selector when a OneDrive folder is selected
1414
- Added support in the Checkpoints page to distinguish standard updates from Early Access-only updates - thanks to @x0x0b!
1515
- Added torch index for Strix/Gorgon Point Ryzen AI APUs on Windows - thanks to @NeuralFault!
1616
### Changed
@@ -19,22 +19,23 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
1919
- Configured portable Git to suppress detached HEAD advice messages
2020
- Settings file saves are now atomic to prevent corruption from interrupted writes
2121
### Fixed
22-
- Fixed [#1596](https://github.com/LykosAI/StabilityMatrix/issues/1596) - package installs and managed embedded Python startup being poisoned by inherited shell Python activation variables such as `PYTHONHOME`, `PYTHONPATH`, `VIRTUAL_ENV`, and Conda environment variables
2322
- Fixed the Package Manager "Add Package" teaching tip opening inopportunely while packages were still loading or after opening the add-package dialog
2423
- Fixed downloaded checkpoint going to StableDiffusion folder when a saved download preference existed, even for GGUF files that should always go to DiffusionModels
2524
- Fixed potential crash when adding metadata to malformed or non-PNG image data in Inference
2625
- Fixed non-Latin-1 characters (e.g. Japanese, Chinese, Korean, emoji) in image generation parameters being stored in PNG tEXt chunks, violating the PNG specification and causing character corruption (mojibake) in standard-compliant parsers. Non-Latin-1 content now uses spec-compliant iTXt chunks with proper UTF-8 encoding ([#1535](https://github.com/LykosAI/StabilityMatrix/issues/1535))
2726
- Fixed an issue where `Align Your Steps` scheduler and Unet Loader workflows ignored Regional Prompting (and other addon) conditioning modifiers.
28-
- Potentially fixed [#1578](https://github.com/LykosAI/StabilityMatrix/issues/1578) - `SocketException: Address already in use` on Linux startup by cleaning stale interprocess socket files and reactivating the existing window
2927
- Fixed bold text not rendering in markdown dialogs on Windows 11 due to Avalonia 11.3.x variable font regression with Segoe UI Variable Text
3028
- Fixed Japanese text appearing compressed/squished in markdown dialogs by ensuring the bundled NotoSansJP font is used for CTextBlock rendering
3129
- Fixed ContentDialog title and buttons not using the correct font for Japanese locale (NotoSansJP) when shown as overlay
3230
- Added missing `CBold` and `CItalic` inline styles to the markdown style sheet
33-
- Fixed download progress bar showing 100% immediately for fresh downloads due to missing Content-Length fallback when Content-Range header is absent
3431
- Fixed downloads failing with "The request message was already sent" when the server doesn't return Content-Length on the first attempt, caused by reusing a consumed HttpRequestMessage in the retry loop
3532
- Fixed downloads from sources that redirect to CivitAI/HuggingFace (e.g. CivArchive) failing with Unauthorized by resolving the redirect target URL and applying auth headers for the correct domain
3633
- Fixed dropdown menu overlayed in Inference UI Model Cards not being scrollable on Linux - thanks to @NeuralFault!
34+
- Fixed [#1598](https://github.com/LykosAI/StabilityMatrix/issues/1598) - download progress bar showing 100% immediately for fresh downloads due to missing Content-Length fallback when Content-Range header is absent
35+
- Fixed [#1597](https://github.com/LykosAI/StabilityMatrix/issues/1597) - reForge launch failing due to setuptools version
36+
- Fixed [#1596](https://github.com/LykosAI/StabilityMatrix/issues/1596) - package installs and managed embedded Python startup being poisoned by inherited shell Python activation variables such as `PYTHONHOME`, `PYTHONPATH`, `VIRTUAL_ENV`, and Conda environment variables
3737
- Fixed [#1590](https://github.com/LykosAI/StabilityMatrix/issues/1590) - Startup crash when settings file is corrupted. Settings files are now self-healing with automatic recovery from null bytes, truncated JSON, and missing brackets
38+
- Potentially fixed [#1578](https://github.com/LykosAI/StabilityMatrix/issues/1578) - `SocketException: Address already in use` on Linux startup by cleaning stale interprocess socket files and reactivating the existing window
3839
- Fixed [#1397](https://github.com/LykosAI/StabilityMatrix/issues/1397), [#610](https://github.com/LykosAI/StabilityMatrix/issues/610) - duplicate pip package entries in results - thanks to @e-nord!
3940

4041
## v2.16.0-dev.2

StabilityMatrix.Core/Models/Packages/A3WebUI.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,8 @@ torchIndex is TorchIndex.Cuda
236236
[
237237
"https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip",
238238
],
239+
// CLIP imports pkg_resources.packaging at runtime, which breaks with setuptools 70.x.
240+
PostInstallPipArgs = ["setuptools==69.5.1"],
239241
};
240242

241243
// 2. Execute the standardized installation process.

StabilityMatrix.Core/Models/Packages/SDWebForge.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,8 @@ torchIndex is TorchIndex.Cuda
197197
[
198198
"https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip",
199199
],
200-
PostInstallPipArgs = ["numpy==1.26.4"],
200+
// CLIP imports pkg_resources.packaging at runtime, which breaks with setuptools 70.x.
201+
PostInstallPipArgs = ["numpy==1.26.4", "setuptools==69.5.1"],
201202
};
202203

203204
await StandardPipInstallProcessAsync(

StabilityMatrix.Core/Processes/ProcessRunner.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ public static AnsiProcess StartAnsiProcess(
559559
CreateNoWindow = true,
560560
};
561561

562-
ApplyEnvironmentVariables(info, environmentVariables);
562+
PrepareEnvironment(info, fileName, environmentVariables);
563563

564564
if (workingDirectory != null)
565565
{

0 commit comments

Comments
 (0)