Version 1.5.2

Author: Oberon00

README.md

@@ -41,8 +41,7 @@ and make sure you are reading the [latest version of this document](https://gith
   * [Read the manual](#read-the-manual)
   * [Let us help you](#let-us-help-you)
 - [Release notes and announcements](#release-notes-and-announcements)
-  * [Announcements in November 2023](#announcements-in-november-2023)
-  * [Version 1.5.1](#version-151)
+  * [Version 1.5.2](#version-152)
 - [License](#license)
 
 <!-- tocstop -->
@@ -834,7 +833,7 @@ If you are viewing the [GitHub repository](https://github.com/Dynatrace/OneAgent
   [here](#documentation).
 - `tests/`, `test-util-src/`: Contains tests and test support files that are
   useful (only) for developers wanting to contribute to the SDK itself.
-- `setup.py`, `setup.cfg`, `MANIFEST.in`, `project.toml`: Development files
+- `setup.py`, `setup.cfg`, `MANIFEST.in`, `pyproject.toml`: Development files
   required for creating e.g. the PyPI package for the Python OneAgent SDK.
 - `tox.ini`, `pylintrc`: Supporting files for developing the SDK itself. See
   <https://tox.readthedocs.io/en/latest/> and <https://www.pylint.org/>.
@@ -890,19 +889,14 @@ SLAs apply according to the customer's support level.
 For additional updates, see also [OneAgent release notes](https://docs.dynatrace.com/docs/shortlink/release-notes-oneagent)
 and [End of support announcements](https://docs.dynatrace.com/docs/shortlink/eos-announcements#dynatrace-oneagent).
 
+### Version 1.5.2
 
-### Announcements in November 2023
-
-* ⚠️ **Deprecation announcement for older SDK versions:** Version 1.4 has been put on the path to deprecation and will no longer be supported starting June 1, 2024. Only version 1.5 of the SDK (or any newer version) will be supported from that date on.
-* ⚠️ **Deprecation announcement for using any SDK version with older Python versions:** SDK support for Python 3.4.x, 3.5.x, 3.6.x and 3.7.x has been put on the path to deprecation and no version of the SDK will be supported on Python 3.4.x, 3.5.x and 3.6.x starting June 1, 2024.
-  Usage of the SDK on 3.7.x will remain supported until September 1, 2024.
-  All Python versions below 3.8.x are already declared End of Life by the Python.org project, and customers are encouraged to upgrade to a newer Python version that is also supported by Python.org.
-
-### Version 1.5.1
+This is a bugfix release that only includes packaging changes, if the package is already installed and working, there is no immediate reason to upgrade.
 
 Changes:
-
-* Fixes support of Python 3.12 and newer
+* Fixes installation using uv 0.9.16 or newer on musl/Alpine platforms (this only allows installing the SDK stub without C/C++-SDK-based implementation)
+* Removes hard dependency on `pkg_resources`, which should allow installation with `setuptools>=81`.
+* Fixes filename of `pyproject.toml` to prevent potential issues with outdated or missing `setuptools`.
 
 See <https://github.com/Dynatrace/OneAgent-SDK-for-Python/releases> for older releases.
 

project.toml pyproject.tomlproject.toml renamed to pyproject.toml

@@ -1,5 +1,6 @@
 [bdist_wheel]
-# Py 2 AND 3 compatible
+# Claim to be Py 2 AND 3 compatible because we don't dare to change it in a bugfix release;
+# However, this actually requires Python 3.8+.
 universal=1
 
 [metadata]

setup.cfg

@@ -39,9 +39,6 @@
 from setuptools.command.install import install
 from setuptools.command.build_ext import build_ext
 
-from pkg_resources import parse_version
-
-
 try:
     from wheel.bdist_wheel import bdist_wheel
 except ImportError:
@@ -96,10 +93,15 @@ def get_version_from_version_py():
 if not __version__:
     __version__ = get_version_from_version_py()
 
-if __version__ != str(parse_version(__version__)):
-    raise AssertionError(
-        'Version {} normalizes to {}'.format(
-            __version__, parse_version(__version__)))
+try:
+    from pkg_resources import parse_version
+except ImportError:
+    pass
+else:
+    if __version__ != str(parse_version(__version__)):
+        raise AssertionError(
+            'Version {} normalizes to {}'.format(
+                __version__, parse_version(__version__)))
 
 # This function was adapted from https://www.python.org/dev/peps/pep-0513/
 # (public domain)
@@ -136,7 +138,8 @@ def unsupported_msg(plat_name):
     if glibc_ver:
         glibc = '\nGNU libc version:     ' + glibc_ver + '\n'
     elif os.name != 'nt':
-        glibc = '\nNot using GNU libc. Note that musl libc is not supported.\n'
+        glibc = ('\nNot using GNU libc. Note that musl libc is not supported' +
+                 ' using OneAgent SDK for C/C++ implementation.\n')
     else:
         glibc = ''
 
@@ -166,25 +169,8 @@ def compilefile(fname, mode='exec'):
         codestr = srcfile.read()
     return compile(codestr, fname, mode)
 
-def adjust_plat_name(self):
-    #pylint:disable=access-member-before-definition
-    if self.plat_name is not None:
-        return
-    baseplat = get_platform()
-    if baseplat.startswith('linux'):
-        platname = baseplat.split('-', 2)
-        platname[0] = 'manylinux1'
-        #pylint:disable=attribute-defined-outside-init
-        self.plat_name = '-'.join(platname)
-    else:
-        self.plat_name = baseplat
-
 if bdist_wheel is not None:
     class BdistWheel(bdist_wheel):
-        def finalize_options(self):
-            adjust_plat_name(self)
-            bdist_wheel.finalize_options(self)
-
         def get_tag(self):
             plat_name = self.plat_name or get_platform()
             plat_name = plat_name.replace('-', '_').replace('.', '_')
@@ -354,6 +340,9 @@ def main():
         package_dir={'': 'src'},
         include_package_data=True,
         zip_safe=True,
+        # Because we don't dare to change it in a bugfix release,
+        # this is claiming a wider range than we actually support.
+        # Should be ">=3.8", README.md is authoritative here.
         python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
         cmdclass=cmdclss,
         name='oneagent-sdk',
@@ -374,12 +363,7 @@ def main():
             'License :: OSI Approved',
             'License :: OSI Approved :: Apache Software License', # 2.0
             'Programming Language :: Python',
-            'Programming Language :: Python :: 2',
-            'Programming Language :: Python :: 2.7',
             'Programming Language :: Python :: 3',
-            'Programming Language :: Python :: 3.4',
-            'Programming Language :: Python :: 3.5',
-            'Programming Language :: Python :: 3.6',
             'Programming Language :: Python :: Implementation :: CPython',
             #'Programming Language :: Python :: Implementation :: PyPy',
             'Operating System :: POSIX :: Linux',

setup.py

@@ -21,7 +21,7 @@
 # That's the OneAgent SDK for Python version.
 # See https://www.python.org/dev/peps/pep-0440/ "Version Identification and
 # Dependency Specification"
-__version__ = '1.5.1'
+__version__ = '1.5.2'
 
 # Define the OneAgent SDK for C/C++ version which should be shipped with this
 # Python SDK version.

src/oneagent/version.py

@@ -1,5 +1,5 @@
 [tox]
-envlist = lint, py{34,35,36,37,37,39,310,311,312}-test, docs
+envlist = lint, py{38,39,310,311,312}-test, docs
 skip_missing_interpreters=true
 
 [testenv]