Skip to content

Commit

Permalink
Dev -> Master (#25)
Browse files Browse the repository at this point in the history 
* Add more integration tests

* More on integration tests

* Tested against Python 3.10; Mention the affiliated projects (skajs and skaphp)

* Clean up reqs

* Up reqs conditional
  • Loading branch information
@barseghyanartur
barseghyanartur committed Nov 19, 2021
1 parent 5058a14 commit 0c0e0a9
Show file tree
Hide file tree
Showing 23 changed files with 351 additions and 339 deletions.
35 changes: 19 additions & 16 deletions .github/workflows/test.yml
View file
Expand Up @@ -10,57 +10,60 @@ jobs:
max-parallel: 4
matrix:
include:
- python-version: 3.6
- python-version: '3.6'
requirements: django_2_2
tox_env: py36-django22
- python-version: 3.7
- python-version: '3.7'
requirements: django_2_2
tox_env: py37-django22
- python-version: 3.8
- python-version: '3.8'
requirements: django_2_2
tox_env: py38-django22
- python-version: 3.9
- python-version: '3.9'
requirements: django_2_2
tox_env: py39-django22

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

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

- python-version: 3.6
- python-version: '3.6'
requirements: django_3_2
tox_env: py36-django32
- python-version: 3.7
- python-version: '3.7'
requirements: django_3_2
tox_env: py37-django32
- python-version: 3.8
- python-version: '3.8'
requirements: django_3_2
tox_env: py38-django32
- python-version: 3.9
- python-version: '3.9'
requirements: django_3_2
tox_env: py39-django32
- python-version: '3.10'
requirements: django_3_2
tox_env: py310-django32

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

1.9.1
-----
2021-11-18

- Tested against Python 3.10.

1.9
-----
2021-08-18
Expand Down
14 changes: 13 additions & 1 deletion README.rst
View file
Expand Up @@ -87,7 +87,7 @@ Prerequisites
=============
Present
-------
- Core ``ska`` module requires Python 3.6, 3.7, 3.8 or 3.9.
- Core ``ska`` module requires Python 3.6, 3.7, 3.8, 3.9 or 3.10.
- Django ``ska`` module (``ska.contrib.django.ska``) requires the mentioned
above plus Django 2.2, 3.0, 3.1 or 3.2. Additionally, certain
versions of `django-constance` and `djangorestframework` are required.
Expand Down Expand Up @@ -115,6 +115,18 @@ Past
As of 1.6 everything is still backwards compatible (as much as it's possible
within this package) with mentioned versions.

Eco-system
==========
Need ``ska`` for other languages? Check the following affiliated projects:

- `skajs <https://github.com/barseghyanartur/skajs>`_: ``ska`` implementation
for NodeJS (both CommonJS and ESM are supported, Node >= 14).
- `skaphp <https://github.com/barseghyanartur/skaphp>`_: ``ska`` implementation
for PHP (>= 7.2).

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

Installation
============
Latest stable version from PyPI:
Expand Down
6 changes: 6 additions & 0 deletions docs/changelog.rst
View file
Expand Up @@ -15,6 +15,12 @@ are used for versioning (schema follows below):
0.3.4 to 0.4).
- All backwards incompatible changes are mentioned in this document.

1.9.1
-----
2021-11-18

- Tested against Python 3.10.

1.9
-----
2021-08-18
Expand Down
14 changes: 13 additions & 1 deletion docs/index.rst
View file
Expand Up @@ -87,7 +87,7 @@ Prerequisites
=============
Present
-------
- Core ``ska`` module requires Python 3.6, 3.7, 3.8 or 3.9.
- Core ``ska`` module requires Python 3.6, 3.7, 3.8, 3.9 or 3.10.
- Django ``ska`` module (``ska.contrib.django.ska``) requires the mentioned
above plus Django 2.2, 3.0, 3.1 or 3.2. Additionally, certain
versions of `django-constance` and `djangorestframework` are required.
Expand Down Expand Up @@ -115,6 +115,18 @@ Past
As of 1.6 everything is still backwards compatible (as much as it's possible
within this package) with mentioned versions.

Eco-system
==========
Need ``ska`` for other languages? Check the following affiliated projects:

- `skajs <https://github.com/barseghyanartur/skajs>`_: ``ska`` implementation
for NodeJS (both CommonJS and ESM are supported, Node >= 14).
- `skaphp <https://github.com/barseghyanartur/skaphp>`_: ``ska`` implementation
for PHP (>= 7.2).

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

Installation
============
Latest stable version from PyPI:
Expand Down
2 changes: 1 addition & 1 deletion examples/requirements/common.txt
View file
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# pip-compile common.in
Expand Down
10 changes: 5 additions & 5 deletions examples/requirements/debug.txt
View file
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# pip-compile debug.in
Expand All @@ -12,14 +12,14 @@ decorator==5.0.9
# traitlets
ipdb==0.8.1
# via -r debug.in
ipython-genutils==0.1.0
# via
# -r debug.in
# traitlets
ipython==7.0.1
# via
# -r debug.in
# ipdb
ipython-genutils==0.1.0
# via
# -r debug.in
# traitlets
jedi==0.18.0
# via ipython
parso==0.8.2
Expand Down
14 changes: 4 additions & 10 deletions examples/requirements/deployment.txt
View file
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# pip-compile deployment.in
Expand All @@ -24,9 +24,7 @@ idna==2.10
# via requests
importlib-metadata==4.5.0
# via
# click
# keyring
# pep517
# twine
jeepney==0.6.0
# via
Expand All @@ -50,12 +48,12 @@ pyparsing==2.4.7
# via packaging
readme-renderer==29.0
# via twine
requests-toolbelt==0.9.1
# via twine
requests==2.25.1
# via
# requests-toolbelt
# twine
requests-toolbelt==0.9.1
# via twine
rfc3986==1.5.0
# via twine
secretstorage==3.3.1
Expand All @@ -70,16 +68,12 @@ tqdm==4.61.0
# via twine
twine==3.4.1
# via -r deployment.in
typing-extensions==3.10.0.0
# via importlib-metadata
urllib3==1.26.5
# via requests
webencodings==0.5.1
# via bleach
zipp==3.4.1
# via
# importlib-metadata
# pep517
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
67 changes: 22 additions & 45 deletions examples/requirements/dev.txt
View file
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# pip-compile dev.in
Expand Down Expand Up @@ -58,18 +58,18 @@ decorator==5.0.9
# traitlets
distlib==0.3.2
# via virtualenv
django-constance==2.8.0
# via -r constance_django_3_2.in
django-json-widget==1.1.1
# via -r constance_django_3_2.in
django-picklefield==3.0.1
# via -r constance_django_3_2.in
django==3.2.4
# via
# -r django_3_2.in
# django-picklefield
# djangorestframework
# drf-jwt
django-constance==2.8.0
# via -r constance_django_3_2.in
django-json-widget==1.1.1
# via -r constance_django_3_2.in
django-picklefield==3.0.1
# via -r constance_django_3_2.in
djangorestframework==3.12.4
# via
# -r rest_framework_django_3_2.in
Expand Down Expand Up @@ -105,31 +105,18 @@ imagesize==1.2.0
# via sphinx
importlib-metadata==4.5.0
# via
# build
# click
# flake8
# keyring
# pep517
# pluggy
# pre-commit
# pytest
# tox
# twine
# virtualenv
importlib-resources==5.1.4
# via
# pre-commit
# virtualenv
ipdb==0.8.1
# via -r debug.in
ipython-genutils==0.1.0
# via
# -r debug.in
# traitlets
ipython==7.0.1
# via
# -r debug.in
# ipdb
ipython-genutils==0.1.0
# via
# -r debug.in
# traitlets
isort==5.8.0
# via
# -r style_checkers.in
Expand Down Expand Up @@ -229,6 +216,14 @@ pylint==2.8.3
# via -r style_checkers.in
pyparsing==2.4.7
# via packaging
pytest==5.4.3 ; python_version < "3.10"
# via
# -r test.in
# pytest-cov
# pytest-django
# pytest-monkeytype
# pytest-ordering
# pytest-pythonpath
pytest-cov==2.12.0
# via -r test.in
pytest-django==4.3.0
Expand All @@ -239,14 +234,6 @@ pytest-ordering==0.6
# via -r test.in
pytest-pythonpath==0.7.3
# via -r test.in
pytest==5.4.3
# via
# -r test.in
# pytest-cov
# pytest-django
# pytest-monkeytype
# pytest-ordering
# pytest-pythonpath
python-dateutil==2.8.1
# via faker
pytz==2021.1
Expand All @@ -267,13 +254,13 @@ redis==3.0.1
# via -r constance_django_3_2.in
regex==2021.4.4
# via black
requests-toolbelt==0.9.1
# via twine
requests==2.25.1
# via
# requests-toolbelt
# sphinx
# twine
requests-toolbelt==0.9.1
# via twine
restview==2.9.2
# via -r style_checkers.in
rfc3986==1.5.0
Expand Down Expand Up @@ -339,15 +326,8 @@ traitlets==4.3.3
# via ipython
twine==3.4.1
# via -r deployment.in
typed-ast==1.4.3
# via
# astroid
# black
typing-extensions==3.10.0.0
# via
# asgiref
# black
# importlib-metadata
# libcst
# typing-inspect
typing-inspect==0.7.1
Expand All @@ -369,10 +349,7 @@ webencodings==0.5.1
wrapt==1.12.1
# via astroid
zipp==3.4.1
# via
# importlib-metadata
# importlib-resources
# pep517
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down

0 comments on commit 0c0e0a9

Please sign in to comment.