Skip to content

Commit

Permalink
Merge pull request #4 from ycharts/v1_django42_alpha
Browse files Browse the repository at this point in the history
Update to support Django 4.2
  • Loading branch information
jpintor52 authored Feb 15, 2024
2 parents 6317840 + 6f62916 commit ede15fb
Show file tree
Hide file tree
Showing 43 changed files with 1,003 additions and 979 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
If this is a bug please specify versions you're using first.

Django version:
Django Suit version:
Python version:
Django version:
Django Suit version:
Python version:

Issue:
49 changes: 49 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Test Suite

# Controls when the action will run.
on:
# Triggers the workflow on push for the master branch.
push:
branches: [ master ]
# Triggers the workflow on pull request for any branch.
pull_request:
# Allows you to run this workflow manually from the Actions tab.
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ "3.8", "3.9", "3.10"]
django-version: [ "3.2" , "4.0", "4.1", "4.2"]
include:
- python-version: "3.10"
django-version: "5.0"
steps:
# Checks-out the repository.
- uses: actions/checkout@v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
cache-dependency-path: |
requirements.txt
dev_requirements.txt
- name: Install Python dependencies
run: |
python -m pip install --upgrade pip
pip install -q Django==${{ matrix.django-version }}.*
- name: Install Package
run: pip install .

- name: Run tests
run: python manage.py test suit
21 changes: 21 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-added-large-files
- id: check-ast

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.1
hooks:
- id: ruff
# enable auto-fixing of common errors
args: [--exit-non-zero-on-fix]

- repo: https://github.com/psf/black
rev: 22.10.0
hooks:
- id: black
args: [--line-length=120, --skip-string-normalization]
26 changes: 0 additions & 26 deletions .travis.yml

This file was deleted.

8 changes: 7 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ Changelog
Only important changes are mentioned below. See `commit log <https://github.com/darklow/django-suit/commits/develop>`_, `closed issues <https://github.com/darklow/django-suit/issues?direction=desc&sort=updated&state=closed>`_ and `closed pull
requests <https://github.com/darklow/django-suit/pulls?q=sort%3Aupdated-desc+is%3Apr+is%3Aclosed>`_ for full changes.

v.0.3.0 (2024-01-18)
--------------------
* Add support for Django >=4.0
* Remove support for Django < 3.2


v.0.2.29 (2021-04-28)
--------------------
* This is a 'maintenance fork' which contains some fixes for compatibility with the latest Django releases.
Expand Down Expand Up @@ -242,7 +248,7 @@ v0.1.8 (2013-03-20)
* [Feature] `Full-width fieldsets <http://django-suit.readthedocs.org/en/develop/widgets.html#css-goodies>`_
* [Feature] Introduced two related wysiwyg apps `suit-redactor <https://github.com/darklow/django-suit-redactor>`_ and `suit-ckeditor <https://github.com/darklow/django-suit-ckeditor>`_
* [CSS] New "multi-fields in row" look and behaviour.
* [CSS] Support for fieldset "wide" class
* [CSS] Support for fieldset "wide" class
* [Refactor] Major fieldset refactoring to support multi-line labels
* [Fix] Many CSS/Templating fixes and tweaks. See commit log for full changes

Expand Down
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django Suit
Django Suit
-----------

Django Suit by is licensed under a
Expand All @@ -7,7 +7,7 @@ Creative Commons Attribution-NonCommercial 3.0 Unported License
See online version of this license here:
http://creativecommons.org/licenses/by-nc/3.0/

License
License
-------

THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
Expand Down
6 changes: 6 additions & 0 deletions dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
-c requirements.txt
# Packages needed if you'd like to test / develop on django-autocompleter
coverage
pre-commit
twine
build
Loading

0 comments on commit ede15fb

Please sign in to comment.