Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

build: add python 3.11 and 3.12 ci checks #268

Closed
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
30 changes: 24 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-20.04]
python-version: [3.8]
python-version: [3.8, 3.11, 3.12]
test-target: [test, quality]

steps:
Expand All @@ -29,17 +29,35 @@ jobs:

- name: Build Docker
run: |
docker-compose -f .github/docker-compose-ci.yml up -d
docker exec ecomworker bash -c "sudo apt update -y; sudo apt install python3-dev -y;"

docker compose -f .github/docker-compose-ci.yml up -d
docker exec ecomworker bash -c "
sudo apt-get update -y &&
sudo apt-get install python${{ matrix.python-version }} \
python${{ matrix.python-version }}-dev \
python${{ matrix.python-version }}-distutils -y &&
curl -sS https://bootstrap.pypa.io/get-pip.py | python${{ matrix.python-version }};"
# Need to install pip from source here^ otherwise some packages don't get installed
- name: Format Python Version
run: |
PYTHON_VERSION=${{ matrix.python-version }}
FORMATTED_VERSION=${PYTHON_VERSION/3./py3}
echo "PYTHON_VERSION=$FORMATTED_VERSION" >> $GITHUB_ENV
- name: Install dependencies
run: |
docker exec -t ecomworker bash -c "
cd /edx/app/ecomworker/ecomworker &&
python${{ matrix.python-version }} -m pip install tox
"
- name: Run Tests
env:
TARGETS: ${{ matrix.test-target }}
run: |
docker exec ecomworker bash -c "cd /edx/app/ecomworker/ecomworker && make $TARGETS"
docker exec ecomworker bash -c "
cd /edx/app/ecomworker/ecomworker &&
PYTHON_VERSION=${{ matrix.python-version }} PYTHON_ENV=$PYTHON_VERSION make $TARGETS"

- name: Run Coverage
if: matrix.test-target == 'test'
if: matrix.test-target == 'test' && matrix.python-version == '3.8'
run: |
pip install -U codecov
codecov
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PACKAGE = ecommerce_worker
PYTHON_VERSION = py38
PYTHON_VERSION_VAR=$(if $(PYTHON_VERSION),$(PYTHON_VERSION),3.12)
PYTHON_ENV_VAR=$(if $(PYTHON_ENV),$(PYTHON_ENV),py312)

help: ## display this help message
@echo "Please use \`make <target>' where <target> is one of"
Expand All @@ -15,7 +16,7 @@ worker: ## start the Celery worker process
celery -A ecommerce_worker worker --app=$(PACKAGE).celery_app:app --loglevel=info --queue=fulfillment,email_marketing

test: requirements_tox ## run unit tests and report on coverage
tox -e ${PYTHON_VERSION}
python${PYTHON_VERSION_VAR} -m tox -e ${PYTHON_ENV_VAR}

quality: requirements_tox ## run pep8 and pylint
tox -e quality
Expand Down
6 changes: 3 additions & 3 deletions ecommerce_worker/configuration/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
# See http://celery.readthedocs.org/en/4.0/userguide/configuration.html#std:setting-worker_hijack_root_logger.
CELERYD_HIJACK_ROOT_LOGGER = False

# Specify allowed serializers that are consistent with Celery 3 defaults
CELERY_TASK_SERIALIZER = 'pickle'
CELERY_RESULT_SERIALIZER = 'pickle'
# Sync settings with LMS/CMS
CELERY_TASK_SERIALIZER = 'json'
CELERY_RESULT_SERIALIZER = 'json'
Comment on lines +36 to +38

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit is already merged to redwood.master. This could be happening due to fork being out of sync.

CELERY_EVENT_SERIALIZER = 'json'
CELERY_ACCEPT_CONTENT = ['json', 'pickle', 'yaml']
# END CELERY
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{38},quality
envlist = py{38, 311, 312},quality
skipsdist = true

[isort]
Expand Down
Loading