diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2f835d76..06d0b2ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,7 +1,7 @@
---
name: CI
-on:
+on:
push:
pull_request:
schedule:
@@ -20,8 +20,6 @@ jobs:
fail-fast: false
matrix:
python-version:
- - "3.7"
- - "3.8"
- "3.9"
- "3.10"
- "3.11"
@@ -29,11 +27,8 @@ jobs:
- "3.13"
- "pypy3.9"
- "pypy3.10"
- image:
+ image:
- "ubuntu-22.04"
- include:
- - python-version: "3.6"
- image: "ubuntu-20.04"
steps:
- name: Checkout
uses: "actions/checkout@v4"
diff --git a/.github/workflows/tox-fedora.yml b/.github/workflows/tox-fedora.yml
index 4c4c18f0..bc6f45c5 100644
--- a/.github/workflows/tox-fedora.yml
+++ b/.github/workflows/tox-fedora.yml
@@ -21,20 +21,15 @@ jobs:
strategy:
matrix:
tox_env:
- - py36
- - py37
- - py38
- py39
- py310
- py311
- py312
- py313
- - c90-py36
- - c90-py37
- py3-nosasltls
- py3-trace
- pypy3
- doc
# Use GitHub's Linux Docker host
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
diff --git a/Demo/pyasn1/syncrepl.py b/Demo/pyasn1/syncrepl.py
index f1f24e19..754b237a 100644
--- a/Demo/pyasn1/syncrepl.py
+++ b/Demo/pyasn1/syncrepl.py
@@ -76,7 +76,7 @@ def syncrepl_entry(self, dn, attributes, uuid):
logger.debug('Detected %s of entry %r', change_type, dn)
# If we have a cookie then this is not our first time being run,
# so it must be a change
- if 'ldap_cookie' in self.__data:
+ if 'cookie' in self.__data:
self.perform_application_sync(dn, attributes, previous_attributes)
def syncrepl_delete(self,uuids):
@@ -98,7 +98,7 @@ def syncrepl_present(self,uuids,refreshDeletes=False):
deletedEntries = [
uuid
for uuid in self.__data.keys()
- if uuid not in self.__presentUUIDs and uuid != 'ldap_cookie'
+ if uuid not in self.__presentUUIDs and uuid != 'cookie'
]
self.syncrepl_delete( deletedEntries )
# Phase is now completed, reset the list
diff --git a/pyproject.toml b/pyproject.toml
index dda8dbc1..75f7c06a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,3 @@
-[tool.black]
-line-length = 88
-target-version = ['py36', 'py37', 'py38']
-
[tool.isort]
line_length=88
known_first_party=['ldap', '_ldap', 'ldapurl', 'ldif', 'slapdtest']
diff --git a/setup.py b/setup.py
index 8e7963a1..ea7364cd 100644
--- a/setup.py
+++ b/setup.py
@@ -86,9 +86,6 @@ class OpenLDAP2:
'Programming Language :: Python',
'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.6',
- 'Programming Language :: Python :: 3.7',
- 'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
@@ -160,6 +157,6 @@ class OpenLDAP2:
'pyasn1_modules >= 0.1.5',
],
zip_safe=False,
- python_requires='>=3.6',
+ python_requires='>=3.9',
test_suite = 'Tests',
)
diff --git a/tox.ini b/tox.ini
index 22752067..0b284a4e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,15 +5,12 @@
[tox]
# Note: when updating Python versions, also change setup.py and .github/worlflows/*
-envlist = py{36,37,38,39,310,311,312},c90-py{36,37},py3-nosasltls,doc,py3-trace,pypy3.9
+envlist = py{39,310,311,312},py3-nosasltls,doc,py3-trace,pypy3.9
minver = 1.8
[gh-actions]
python =
- 3.6: py36
- 3.7: py37
- 3.8: py38, doc, py3-nosasltls
- 3.9: py39, py3-trace
+ 3.9: py39, py3-trace, doc, py3-nosasltls
3.10: py310
3.11: py311
3.12: py312
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy