Skip to content

Commit f7b3031

Browse files
merwokmerwok
authored
Update packaging and dependencies (#172)
1 parent 425bf29 commit f7b3031

File tree

9 files changed

+69
-58
lines changed

9 files changed

+69
-58
lines changed

‎.circleci/config.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ workflows:
77
name: test-py<< matrix.python >>-dj<< matrix.django >>
88
matrix:
99
parameters:
10-
python: ["3.9", "3.8"]
11-
django: ["3.2", "3.1", "2.2"]
10+
python: ["3.10", "3.9"]
11+
django: ["4.1", "4.0", "3.2"]
1212
- check
1313

1414
jobs:
@@ -21,7 +21,7 @@ jobs:
2121
type: string
2222
docker:
2323
- image: cimg/python:<< parameters.python >>
24-
- image: circleci/postgres:10.5
24+
- image: cimg/postgres:14.0
2525
environment:
2626
POSTGRES_DB: circle_test
2727
POSTGRES_USER: testapp
@@ -48,7 +48,7 @@ jobs:
4848
pyshort="${python//./}"
4949
venv/bin/tox -e py${pyshort}-dj<< parameters.django >> -- --junitxml=~/reports/tox/coverage.xml
5050
- when:
51-
condition: { equal: [<< parameters.python >>, "3.9"] }
51+
condition: { equal: [<< parameters.python >>, "3.10"] }
5252
steps:
5353
- run:
5454
name: Check coverage with Python << parameters.python >>
@@ -63,7 +63,7 @@ jobs:
6363

6464
check:
6565
docker:
66-
- image: cimg/python:3.9
66+
- image: cimg/python:3.10
6767
working_directory: ~/rest-auth-toolkit
6868
steps:
6969
- checkout

‎CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## v0.12 (unreleased)
44

5+
Library tested with Python 3.9 and 3.10,
6+
and Django 3.2, 4.0 and 4.1 (#172)
7+
58

69
## v0.11
710

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2017 Caravan Web Worker Cooperative, Inc
3+
Copyright © 2017-2022 Caravan Web Worker Cooperative, Inc
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎demo/requirements.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
flit
2-
pip-tools ~= 5.4.0
2+
pip-tools == 6.8.*
33

4-
django == 3.2.*
4+
django == 4.0.*
55
djangorestframework
66
django-debug-toolbar
77
dj-database-url

‎demo/requirements.txt

+36-29
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,48 @@
11
#
2-
# This file is autogenerated by pip-compile
2+
# This file is autogenerated by pip-compile with python 3.10
33
# To update, run:
44
#
5-
# pip-compile requirements.in
5+
# pip-compile --annotation-style=line requirements.in
66
#
7-
asgiref==3.3.4 # via django
8-
certifi==2020.12.5 # via requests
9-
chardet==4.0.0 # via requests
10-
click==7.1.2 # via pip-tools
7+
asgiref==3.5.2 # via django
8+
build==0.8.0 # via pip-tools
9+
certifi==2022.6.15 # via requests
10+
charset-normalizer==2.1.1 # via requests
11+
click==8.1.3 # via pip-tools
1112
coreapi==2.3.3 # via -r requirements.in
1213
coreschema==0.0.4 # via coreapi
13-
dj-database-url==0.5.0 # via -r requirements.in
14-
django-debug-toolbar==3.2.1 # via -r requirements.in
15-
django-model-utils==4.1.1 # via -r requirements.in
14+
dj-database-url==1.0.0 # via -r requirements.in
15+
django==4.0.7 # via -r requirements.in, dj-database-url, django-debug-toolbar, django-model-utils, django-shortuuidfield, djangorestframework
16+
django-debug-toolbar==3.6.0 # via -r requirements.in
17+
django-model-utils==4.2.0 # via -r requirements.in
1618
django-shortuuidfield==0.1.3 # via -r requirements.in
17-
django==3.2.2 # via -r requirements.in, django-debug-toolbar, django-model-utils, django-shortuuidfield, djangorestframework
18-
djangorestframework==3.12.4 # via -r requirements.in
19-
docutils==0.17.1 # via flit
19+
djangorestframework==3.13.1 # via -r requirements.in
20+
docutils==0.19 # via flit
2021
facepy==1.0.12 # via -r requirements.in
21-
flit-core==3.2.0 # via flit
22-
flit==3.2.0 # via -r requirements.in
23-
idna==2.10 # via requests
22+
flit==3.7.1 # via -r requirements.in
23+
flit-core==3.7.1 # via flit
24+
idna==3.3 # via requests
2425
itypes==1.2.0 # via coreapi
25-
jinja2==2.11.3 # via coreschema
26-
markdown==3.3.4 # via -r requirements.in
27-
markupsafe==1.1.1 # via jinja2
28-
pip-tools==5.4.0 # via -r requirements.in
29-
psycopg2==2.8.6 # via -r requirements.in
30-
pygments==2.9.0 # via -r requirements.in
31-
pytz==2021.1 # via django
32-
requests==2.25.1 # via coreapi, facepy, flit
33-
shortuuid==1.0.1 # via django-shortuuidfield
34-
six==1.16.0 # via django-shortuuidfield, facepy, pip-tools
35-
sqlparse==0.4.1 # via django, django-debug-toolbar
36-
toml==0.10.2 # via flit, flit-core
37-
uritemplate==3.0.1 # via coreapi
38-
urllib3==1.26.4 # via requests
26+
jinja2==3.1.2 # via coreschema
27+
markdown==3.4.1 # via -r requirements.in
28+
markupsafe==2.1.1 # via jinja2
29+
packaging==21.3 # via build
30+
pep517==0.13.0 # via build
31+
pip-tools==6.8.0 # via -r requirements.in
32+
psycopg2==2.9.3 # via -r requirements.in
33+
pygments==2.13.0 # via -r requirements.in
34+
pyparsing==3.0.9 # via packaging
35+
pytz==2022.2.1 # via djangorestframework
36+
requests==2.28.1 # via coreapi, facepy, flit
37+
shortuuid==1.0.9 # via django-shortuuidfield
38+
six==1.16.0 # via django-shortuuidfield, facepy
39+
sqlparse==0.4.2 # via django, django-debug-toolbar
40+
tomli==2.0.1 # via build, flit, pep517
41+
tomli-w==1.0.0 # via flit
42+
uritemplate==4.1.1 # via coreapi
43+
urllib3==1.26.12 # via requests
44+
wheel==0.37.1 # via pip-tools
3945

4046
# The following packages are considered to be unsafe in a requirements file:
4147
# pip
48+
# setuptools

‎pyproject.toml

+17-14
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
11
[build-system]
2-
requires = ["flit_core ~= 3.2.0"]
2+
requires = ["flit_core == 3.4.*"]
33
build-backend = "flit_core.buildapi"
44

5-
[tool.flit.metadata]
6-
module = "rest_auth_toolkit"
7-
dist-name = "Rest_Framework_Auth_Toolkit"
8-
author = "Caravan Coop"
9-
author-email = "[email protected]"
10-
home-page = "https://github.com/caravancoop/rest-framework-auth-toolkit"
11-
description-file = "README.md"
5+
[project]
6+
dynamic = ["version", "description"]
7+
name = "Rest_Framework_Auth_Toolkit"
8+
authors = [ { name = "Caravan Coop", email = "[email protected]" } ]
9+
readme = "README.md"
10+
requires-python = ">= 3.8"
1211
classifiers = [
1312
"Development Status :: 4 - Beta",
1413
"Intended Audience :: Developers",
1514
"Environment :: Web Environment",
1615
"License :: OSI Approved :: MIT License",
1716
"Programming Language :: Python :: 3",
1817
"Programming Language :: Python :: 3 :: Only",
19-
"Programming Language :: Python :: 3.8",
2018
"Programming Language :: Python :: 3.9",
19+
"Programming Language :: Python :: 3.10",
2120
"Framework :: Django",
22-
"Framework :: Django :: 2.2",
23-
"Framework :: Django :: 3.1",
2421
"Framework :: Django :: 3.2",
22+
"Framework :: Django :: 4.0",
23+
"Framework :: Django :: 4.1",
2524
]
26-
requires = [
25+
dependencies = [
2726
"django >= 2.2",
2827
]
2928

30-
[tool.flit.metadata.requires-extra]
29+
[project.optional-dependencies]
3130
facebook = ["facepy"]
3231

33-
[tool.flit.metadata.urls]
32+
[project.urls]
33+
Homepage = "https://github.com/caravancoop/rest-framework-auth-toolkit"
3434
Changelog = "https://github.com/caravancoop/rest-framework-auth-toolkit/blob/main/CHANGELOG.md"
35+
36+
[tool.flit.module]
37+
name = "rest_auth_toolkit"

‎rest_auth_toolkit/__init__.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
"""Simple + flexible signup and login for Django APIs"""
22

3-
__version__ = '0.12.dev'
4-
5-
default_app_config = 'rest_auth_toolkit.app.RestAuthToolkitConfig'
3+
__version__ = '0.12.dev1'

‎rest_auth_toolkit/app.py

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ class RestAuthToolkitConfig(AppConfig):
88
email_confirmed is emitted.
99
"""
1010
name = 'rest_auth_toolkit'
11+
default = True
1112

1213
def ready(self):
1314
from .models import email_confirmed

‎tox.ini

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
[tox]
22
# quick test with bare "tox" command checks only one combination
3-
envlist = py39-dj3.2
4-
skip_missing_interpreters = true
3+
envlist = py310-dj4.0
54
minversion = 3.4.0
65
isolated_build = True
76

87
[testenv]
98
passenv =
109
DATABASE_URL
1110
deps =
12-
dj2.2: django == 2.2.*
13-
dj3.1: django == 3.1.*
1411
dj3.2: django == 3.2.*
12+
dj4.0: django == 4.0.*
13+
dj4.1: django == 4.1.*
1514
commands =
1615
pip install -r requirements-test.txt -r demo/requirements.txt
1716
flake8 rest_auth_toolkit tests demo

0 commit comments

Comments
 (0)