Skip to content

Commit 77f91dd

Browse files
[CI/CD] Fix mock dependency conflicts across Python packages (AcademySoftwareFoundation#1991)
**Link the Issue(s) this Pull Request is related to.** - AcademySoftwareFoundation#1990 **Summarize your change.** - Align mock version requirements to mock==2.0.0 across all packages - Use pinned versions constraints of `cuegui` ("mock==2.0.0", "pyfakefs==5.2.3") in `cueman` and `cueadmin` - Resolves pip installation conflicts in CI pipeline
1 parent a9c8110 commit 77f91dd

File tree

2 files changed

+27
-30
lines changed

2 files changed

+27
-30
lines changed

cueadmin/pyproject.toml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,22 @@ markers = [
4545
# --- Optional Test Dependencies ---
4646
[project.optional-dependencies]
4747
test = [
48-
"pytest>=8.0.0",
49-
"pytest-cov>=4.0.0",
50-
"pytest-mock>=3.10.0",
51-
"mock>=4.0.0",
52-
"pyfakefs>=5.2.3"
48+
"mock==2.0.0",
49+
"pyfakefs==5.2.3",
50+
"pytest",
51+
"pytest-cov",
52+
"pytest-mock",
5353
]
5454

5555
dev = [
56-
"pytest>=8.0.0",
57-
"pytest-cov>=4.0.0",
58-
"pytest-mock>=3.10.0",
59-
"mock>=4.0.0",
60-
"pyfakefs>=5.2.3",
61-
"pylint>=3.0.0",
62-
"black>=23.0.0",
63-
"isort>=5.12.0"
56+
"mock==2.0.0",
57+
"pyfakefs==5.2.3",
58+
"pytest",
59+
"pytest-cov",
60+
"pytest-mock",
61+
"pylint",
62+
"black",
63+
"isort"
6464
]
6565

6666
# --- Coverage configuration ---

cueman/pyproject.toml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ name = "opencue_cueman"
99
dynamic = ["version"]
1010
dependencies = [
1111
"opencue_pycue",
12-
"opencue_cueadmin",
13-
"mock>=2.0.0",
14-
"pyfakefs>=5.2.3",
15-
"pytest>=6.0"
12+
"opencue_cueadmin"
1613
]
1714
requires-python = ">3.7"
1815
description = "Cueman is a command-line job management tool for OpenCue that provides efficient job control operations. It offers a streamlined interface for managing jobs, frames, and processes with advanced filtering and batch operation capabilities."
@@ -49,22 +46,22 @@ markers = [
4946
# --- Optional Test Dependencies ---
5047
[project.optional-dependencies]
5148
test = [
52-
"pytest>=8.0.0",
53-
"pytest-cov>=4.0.0",
54-
"pytest-mock>=3.10.0",
55-
"mock>=4.0.0",
56-
"pyfakefs>=5.2.3"
49+
"mock==2.0.0",
50+
"pyfakefs==5.2.3",
51+
"pytest",
52+
"pytest-cov",
53+
"pytest-mock",
5754
]
5855

5956
dev = [
60-
"pytest>=8.0.0",
61-
"pytest-cov>=4.0.0",
62-
"pytest-mock>=3.10.0",
63-
"mock>=4.0.0",
64-
"pyfakefs>=5.2.3",
65-
"pylint>=3.0.0",
66-
"black>=23.0.0",
67-
"isort>=5.12.0"
57+
"mock==2.0.0",
58+
"pyfakefs==5.2.3",
59+
"pytest",
60+
"pytest-cov",
61+
"pytest-mock",
62+
"pylint",
63+
"black",
64+
"isort"
6865
]
6966

7067
# --- Coverage configuration ---

0 commit comments

Comments
 (0)