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

Dev #30

Merged
merged 12 commits into from
Aug 26, 2023
Merged

Dev #30

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
74 changes: 30 additions & 44 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,54 +7,11 @@ jobs:

runs-on: ubuntu-latest
strategy:
fail-fast: false
max-parallel: 4
matrix:
include:
- python-version: '3.6'
requirements: django_2_2
tox_env: py36-django22
- python-version: '3.7'
requirements: django_2_2
tox_env: py37-django22
- python-version: '3.8'
requirements: django_2_2
tox_env: py38-django22
- python-version: '3.9'
requirements: django_2_2
tox_env: py39-django22

- python-version: '3.6'
requirements: django_3_0
tox_env: py36-django30
- python-version: '3.7'
requirements: django_3_0
tox_env: py37-django30
- python-version: '3.8'
requirements: django_3_0
tox_env: py38-django30
- python-version: '3.9'
requirements: django_3_0
tox_env: py39-django30

- python-version: '3.6'
requirements: django_3_1
tox_env: py36-django31
- python-version: '3.7'
requirements: django_3_1
tox_env: py37-django31
- python-version: '3.8'
requirements: django_3_1
tox_env: py38-django31
- python-version: '3.9'
requirements: django_3_1
tox_env: py39-django31

- python-version: '3.6'
requirements: django_3_2
tox_env: py36-django32
- python-version: '3.7'
requirements: django_3_2
tox_env: py37-django32
- python-version: '3.8'
requirements: django_3_2
tox_env: py38-django32
Expand All @@ -64,6 +21,35 @@ jobs:
- python-version: '3.10'
requirements: django_3_2
tox_env: py310-django32
- python-version: '3.11'
requirements: django_3_2
tox_env: py311-django32

- python-version: '3.8'
requirements: django_4_1
tox_env: py38-django41
- python-version: '3.9'
requirements: django_4_1
tox_env: py39-django41
- python-version: '3.10'
requirements: django_4_1
tox_env: py310-django41
- python-version: '3.11'
requirements: django_4_1
tox_env: py311-django41

- python-version: '3.8'
requirements: django_4_2
tox_env: py38-django42
- python-version: '3.9'
requirements: django_4_2
tox_env: py39-django42
- python-version: '3.10'
requirements: django_4_2
tox_env: py310-django42
- python-version: '3.11'
requirements: django_4_2
tox_env: py311-django42

steps:
- uses: actions/checkout@v2
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,18 @@ are used for versioning (schema follows below):
0.3.4 to 0.4).
- All backwards incompatible changes are mentioned in this document.

1.10
----
2023-08-27

- Tested against Python 3.11.
- Mark `django-nine` as optional dependency.
- Drop support for Python < 3.7.
- Drop support for Django < 3.2 and 4.0.
- Tested against Django 4.1 and 4.2.
- Upgrade relevant contrib code to support both ``django-constance`` >= 2.8.x and
3.x.

1.9.1
-----
2021-11-18
Expand Down
3 changes: 1 addition & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
include README.rst
include LICENSE_GPL2.0.txt
include LICENSE_LGPL_2.1.txt
include src/ska/contrib/django/ska/requirements.txt
include CHANGELOG.rst
include src/ska/contrib/django/ska/templates/ska/401.html
recursive-include src/ska/contrib/django/ska/locale/hy *
recursive-include src/ska/contrib/django/ska/locale/nl *
recursive-include src/ska/contrib/django/ska/locale/ru *
include src/ska/bin/ska-sign-url
25 changes: 15 additions & 10 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ validating) dictionaries and URLs.
:target: https://github.com/barseghyanartur/ska/#License
:alt: GPL-2.0-only OR LGPL-2.1-or-later

.. image:: https://coveralls.io/repos/github/barseghyanartur/ska/badge.svg?branch=master&service=github
:target: https://coveralls.io/github/barseghyanartur/ska?branch=master
.. image:: https://coveralls.io/repos/github/barseghyanartur/ska/badge.svg?branch=main&service=github
:target: https://coveralls.io/github/barseghyanartur/ska?branch=main
:alt: Coverage

Key concepts
Expand Down Expand Up @@ -87,13 +87,13 @@ Prerequisites
=============
Present
-------
- Core ``ska`` module requires Python 3.6, 3.7, 3.8, 3.9 or 3.10.
- Core ``ska`` module requires Python 3.8, 3.9, 3.10 and 3.11.
- Django ``ska`` module (``ska.contrib.django.ska``) requires the mentioned
above plus Django 2.2, 3.0, 3.1 or 3.2. Additionally, certain
above plus Django 3.2, 4.1 or 4.2. Additionally, certain
versions of `django-constance` and `djangorestframework` are required.
Specific version requirement primarily depends on the used Django version.
Check the `example requirements
<https://github.com/barseghyanartur/ska/tree/master/examples/requirements>`_
<https://github.com/barseghyanartur/ska/tree/main/examples/requirements>`_
to find out which versions of `django-constance` and `djangorestframework`
have been tested with specific Django versions.

Expand All @@ -104,10 +104,15 @@ Past
In future releases (any time) compatibility with no-longer-supported
versions might/will be wiped out.

- Dropping support of Python 3.6 and 3.7 has been announced in version 1.10.
As of 1.9.1 everything still worked.
- Dropping support of Python 2.7 and 3.5 has been announced in version 1.8.
As of 1.7.5 everything still worked.
- Dropping support of Python 3.4 has been announced in version 1.6.8. As of
1.6.8 everything still worked.
- Dropping support of Django 2.2, 3.0, 3.1 and 4.0 has been announced in
version 1.10. As of 1.9.1 everything is still backwards compatible with
mentioned versions.
- Dropping support of Django 1.5, 1.6 and 1.7 has been announced in version
1.6. As of 1.6 everything is still backwards compatible with mentioned
versions.
Expand All @@ -124,7 +129,7 @@ Need ``ska`` for other languages? Check the following affiliated projects:
- `skaphp <https://github.com/barseghyanartur/skaphp>`_: ``ska`` implementation
for PHP (>= 7.2).

Generated signatures are intercompatible between Python, NodeJS and PHP
Generated signatures are inter-compatible between Python, NodeJS and PHP
implementations.

Installation
Expand All @@ -139,7 +144,7 @@ or latest development version from GitHub.

.. code-block:: sh

pip install https://github.com/barseghyanartur/ska/archive/master.tar.gz
pip install https://github.com/barseghyanartur/ska/archive/main.tar.gz

Usage examples
==============
Expand Down Expand Up @@ -1073,7 +1078,7 @@ Relies on dynamic settings functionality provided by
.. note::

Additional requirements shall be installed. See the `constance.txt
<https://github.com/barseghyanartur/ska/blob/master/examples/requirements/constance.txt>`_
<https://github.com/barseghyanartur/ska/blob/main/examples/requirements/constance.txt>`_
file for additional requirements (``django-constance``,
``django-json-widget``, ``django-picklefield``, ``jsonfield2`` and
``redis``).
Expand Down Expand Up @@ -1215,9 +1220,9 @@ urls.py
^^^^^^^
``django-constance`` specific views and urls are used. See
`ska.contrib.django.ska.views.constance_views
<https://github.com/barseghyanartur/ska/blob/master/src/ska/contrib/django/ska/views/constance_views.py>`_
<https://github.com/barseghyanartur/ska/blob/main/src/ska/contrib/django/ska/views/constance_views.py>`_
and `ska.contrib.django.ska.urls.constance_urls
<https://github.com/barseghyanartur/ska/blob/master/src/ska/contrib/django/ska/urls/constance_urls.py>`_
<https://github.com/barseghyanartur/ska/blob/main/src/ska/contrib/django/ska/urls/constance_urls.py>`_
for the reference.

.. code-block:: python
Expand Down
Loading
Loading