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

Add support for django 4.2 #107

Merged
merged 3 commits into from
Sep 20, 2023
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 @@ -18,20 +18,20 @@ jobs:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8']
toxenv: [py38-django32, quality, package]
toxenv: [py38-django32, py38-django42, quality, package]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: Install pip
run: pip install -r requirements/pip.txt
run: make piptools

- name: Install Dependencies
run: pip install -r requirements/ci.txt
run: pip-sync requirements/ci.txt

- name: Run Tests
env:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ __pycache__/
# C extensions
*.so

# Selenium Firefox for Dev Testing
# Firefox and Geckodriver for selenium integration tests
.firefox
.geckodriver

# NodeJS
node_modules
Expand Down
27 changes: 10 additions & 17 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,31 +36,24 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
pip install -qr requirements/pip.txt
pip install -qr requirements/pip-tools.txt
$(PIP_COMPILE) -o requirements/base.txt requirements/base.in
$(PIP_COMPILE) -o requirements/test.txt requirements/test.in
$(PIP_COMPILE) -o requirements/quality.txt requirements/quality.in
$(PIP_COMPILE) -o requirements/ci.txt requirements/ci.in
$(PIP_COMPILE) -o requirements/dev.txt requirements/dev.in
sed -i '/^[dD]jango==/d' requirements/test.txt

quality: ## check coding style with pycodestyle and pylint
pycodestyle poll --max-line-length=120
pylint poll
tox -e quality

node_requirements: ## Install requirements for handlebar templates i18n extraction
npm install

python_requirements: install_linux_dev_firefox ## install development environment requirements
pip install wheel
pip install -r requirements/base.txt --exists-action w
pip install -r requirements/dev.txt --exists-action w
ifeq ($(VIRTUAL_ENV),)
cd ./src/xblock-sdk && \
pip install -r requirements/base.txt && \
pip install -r requirements/test.txt
else
cd $(VIRTUAL_ENV)/src/xblock-sdk && \
pip install -r requirements/base.txt && \
pip install -r requirements/test.txt
endif
pip uninstall -y selenium
pip install selenium==3.4.1
piptools: ## install pinned version of pip-compile and pip-sync
pip install -r requirements/pip.txt
pip install -r requirements/pip-tools.txt

python_requirements: install_linux_dev_firefox piptools ## install development environment requirements
pip-sync requirements/dev.txt requirements/private.*

requirements: node_requirements python_requirements ## install development environment requirements
@echo "Finished installing requirements."
Expand Down
Loading