Skip to content

Commit f3c84ac

Browse files
authored
Lift pymqi dependency exclusion for macOS on AArch64/ARM64 (DataDog#20815)
This removes a special case where `pymqi` was depended on by all target platforms (including macOS on x86_64/AMD64) *except macOS on AArch64/ARM64*. There doesn't seem to be a compelling reason for keeping such an ad hoc exclusion since `pymqi` 1.12.11 basically consists in an installer that extracts a source tarball (https://pypi.org/project/pymqi/#files) and compiles it for the _effective_ platform, in place. In other words, what works for `macosx_10_12_x86_64` should also work for `macosx_11_0_arm64`. Moreover, `pymqi` is declared as an **optional** project dependency for both "IBM ACE" and "IBM MQ", which already offers some leverage since the dependency is _not installed unless explicitly qualified_: - https://setuptools.pypa.io/en/latest/userguide/dependency_management.html#optional-dependencies - https://pydevtools.com/handbook/explanation/what-are-optional-dependencies-and-dependency-groups/#optional-dependencies-end-user-features Should unforeseen consequences happen despite above cautions, then further actions may be considered (alternatively to a trivial rollback): 1. either drop the dependency at all for macOS where not needed (that is on all macOS architectures), 2. and/or bump IBM MQ deliverables to a version that better accomodates the AArch64/ARM64 architecture on macOS: DataDog#20645.
1 parent 8c3f308 commit f3c84ac

5 files changed

Lines changed: 5 additions & 3 deletions

File tree

agent_requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pycryptodomex==3.23.0
3838
pydantic==2.11.7
3939
pyjwt==2.10.1
4040
pymongo[srv]==4.8.0; python_version >= '3.9'
41-
pymqi==1.12.11; sys_platform != 'darwin' or platform_machine != 'arm64'
41+
pymqi==1.12.11
4242
pymysql==1.1.1
4343
pyodbc==5.2.0; sys_platform != 'darwin' or platform_machine != 'arm64'
4444
pyopenssl==25.1.0

ibm_ace/changelog.d/20815.fixed

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lift `pymqi` dependency exclusion for macOS on AArch64/ARM64

ibm_ace/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ license = "BSD-3-Clause"
3737

3838
[project.optional-dependencies]
3939
deps = [
40-
"pymqi==1.12.11; sys_platform != 'darwin' or platform_machine != 'arm64'",
40+
"pymqi==1.12.11",
4141
]
4242

4343
[project.urls]

ibm_mq/changelog.d/20815.fixed

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lift `pymqi` dependency exclusion for macOS on AArch64/ARM64

ibm_mq/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ requires-python = ">=3.9"
3838
[project.optional-dependencies]
3939
deps = [
4040
"psutil==6.0.0",
41-
"pymqi==1.12.11; sys_platform != 'darwin' or platform_machine != 'arm64'",
41+
"pymqi==1.12.11",
4242
]
4343

4444
[project.urls]

0 commit comments

Comments
 (0)