diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c4fd5bf..ef63ae23 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,29 +43,29 @@ jobs: fail-fast: false matrix: include: - - os: macOS-12 + - os: macOS-13 version: cp313-macosx_x86_64 - - os: macOS-12 + - os: macOS-15 version: cp313-macosx_arm64 - - os: macOS-12 + - os: macOS-13 version: cp312-macosx_x86_64 - - os: macOS-12 + - os: macOS-15 version: cp312-macosx_arm64 - - os: macOS-12 + - os: macOS-13 version: cp311-macosx_x86_64 - - os: macOS-12 + - os: macOS-15 version: cp311-macosx_arm64 - - os: macOS-12 + - os: macOS-13 version: cp310-macosx_x86_64 - - os: macOS-12 + - os: macOS-15 version: cp310-macosx_arm64 - - os: macOS-12 + - os: macOS-13 version: cp39-macosx_x86_64 - - os: macOS-12 + - os: macOS-15 version: cp39-macosx_arm64 - - os: macOS-12 + - os: macOS-13 version: cp38-macosx_x86_64 - - os: macOS-12 + - os: macOS-15 version: cp38-macosx_arm64 - os: windows-2022 @@ -123,10 +123,8 @@ jobs: rm gssapi-*.tar.gz - name: Build wheel - uses: pypa/cibuildwheel@v2.21.2 + uses: pypa/cibuildwheel@v2.22.0 env: - CIBW_ARCHS: all - CIBW_TEST_SKIP: '*_arm64' CIBW_BUILD: ${{ matrix.version }} CIBW_BUILD_VERBOSITY: 1 diff --git a/ci/lib.sh b/ci/lib.sh index 338434d7..a8d29852 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -23,8 +23,8 @@ lib::setup::debian_install() { } lib::setup::rh_dnfinst() { - # dnf has no update-only verb. Also: modularity just makes this slower. - dnf -y --nogpgcheck --disablerepo=\*modul\* install $@ + # dnf has no update-only verb. + dnf -y --nogpgcheck install $@ } lib::setup::centos_install() { diff --git a/gssapi/creds.py b/gssapi/creds.py index 4ea53bfd..ea871a91 100644 --- a/gssapi/creds.py +++ b/gssapi/creds.py @@ -82,9 +82,9 @@ def __new__( super(Credentials, cls).__new__(cls, base_creds)) @property - def name(self) -> rnames.Name: + def name(self) -> names.Name: """Get the name associated with these credentials""" - return t.cast(rnames.Name, + return t.cast(names.Name, self.inquire(name=True, lifetime=False, usage=False, mechs=False).name) diff --git a/gssapi/tests/test_high_level.py b/gssapi/tests/test_high_level.py index d7c43aaf..ed6a4a0f 100644 --- a/gssapi/tests/test_high_level.py +++ b/gssapi/tests/test_high_level.py @@ -224,6 +224,7 @@ def test_inquire(self, str_name, kwargs): if kwargs['name']: self.assertEqual(resp.name, self.name) + self.assertIsInstance(resp.name, gssnames.Name) else: self.assertIsNone(resp.name) @@ -250,6 +251,7 @@ def test_inquire_by_mech(self, str_name, kwargs): if kwargs['name']: self.assertEqual(resp.name, self.name) + self.assertIsInstance(resp.name, gssnames.Name) else: self.assertIsNone(resp.name) diff --git a/setup.py b/setup.py index f348dc6b..e636c506 100755 --- a/setup.py +++ b/setup.py @@ -303,7 +303,6 @@ def gssapi_modules(lst): 'Programming Language :: Python :: 3.12', 'Programming Language :: Python :: 3.13', 'Intended Audience :: Developers', - 'License :: OSI Approved :: ISC License (ISCL)', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Cython', 'Topic :: Security',