Skip to content

Commit

Permalink
Merge branch 'master' into increase-jwt-identity
Browse files Browse the repository at this point in the history
  • Loading branch information
Dreamsorcerer authored Feb 3, 2025
2 parents 3b9c808 + 2356dc6 commit 0f4c99f
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v2.2.0
uses: dependabot/fetch-metadata@v2.3.0
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Enable auto-merge for Dependabot PRs
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
pyver: ['pypy-3.8', '3.8', '3.9', '3.10', '3.11', '3.12']
pyver: ['pypy-3.9', '3.9', '3.10', '3.11', '3.12', '3.13']
timeout-minutes: 15
steps:
- name: Checkout
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: 3.13
- name: Install dependencies
run:
python -m pip install -U pip wheel setuptools build twine
Expand Down
20 changes: 20 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html
# for details

---
version: 2

sphinx:
# Path to your Sphinx configuration file.
configuration: docs/conf.py

submodules:
include: all
exclude: []
recursive: true

build:
os: ubuntu-24.04
tools:
python: "3.13"
1 change: 0 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
'sphinx.ext.intersphinx',
'sphinx.ext.viewcode',
'alabaster',
'aiohttp_doctools',
]

# Add any paths that contain templates here, relative to this directory.
Expand Down
14 changes: 7 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
-e .
aiohttp==3.10.10
aiohttp==3.11.11
aiohttp-session==2.12.1
async-timeout==4.0.3
coverage==7.6.1
cryptography==43.0.3
async-timeout==5.0.1
coverage==7.6.10
cryptography==44.0.0
hiredis==3.1.0
passlib==1.7.4
pyjwt==2.9.0
pyjwt==2.10.1
pytest==8.3.4
pytest-aiohttp==1.0.5
pytest-cov==5.0.0
pytest-aiohttp==1.1.0
pytest-cov==6.0.0
pytest-mock==3.14.0
sqlalchemy==2.0.37
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os
import re

from setuptools import find_packages, setup
from setuptools import setup


with open(os.path.join(os.path.abspath(os.path.dirname(
Expand Down Expand Up @@ -31,11 +31,11 @@ def read(f):
'Intended Audience :: Developers',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
'Topic :: Internet :: WWW/HTTP',
'Framework :: AsyncIO',
"Framework :: aiohttp",
Expand All @@ -44,7 +44,8 @@ def read(f):
author_email='andrew.svetlov@gmail.com',
url='https://github.com/aio-libs/aiohttp_security/',
license='Apache 2',
packages=find_packages(),
packages=("aiohttp_security",),
python_requires=">=3.9",
install_requires=install_requires,
tests_require=tests_require,
include_package_data=True,
Expand Down

0 comments on commit 0f4c99f

Please sign in to comment.