Skip to content

Commit

Permalink
Merge pull request #483 from openedx/jenkins/add-python312-support-dc…
Browse files Browse the repository at this point in the history
…3e7f1

feat: add python 3.12 support
  • Loading branch information
mumarkhan999 authored Mar 19, 2024
2 parents 9434bea + 426c5f6 commit 963f3e6
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 7 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Python CI

on:
push:
branches: [ master ]
branches: [master]
pull_request:

jobs:
Expand All @@ -12,7 +12,9 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8']
python-version:
- '3.8'
- '3.12'

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion edx_repo_tools/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

__version__ = '0.8.5'
__version__ = '0.8.6'
8 changes: 8 additions & 0 deletions edx_repo_tools/conventional_commits/extra-py312.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# The conventional_commits code needs some extra packages installed that are
# large and unusual, so we keep them separate here.

-c ../../requirements/constraints.txt

dataset
pandas
matplotlib
59 changes: 59 additions & 0 deletions edx_repo_tools/conventional_commits/extra-py312.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# make upgrade
#
alembic==1.13.1
# via dataset
banal==1.0.6
# via dataset
contourpy==1.2.0
# via matplotlib
cycler==0.12.1
# via matplotlib
dataset==1.6.2
# via -r edx_repo_tools/conventional_commits/extra-py312.in
fonttools==4.49.0
# via matplotlib
greenlet==3.0.3
# via
# -c edx_repo_tools/conventional_commits/../../requirements/constraints.txt
# sqlalchemy
kiwisolver==1.4.5
# via matplotlib
mako==1.3.2
# via alembic
markupsafe==2.1.5
# via mako
matplotlib==3.8.3
# via -r edx_repo_tools/conventional_commits/extra-py312.in
numpy==1.26.4
# via
# contourpy
# matplotlib
# pandas
packaging==23.2
# via matplotlib
pandas==2.2.1
# via -r edx_repo_tools/conventional_commits/extra-py312.in
pillow==10.2.0
# via matplotlib
pyparsing==3.1.2
# via matplotlib
python-dateutil==2.9.0.post0
# via
# matplotlib
# pandas
pytz==2024.1
# via pandas
six==1.16.0
# via python-dateutil
sqlalchemy==1.4.52
# via
# alembic
# dataset
typing-extensions==4.10.0
# via alembic
tzdata==2024.1
# via pandas
4 changes: 0 additions & 4 deletions requirements/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,3 @@ wheel==0.42.0
# via pip-tools
zipp==3.17.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
5 changes: 5 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import glob
import os.path
import re
import sys

import setuptools
from setuptools import setup
Expand Down Expand Up @@ -47,12 +48,16 @@ def is_requirement(line):

VERSION = get_version('edx_repo_tools', '__init__.py')


# Find our extra requirements. A subdirectory of edx_repo_tools can have an
# extra.in file. It will be pip-compiled to extra.txt. Here we find them all
# and register them as extras.
EXTRAS_REQUIRE = {}
for fextra in glob.glob("edx_repo_tools/*/extra.txt"):
slug = fextra.split("/")[1]
if sys.version_info >= (3, 12) and glob.glob(f'edx_repo_tools/{slug}/extra-py312.txt'):
fextra = f'edx_repo_tools/{slug}/extra-py312.txt'

EXTRAS_REQUIRE[slug] = load_requirements(fextra)

# To run tests & linting across the entire repo, we need to install the union
Expand Down

0 comments on commit 963f3e6

Please sign in to comment.