diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2fdb8f65..81748bc9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,21 +10,34 @@ 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: Install Django ${{ matrix.django-version }} + run: | + sudo apt install gettext + python -m pip install "django~=${{ matrix.django-version }}.0" + pip install -r requirements/test.txt + make npm_requirements + make build + make test + make validate_translations - name: run tests run: | sudo apt install gettext - make requirements + python -m pip install "django~=3.2" pip install -r requirements/test.txt + make npm_requirements make build make test make validate_translations diff --git a/Makefile b/Makefile index c3c2c79e..30b28efc 100644 --- a/Makefile +++ b/Makefile @@ -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" @@ -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 diff --git a/edx_credentials_themes/__init__.py b/edx_credentials_themes/__init__.py index 4aa85575..abeeedbf 100644 --- a/edx_credentials_themes/__init__.py +++ b/edx_credentials_themes/__init__.py @@ -1 +1 @@ -__version__ = '0.3.29' +__version__ = '0.4.0' diff --git a/requirements/test.txt b/requirements/test.txt index 382ba247..71761e2e 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -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 diff --git a/setup.py b/setup.py index 10d68905..4baf1bd1 100644 --- a/setup.py +++ b/setup.py @@ -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', ], )