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

build: Switch to ubuntu-latest for builds #296

Merged
merged 5 commits into from
Sep 11, 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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04]
python-version: ["3.8", "3.11", "3.12"]
os: [ubuntu-latest]
python-version: ["3.11", "3.12"]
toxenv:
[
py38-django42-drflatest,quality
django42-drflatest,quality
]

steps:
Expand All @@ -41,7 +41,7 @@ jobs:
run: tox

- name: Run Coverage
if: matrix.python-version == '3.8' && matrix.toxenv=='py38-django42-drflatest'
if: matrix.python-version == '3.12' && matrix.toxenv=='django42-drflatest'
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:

push:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
- name: Checkout
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ Change Log
Unreleased
----------

2.0.0 --- 2024-09-09
--------------------
* Drop support for Python 3.8
* Add setuptools as a direct dependency

1.8.0 --- 2024-02-29
--------------------
* Add support for python 3.11 and 3.12 support.
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with
pip-compile --upgrade --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in
pip install -qr requirements/pip-tools.txt
pip install -qr requirements/pip.txt
pip-compile --upgrade requirements/base.in
pip-compile --upgrade requirements/test.in
pip-compile --upgrade requirements/doc.in
pip-compile --upgrade requirements/quality.in
pip-compile --upgrade requirements/ci.in
pip-compile --upgrade requirements/dev.in
pip-compile --upgrade --allow-unsafe requirements/base.in
pip-compile --upgrade --allow-unsafe requirements/test.in
pip-compile --upgrade --allow-unsafe requirements/doc.in
pip-compile --upgrade --allow-unsafe requirements/quality.in
pip-compile --upgrade --allow-unsafe requirements/ci.in
pip-compile --upgrade --allow-unsafe requirements/dev.in
# Delete django, drf pins from test.txt so that tox can control
# Django version.
sed -i.tmp '/^[dD]jango==/d' requirements/test.txt
Expand Down
2 changes: 1 addition & 1 deletion edx_api_doc_tools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@
)


__version__ = '1.8.0'
__version__ = '2.0.0'
1 change: 1 addition & 0 deletions requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
Django
djangorestframework>=3.2.0
drf-yasg
setuptools
23 changes: 10 additions & 13 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,39 +1,36 @@
#
# 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.8.1
# via django
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
# djangorestframework
django==4.2.11
django==4.2.16
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
# djangorestframework
# drf-yasg
djangorestframework==3.15.1
djangorestframework==3.15.2
# via
# -r requirements/base.in
# drf-yasg
drf-yasg==1.21.7
# via -r requirements/base.in
inflection==0.5.1
# via drf-yasg
packaging==24.0
packaging==24.1
# via drf-yasg
pytz==2024.1
# via drf-yasg
pyyaml==6.0.1
pyyaml==6.0.2
# via drf-yasg
sqlparse==0.4.4
sqlparse==0.5.1
# via django
typing-extensions==4.10.0
# via asgiref
uritemplate==4.1.1
# via drf-yasg

# The following packages are considered to be unsafe in a requirements file:
setuptools==74.1.2
# via -r requirements/base.in
22 changes: 9 additions & 13 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,38 +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
#
cachetools==5.3.3
cachetools==5.5.0
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.8
# via virtualenv
filelock==3.13.3
filelock==3.16.0
# via
# tox
# virtualenv
packaging==24.0
packaging==24.1
# via
# pyproject-api
# tox
platformdirs==4.2.0
platformdirs==4.3.2
# via
# tox
# virtualenv
pluggy==1.4.0
pluggy==1.5.0
# via tox
pyproject-api==1.6.1
pyproject-api==1.7.1
# via tox
tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.14.2
tox==4.18.1
# via -r requirements/ci.in
virtualenv==20.25.1
virtualenv==20.26.4
# via tox
16 changes: 7 additions & 9 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,15 @@ Django<5.0

# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
# See https://github.com/openedx/edx-platform/issues/35126 for more info
elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
django-simple-history==3.0.0

# opentelemetry requires version 6.x at the moment:
# https://github.com/open-telemetry/opentelemetry-python/issues/3570
# Normally this could be added as a constraint in edx-django-utils, where we're
# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
# that uses version 7.x, and then there's no undoing that when compiling base.txt.
# So we need to pin it globally, for now.
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
importlib-metadata<7

# Cause: https://github.com/openedx/event-tracking/pull/290
# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform.
# We will pin event-tracking to do not break existing installations
# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586
# has been resolved and edx-platform is running with pymongo>=4.4.0
event-tracking<2.4.1
Loading