Skip to content
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
35 changes: 20 additions & 15 deletions .github/workflows/default.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
name: Lint
name: Tests

on: [push, pull_request]
on:
pull_request:
push:
branches:
- "support/**"

jobs:
flake8:
name: flake8
runs-on: ubuntu-lts
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: "3.12"
- name: Install flake8
Expand All @@ -25,9 +28,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: "3.12"
- run: python -m pip install isort
Expand All @@ -38,23 +41,25 @@ jobs:
run: isort -c -rc -df aldryn_django

unit-tests:
runs-on: ubuntu-lts
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
python-version: ["3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12", "3.13"]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Update depenedencies
run: sudo apt-get update
- name: Install dependencies
run: sudo apt-get install -y libxml2-dev libxslt-dev python-dev-is-python3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
- name: Run tests
run: |
python -m pip install --upgrade pip
pip install packaging
pip install --upgrade urllib3 setuptools
pip install -U packaging setuptools
pip install -r tests/requirements.txt
python setup.py install
python tests/settings.py
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
"Framework :: Django",
"Framework :: Django :: 5.1",
"Framework :: Django :: 5.2",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.10",
Expand Down Expand Up @@ -67,7 +67,6 @@
zip_safe=False,
install_requires=REQUIREMENTS,
classifiers=CLASSIFIERS,
test_suite="tests.settings.run",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

test_suite was removed a long time ago.

entry_points="""
[console_scripts]
aldryn-django=aldryn_django.cli:main
Expand Down
10 changes: 1 addition & 9 deletions tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
# other requirements
# django-app-helper is not yet ready for Django 4
https://github.com/FinalAngel/django-app-helper/archive/refs/heads/develop.zip#egg=django-app-helper
coverage
django-app-helper
isort
flake8
# needed for the build to work
uwsgi
# currently breaks ci because it wants rust now
cryptography<3.4
urllib3<1.27