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

feat: Added Support for Django 4.2 #657

Merged
merged 1 commit into from
Feb 2, 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
13 changes: 9 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,26 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8]
django-version: [3.2, 4.2]
node: [18]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: '3.8'
python-version: ${{ matrix.python-version }}
architecture: x64
- uses: actions/setup-node@v2-beta
with:
node-version: ${{ matrix.node }}
- name: run tests

- name: run tests with Django ${{ matrix.django-version }}
run: |
sudo apt install gettext
make requirements
pip install "django~=${{ matrix.django-version }}.0"
pip install -r requirements/test.txt
make npm_requirements
make build
make test
make validate_translations
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ push_translations: ## Push source translation files (.po) to Transifex
requirements: base_requirements
npm install

npm_requirements:
npm install

test:
# Confirm compiled assets have not changed, indicating SASS matches CSS.
git diff --exit-code $(THEME_NAME)/ ":(exclude)$(THEME_NAME)/conf"
Expand All @@ -60,6 +63,9 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
pip install -qr requirements/pip_tools.txt
pip-compile --upgrade -o requirements/base.txt requirements/base.in
pip-compile --upgrade -o requirements/test.txt requirements/test.in
# django will be install seperately for tests in ci to 32 and 42.
sed -i.tmp '/^[d|D]jango==/d' requirements/test.txt
rm requirements/test.txt.tmp

validate_translations: generate_translations detect_changed_source_translations
cd edx_credentials_themes && i18n_tool validate
Expand Down
2 changes: 1 addition & 1 deletion edx_credentials_themes/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.3.32'
__version__ = '0.4.0'
1 change: 0 additions & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ asgiref==3.7.2
# via
# -r requirements/base.txt
# django
django==3.2.23
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.txt
Expand Down
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,7 @@ def get_version(*file_paths):
'Programming Language :: Python',
'Programming Language :: Python :: 3.8',
'Framework :: Django',
'Framework :: Django :: 2.2',
'Framework :: Django :: 3.0',
'Framework :: Django :: 3.1',
'Framework :: Django :: 3.2',
'Framework :: Django :: 4.2',
],
)
Loading