Skip to content

Commit d6db168

Browse files
committed
Update package, CI and version support
1 parent 76bf129 commit d6db168

File tree

4 files changed

+37
-33
lines changed

4 files changed

+37
-33
lines changed

.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: pip
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
- package-ecosystem: github-actions
8+
directory: "/"
9+
schedule:
10+
interval: daily

.github/workflows/ci.yml

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
name: CI
2-
on: [pull_request]
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
39
jobs:
10+
411
docs:
512
runs-on: ubuntu-latest
613
steps:
@@ -16,7 +23,11 @@ jobs:
1623
runs-on: ubuntu-latest
1724
strategy:
1825
matrix:
19-
python-version: [3.6, 3.7, 3.8]
26+
python-version:
27+
- "3.7"
28+
- "3.8"
29+
- "3.9"
30+
- "3.10"
2031
steps:
2132
- name: Set up Python ${{ matrix.python-version }}
2233
uses: actions/setup-python@v2
@@ -27,7 +38,7 @@ jobs:
2738
- name: Codecov
2839
run: |
2940
python -m pip install codecov
30-
codecov -t ${{secrets.CODECOV_TOKEN}}
41+
codecov
3142
3243
extras:
3344
needs: [docs]
@@ -36,7 +47,7 @@ jobs:
3647
matrix:
3748
extras:
3849
- wagtail
39-
python-version: [3.8]
50+
python-version: ["3.10"]
4051
steps:
4152
- name: Set up Python ${{ matrix.python-version }}
4253
uses: actions/setup-python@v2
@@ -48,19 +59,19 @@ jobs:
4859
- name: Codecov
4960
run: |
5061
python -m pip install codecov
51-
codecov -t ${{ secrets.CODECOV_TOKEN }}
62+
codecov
5263
5364
5465
PostgreSQL:
5566
needs: [docs]
5667
runs-on: ubuntu-latest
5768
strategy:
5869
matrix:
59-
python-version: [3.8]
70+
python-version: ["3.10"]
6071
django-version:
6172
- "2.2.*"
62-
- "3.0.*"
63-
- "3.1.*"
73+
- "3.2.*"
74+
- "4.0.*"
6475
services:
6576
postgres:
6677
image: postgres
@@ -84,4 +95,4 @@ jobs:
8495
- name: Codecov
8596
run: |
8697
python -m pip install codecov
87-
codecov -t ${{secrets.CODECOV_TOKEN}}
98+
codecov

MANIFEST.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ recursive-include mailauth/templates *
33
recursive-include mailauth/contrib/admin/templates *
44
recursive-include mailauth/contrib/admin/static *
55
recursive-include mailauth/contrib/admin/locale *
6-
prune tests

setup.cfg

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[metadata]
22
name = django-mail-auth
3-
author = Johannes Hoppe
4-
author_email = info@johanneshoppe.com
3+
author = Johannes Maron
4+
author_email = johannes@maron.family
55
description = Django authentication via login URLs, no passwords required
66
long_description = file: README.rst
77
url = https://github.com/codingjoe/django-mail-auth
@@ -14,15 +14,17 @@ classifier =
1414
Intended Audience :: Developers
1515
Programming Language :: Python
1616
Programming Language :: Python :: 3
17-
Programming Language :: Python :: 3.6
1817
Programming Language :: Python :: 3.7
1918
Programming Language :: Python :: 3.8
19+
Programming Language :: Python :: 3.9
20+
Programming Language :: Python :: 3.10
2021
Programming Language :: Python :: 3 :: Only
2122
Topic :: Internet :: WWW/HTTP
2223
Topic :: Internet
2324
Framework :: Django
2425
Framework :: Django :: 2.2
25-
Framework :: Django :: 3.0
26+
Framework :: Django :: 3.2
27+
Framework :: Django :: 4.0
2628
keywords = django, otp, password, email
2729

2830
[options]
@@ -56,27 +58,9 @@ universal = 1
5658
test = pytest
5759

5860
[tool:pytest]
59-
addopts = --cov=mailauth --cov-report xml --cov-report term-missing --tb=short
61+
addopts = --cov=mailauth --cov-report term-missing --tb=short
6062
DJANGO_SETTINGS_MODULE = tests.testapp.settings
6163

62-
[tox:tox]
63-
envlist = py{36,37,38}-dj{22,30,master}-{sqlite,pg},docs
64-
depencies = psycopg2-binary
65-
66-
[testenv]
67-
passenv=CI
68-
setenv =
69-
pg: DB=pg
70-
deps =
71-
dj22: django~=2.2
72-
dj30: django~=3.0
73-
djmaster: https://github.com/django/django/archive/master.tar.gz#egg=django
74-
pg: psycopg2-binary
75-
commands = python setup.py test
76-
77-
[testenv:docs]
78-
commands = python setup.py build_sphinx -W -b doctest -b html
79-
8064
[build_sphinx]
8165
source-dir = docs
8266
build-dir = docs/_build

0 commit comments

Comments
 (0)