Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit aae717d

Browse files
Bump version to 1.8.1 with Python 3.7 requires
This update bumps the `python_requires` to be `>=3.7` as the sdist build requires PEP 517 support that is somewhat only guaranteed with the pip that was shipped with Python 3.7 or greater. Since 3.6 has been end of life since December 2021 and the remaining Linux distributions that still use it have system provided packages this shouldn't be a surprise. Also use CentOS 9 Stream in the CI tests to test this on an actual RHEL-ish host on the version of Python actually supported. Signed-off-by: Jordan Borean <jborean93@gmail.com>
1 parent d885831 commit aae717d

File tree

4 files changed

+51
-31
lines changed

4 files changed

+51
-31
lines changed

‎.github/workflows/ci.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ jobs:
5757
version: cp38-macosx_arm64
5858
- os: macOS-12
5959
version: cp37-macosx_x86_64
60-
- os: macOS-12
61-
version: cp36-macosx_x86_64
6260

6361
- os: windows-2022
6462
version: cp310-win_amd64
@@ -76,10 +74,6 @@ jobs:
7674
version: cp37-win_amd64
7775
- os: windows-2022
7876
version: cp37-win32
79-
- os: windows-2022
80-
version: cp36-win_amd64
81-
- os: windows-2022
82-
version: cp36-win32
8377

8478
steps:
8579
- name: Set up environment
@@ -136,16 +130,16 @@ jobs:
136130
name:
137131
- debian-stable
138132
- debian-heimdal
139-
- centos-stream-8
133+
- centos-stream-9
140134
- fedora-latest
141135
include:
142136
- name: debian-stable
143137
distro: debian:stable
144138
- name: debian-heimdal
145139
distro: debian:stable
146140
krb5_ver: heimdal
147-
- name: centos-stream-8
148-
distro: quay.io/centos/centos:stream8
141+
- name: centos-stream-9
142+
distro: quay.io/centos/centos:stream9
149143
- name: fedora-latest
150144
distro: fedora:latest
151145
flake: 'yes'
@@ -181,7 +175,6 @@ jobs:
181175
- win-py-3.9
182176
- win-py-3.8
183177
- win-py-3.7
184-
- win-py-3.6
185178
arch:
186179
- x64
187180
- x86
@@ -194,8 +187,6 @@ jobs:
194187
pyenv: '3.8'
195188
- name: win-py-3.7
196189
pyenv: '3.7'
197-
- name: win-py-3.6
198-
pyenv: '3.6'
199190

200191
steps:
201192
- name: Check out code

‎README.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,15 @@ Basic
3636

3737
* a C compiler (such as GCC)
3838

39-
* Python 3.6+ (older releases support older versions, but are unsupported)
39+
* Python 3.7+ (older releases support older versions, but are unsupported)
4040

4141
* the `decorator` python package
4242

4343
Compiling from Scratch
4444
----------------------
4545

46-
To compile from scratch, you will need Cython >= 0.21.1.
46+
To compile from scratch, you will need Cython >= 0.29.29 which is automatically
47+
installed by pip in an isolated build virtual environment.
4748

4849
For Running the Tests
4950
---------------------

‎ci/lib.sh

Lines changed: 43 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,64 @@ lib::setup::debian_install() {
1616
export GSSAPI_KRB5_MAIN_LIB="/usr/lib/x86_64-linux-gnu/libkrb5.so"
1717
fi
1818

19-
apt-get -y install gcc virtualenv python3-{venv,dev}
19+
apt-get -y install gcc python3-{venv,dev}
2020

21-
virtualenv -p $(which python3) .venv
21+
python3 -m venv .venv
2222
source ./.venv/bin/activate
2323
}
2424

25-
lib::setup::rh_yuminst() {
26-
# yum has no update-only verb. Also: modularity just makes this slower.
27-
yum -y --nogpgcheck --disablerepo=\*modul\* install $@
25+
lib::setup::rh_dnfinst() {
26+
# dnf has no update-only verb. Also: modularity just makes this slower.
27+
dnf -y --nogpgcheck --disablerepo=\*modul\* install $@
2828
}
2929

3030
lib::setup::centos_install() {
31-
lib::setup::rh_yuminst python3-{virtualenv,devel}
32-
virtualenv -p $(which python3) .venv
31+
lib::setup::rh_dnfinst python3-devel
32+
python3 -m venv .venv
3333
source ./.venv/bin/activate
3434
}
3535

3636
lib::setup::fedora_install() {
3737
# path to binary here in case Rawhide changes it
38-
lib::setup::rh_yuminst redhat-rpm-config \
39-
/usr/bin/virtualenv python3-{virtualenv,devel}
40-
virtualenv -p $(which python3) .venv
38+
lib::setup::rh_dnfinst redhat-rpm-config \
39+
python3-devel
40+
python3 -m venv .venv
4141
source ./.venv/bin/activate
4242
}
4343

44+
lib::setup::gssntlmssp_install() {
45+
lib::setup::rh_dnfinst dnf-plugins-core
46+
dnf config-manager --set-enabled crb
47+
48+
lib::setup::rh_dnfinst autoconf automake gettext libtool \
49+
libunistring-devel openssl-devel zlib-devel
50+
51+
curl -L -s https://github.com/gssapi/gss-ntlmssp/releases/download/v1.1.0/gssntlmssp-1.1.0.tar.gz --output /tmp/gssntlmssp.tar.gz
52+
tar xf /tmp/gssntlmssp.tar.gz -C /tmp
53+
54+
pushd /tmp/gssntlmssp-1.1.0
55+
56+
autoreconf -f -i
57+
./configure --with-wbclient=no --with-manpages=no
58+
make
59+
make install
60+
61+
popd
62+
63+
echo "gssntlmssp_v1 1.3.6.1.4.1.311.2.2.10 /usr/local/lib/gssntlmssp/gssntlmssp.so" > /etc/gss/mech.d/gssntlmssp.conf
64+
}
65+
4466
lib::setup::rh_install() {
45-
lib::setup::rh_yuminst krb5-{devel,libs,server,workstation} \
46-
which gcc findutils gssntlmssp
67+
lib::setup::rh_dnfinst krb5-{devel,libs,server,workstation} \
68+
which gcc findutils
69+
70+
if grep -q 'release 9' /etc/redhat-release; then
71+
# CentOS 9 Stream doesn't have a dnf package for gssntlmssp
72+
lib::setup::gssntlmssp_install
73+
else
74+
lib::setup::rh_dnfinst gssntlmssp
75+
fi
76+
4777
export GSSAPI_KRB5_MAIN_LIB="/usr/lib64/libkrb5.so"
4878

4979
if [ -f /etc/fedora-release ]; then
@@ -54,8 +84,7 @@ lib::setup::rh_install() {
5484
}
5585

5686
lib::setup::macos_install() {
57-
sudo pip3 install virtualenv
58-
python3 -m virtualenv -p $(which python3) .venv
87+
python3 -m venv .venv
5988
source .venv/bin/activate
6089

6190
export GSSAPI_KRB5_MAIN_LIB="/System/Library/PrivateFrameworks/Heimdal.framework/Heimdal"

‎setup.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ def gssapi_modules(lst):
274274

275275
setup(
276276
name='gssapi',
277-
version='1.8.0',
277+
version='1.8.1',
278278
author='The Python GSSAPI Team',
279279
author_email='jborean93@gmail.com',
280280
packages=['gssapi', 'gssapi.raw', 'gssapi.raw._enum_extensions',
@@ -287,12 +287,11 @@ def gssapi_modules(lst):
287287
long_description=long_desc,
288288
license='LICENSE.txt',
289289
url="https://github.com/pythongssapi/python-gssapi",
290-
python_requires=">=3.6",
290+
python_requires=">=3.7",
291291
classifiers=[
292292
'Development Status :: 5 - Production/Stable',
293293
'Programming Language :: Python',
294294
'Programming Language :: Python :: 3',
295-
'Programming Language :: Python :: 3.6',
296295
'Programming Language :: Python :: 3.7',
297296
'Programming Language :: Python :: 3.8',
298297
'Programming Language :: Python :: 3.9',

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /