Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: drop python 3.8 & add python 3.12 #45

Merged
merged 3 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: ['3.8']
toxenv: [py38-django32, py38-django40, quality]
python-version: ['3.11', '3.12']
toxenv: [django42, quality]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -37,7 +37,7 @@ jobs:
run: tox

- name: Run coverage
if: matrix.python-version == '3.8' && matrix.toxenv == 'django32'
if: matrix.python-version == '3.12' && matrix.toxenv == 'django42'
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.12

- name: Install pip
run: pip install -r requirements/pip.txt
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ sphinx:
configuration: docs/conf.py

python:
version: 3.8
version: 3.12
install:
- requirements: requirements/doc.txt
9 changes: 9 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ Change Log
Unreleased
**********

[0.3.0] - 2024-10-16
************************************************

Changed
=======

* Drop support for python 3.8
* Adds support for python 3.11 & 3.12


[0.2.0] - 2024-04-23
************************************************
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ One Time Setup
cd xblock-skill-tagging

# Set up a virtualenv using virtualenvwrapper with the same name as the repo and activate it
mkvirtualenv -p python3.8 xblock-skill-tagging
mkvirtualenv -p python3.12 xblock-skill-tagging


Every time you develop something in this repo
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -469,8 +469,8 @@ def get_version(*file_paths):

# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {
'python': ('https://docs.python.org/3.8', None),
'django': ('https://docs.djangoproject.com/en/3.2/', 'https://docs.djangoproject.com/en/3.2/_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),
}

Expand Down
7 changes: 4 additions & 3 deletions pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
# SERIOUSLY.
#
# ------------------------------
# Generated by edx-lint version: 5.3.0
# Generated by edx-lint version: 5.4.0
# ------------------------------
[MASTER]
ignore = migrations
Expand Down Expand Up @@ -259,6 +259,7 @@ enable =
useless-suppression,
disable =
bad-indentation,
broad-exception-raised,
consider-using-f-string,
duplicate-code,
file-ignored,
Expand Down Expand Up @@ -384,6 +385,6 @@ ext-import-graph =
int-import-graph =

[EXCEPTIONS]
overgeneral-exceptions = Exception
overgeneral-exceptions = builtins.Exception

# 46c7367b47aae914d36c17c49c676bffbc597fcd
# 587c3e7efd460e85bca728e79fcc928867d1555c
2 changes: 2 additions & 0 deletions requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ Django # Web application framework
django-model-utils # Provides TimeStampedModel abstract base class
openedx_events
openedx-filters
openedx-django-pyfs
lazy
99 changes: 82 additions & 17 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,39 +1,104 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
asgiref==3.7.2
appdirs==1.4.4
# via fs
asgiref==3.8.1
# via django
attrs==23.1.0
attrs==24.2.0
# via openedx-events
django==3.2.25
boto3==1.35.58
# via fs-s3fs
botocore==1.35.58
# via
# boto3
# s3transfer
cffi==1.17.1
# via pynacl
click==8.1.7
# via edx-django-utils
django==4.2.16
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
# django-crum
# django-model-utils
# django-waffle
# edx-django-utils
# openedx-django-pyfs
# openedx-events
# openedx-filters
django-model-utils==4.3.1
django-crum==0.7.9
# via edx-django-utils
django-model-utils==5.0.0
# via -r requirements/base.in
edx-opaque-keys[django]==2.3.0
django-waffle==4.1.0
# via edx-django-utils
dnspython==2.7.0
# via pymongo
edx-ccx-keys==1.3.0
# via openedx-events
edx-django-utils==7.0.0
# via openedx-events
fastavro==1.7.4
edx-opaque-keys[django]==2.11.0
# via
# edx-ccx-keys
# openedx-events
fastavro==1.9.7
# via openedx-events
openedx-events==8.0.1
fs==2.4.16
# via
# fs-s3fs
# openedx-django-pyfs
fs-s3fs==1.1.1
# via openedx-django-pyfs
jmespath==1.0.1
# via
# boto3
# botocore
lazy==1.6
# via -r requirements/base.in
openedx-filters==1.3.0
newrelic==10.2.0
# via edx-django-utils
openedx-django-pyfs==3.7.0
# via -r requirements/base.in
pbr==5.11.1
openedx-events==9.15.0
# via -r requirements/base.in
openedx-filters==1.11.0
# via -r requirements/base.in
pbr==6.1.0
# via stevedore
pymongo==3.13.0
psutil==6.1.0
# via edx-django-utils
pycparser==2.22
# via cffi
pymongo==4.10.1
# via edx-opaque-keys
pytz==2023.3
# via django
sqlparse==0.4.4
pynacl==1.5.0
# via edx-django-utils
python-dateutil==2.9.0.post0
# via botocore
s3transfer==0.10.3
# via boto3
six==1.16.0
# via
# edx-ccx-keys
# fs
# fs-s3fs
# python-dateutil
sqlparse==0.5.1
# via django
stevedore==5.1.0
stevedore==5.3.0
# via
# edx-django-utils
# edx-opaque-keys
typing-extensions==4.12.2
# via edx-opaque-keys
typing-extensions==4.6.3
# via asgiref
urllib3==2.2.3
# via botocore

# The following packages are considered to be unsafe in a requirements file:
# setuptools
27 changes: 14 additions & 13 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
distlib==0.3.6
distlib==0.3.9
# via virtualenv
filelock==3.12.2
filelock==3.16.1
# via
# tox
# virtualenv
packaging==23.1
# via tox
platformdirs==3.5.3
# via virtualenv
pluggy==1.0.0
packaging==24.2
# via
# pyproject-api
# tox
platformdirs==4.3.6
# via
# tox
# virtualenv
pluggy==1.5.0
# via tox
py==1.11.0
# via tox
six==1.16.0
# via tox
tomli==2.0.1
# via tox
tox==3.28.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.in
# tox-battery
tox-battery==0.6.1
tox-battery==0.6.2
# via -r requirements/ci.in
virtualenv==20.23.0
virtualenv==20.27.1
# via tox
Loading