add support for python 3.11

openedx · Nov 21, 2024 · e7a43e6 · e7a43e6
1 parent 5b94f5a
commit e7a43e6
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 38 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,15 +14,15 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.11", "3.12"]
+        python-version: ['3.11', '3.12']
         toxenv: [quality, docs, django42]
 
     steps:
-      - uses: actions/checkout@v4
-      - name: setup python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
+    - uses: actions/checkout@v4
+    - name: setup python
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
 
       - name: Install pip
         run: pip install -r requirements/pip.txt
@@ -35,10 +35,10 @@ jobs:
           TOXENV: ${{ matrix.toxenv }}
         run: tox
 
-      - name: Run Coverage
-        if: matrix.python-version == '3.11' && matrix.toxenv=='django42'
-        uses: codecov/codecov-action@v5
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          flags: unittests
-          fail_ci_if_error: true
+    - name: Run Coverage
+      if: matrix.python-version == '3.12' && matrix.toxenv=='django42'
+      uses: codecov/codecov-action@v4
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        flags: unittests
+        fail_ci_if_error: true
diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml
@@ -15,7 +15,7 @@ jobs:
       - name: setup python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: 3.12
 
       - name: Install pip
         run: pip install -r requirements/pip.txt

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -14,6 +14,12 @@ Change Log
 Unreleased
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+[2.0.0] - 2024-10-18
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Drop support for python 3.8
+* Adds support for python 3.11 & 3.12
+
 [1.8.1] - 2024-07-11
 ~~~~~~~~~~~~~~~~~~~~
 

diff --git a/code_annotations/__init__.py b/code_annotations/__init__.py
@@ -2,4 +2,4 @@
 Extensible tools for parsing annotations in codebases.
 """
 
-__version__ = '1.8.2'
+__version__ = '2.0.0'
diff --git a/docs/conf.py b/docs/conf.py
@@ -497,8 +497,8 @@ def get_version(*file_paths):
 
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
-    'python': ('https://docs.python.org/3.6', None),
-    'django': ('https://docs.djangoproject.com/en/1.11/', 'https://docs.djangoproject.com/en/1.11/_objects/'),
+    'python': ('https://docs.python.org/3.12', None),
+    'django': ('https://docs.djangoproject.com/en/4.2/', 'https://docs.djangoproject.com/en/4.2/_objects/'),
     'model_utils': ('https://django-model-utils.readthedocs.io/en/latest/', None),
     'edx_toggles': ('https://edx.readthedocs.io/projects/edx-toggles/en/latest/', None),
 }

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -16,7 +16,7 @@ python-slugify==8.0.4
     # via -r requirements/base.in
 pyyaml==6.0.2
     # via -r requirements/base.in
-stevedore==5.3.0
+stevedore==5.4.0
     # via -r requirements/base.in
 text-unidecode==1.3
     # via python-slugify
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -173,7 +173,7 @@ sqlparse==0.5.2
     # via
     #   -r requirements/quality.txt
     #   django
-stevedore==5.3.0
+stevedore==5.4.0
     # via
     #   -r requirements/quality.txt
     #   code-annotations

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -22,8 +22,6 @@ beautifulsoup4==4.12.3
     # via pydata-sphinx-theme
 certifi==2024.8.30
     # via requests
-cffi==1.17.1
-    # via cryptography
 charset-normalizer==3.4.0
     # via requests
 click==8.1.7
@@ -32,8 +30,6 @@ coverage[toml]==7.6.7
     # via
     #   -r requirements/test.txt
     #   pytest-cov
-cryptography==43.0.3
-    # via secretstorage
 django==4.2.16
     # via
     #   -c requirements/common_constraints.txt
@@ -65,10 +61,6 @@ jaraco-context==6.0.1
     # via keyring
 jaraco-functools==4.1.0
     # via keyring
-jeepney==0.8.0
-    # via
-    #   keyring
-    #   secretstorage
 jinja2==3.1.4
     # via
     #   -r requirements/test.txt
@@ -106,8 +98,6 @@ pluggy==1.5.0
     # via
     #   -r requirements/test.txt
     #   pytest
-pycparser==2.22
-    # via cffi
 pydata-sphinx-theme==0.16.0
     # via sphinx-book-theme
 pygments==2.18.0
@@ -143,8 +133,6 @@ rfc3986==2.0.0
     # via twine
 rich==13.9.4
     # via twine
-secretstorage==3.3.3
-    # via keyring
 snowballstemmer==2.2.0
     # via sphinx
 soupsieve==2.6
@@ -172,7 +160,7 @@ sqlparse==0.5.2
     # via
     #   -r requirements/test.txt
     #   django
-stevedore==5.3.0
+stevedore==5.4.0
     # via
     #   -r requirements/test.txt
     #   doc8

diff --git a/requirements/pip.txt b/requirements/pip.txt
@@ -10,7 +10,7 @@ wheel==0.45.0
 # The following packages are considered to be unsafe in a requirements file:
 pip==24.2
     # via
-    #   -c /home/runner/work/code-annotations/code-annotations/requirements/common_constraints.txt
+    #   -c requirements/common_constraints.txt
     #   -r requirements/pip.in
-setuptools==75.5.0
+setuptools==75.6.0
     # via -r requirements/pip.in
diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -108,7 +108,7 @@ sqlparse==0.5.2
     # via
     #   -r requirements/test.txt
     #   django
-stevedore==5.3.0
+stevedore==5.4.0
     # via
     #   -r requirements/test.txt
     #   code-annotations

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -45,7 +45,7 @@ sqlparse==0.5.2
     # via
     #   -r requirements/django.txt
     #   django
-stevedore==5.3.0
+stevedore==5.4.0
     # via -r requirements/base.txt
 text-unidecode==1.3
     # via

diff --git a/setup.py b/setup.py
@@ -90,10 +90,11 @@ def is_requirement(line):
     },
     include_package_data=True,
     install_requires=load_requirements('requirements/base.in'),
-    extras_require={"django": ["Django>=2.2,<2.3"]},
+    extras_require={"django": ["Django>=4.2"]},
     license="Apache Software License 2.0",
     zip_safe=False,
     keywords='edx pii code annotations',
+    python_requires=">=3.11",
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Framework :: Django',
@@ -103,7 +104,6 @@ def is_requirement(line):
         'Natural Language :: English',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
     ],