Skip to content

Commit 48e2f68

Browse files
authored
Merge pull request #49 from makinacorpus/fix_project_name
Fix project name in documentation
2 parents 97c6ee8 + 79ed5eb commit 48e2f68

File tree

9 files changed

+707
-33
lines changed

9 files changed

+707
-33
lines changed

.github/workflows/lint.yml

Lines changed: 36 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
black:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
15-
- uses: actions/setup-python@v5
14+
- uses: actions/checkout@v5
15+
- uses: actions/setup-python@v6
1616
with:
1717
python-version: "3.12"
1818
- uses: psf/black@stable
@@ -25,14 +25,16 @@ jobs:
2525
matrix:
2626
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
2727
steps:
28-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@v5
2929
with:
3030
fetch-depth: 0 # Needed for versioningit to find the repo version
31-
- uses: actions/setup-python@v5
31+
- uses: actions/setup-python@v6
3232
with:
3333
python-version: ${{ matrix.python-version }}
34+
3435
- name: Install dependencies
3536
run: python -m pip install --upgrade pip build
37+
3638
- name: Build python package
3739
run: python -m build
3840

@@ -42,20 +44,23 @@ jobs:
4244
matrix:
4345
python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12", "3.13" ]
4446
steps:
45-
- uses: actions/checkout@v4
47+
- uses: actions/checkout@v5
4648
with:
4749
fetch-depth: 0 # Needed for versioningit to find the repo version
48-
- uses: actions/setup-python@v5
50+
- uses: actions/setup-python@v6
4951
with:
5052
python-version: ${{ matrix.python-version }}
5153

52-
- name: Install dependencies
53-
run: python -m pip install .[drf]
54+
- name: Install uv
55+
uses: astral-sh/setup-uv@v6
56+
with:
57+
python-version: ${{ matrix.python-version }}
58+
version: "0.9.8"
5459

5560
- name: Install dependencies
56-
run: python -m pip install --upgrade pip
57-
-r requirements/requirements-dev.in
58-
-r requirements/requirements-test.in
61+
run: uv pip install .[drf] -r requirements/requirements-dev.in -r requirements/requirements-test.in
62+
env:
63+
UV_SYSTEM_PYTHON: 1
5964

6065
- name: Run mypy
6166
run: mypy --version && ./run_mypy.sh
@@ -64,20 +69,23 @@ jobs:
6469
linting:
6570
runs-on: ubuntu-latest
6671
steps:
67-
- uses: actions/checkout@v4
72+
- uses: actions/checkout@v5
6873
with:
6974
fetch-depth: 0 # Needed for versioningit to find the repo version
70-
- uses: actions/setup-python@v5
75+
- uses: actions/setup-python@v6
7176
with:
7277
python-version: "3.12"
7378

74-
- name: Install dependencies
75-
run: python -m pip download .[drf]
79+
- name: Install uv
80+
uses: astral-sh/setup-uv@v6
81+
with:
82+
python-version: "3.12"
83+
version: "0.9.8"
7684

7785
- name: Install dependencies
78-
run: python -m pip install --upgrade pip
79-
-r requirements/requirements-dev.in
80-
-r requirements/requirements-test.in
86+
run: uv pip install .[drf] -r requirements/requirements-dev.in -r requirements/requirements-test.in
87+
env:
88+
UV_SYSTEM_PYTHON: 1
8189

8290
- name: Run flake8
8391
run : flake8 --version && flake8 --extend-ignore=E501,E503,E203 --max-line-len=88 .
@@ -110,20 +118,23 @@ jobs:
110118
matrix:
111119
python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12", "3.13" ]
112120
steps:
113-
- uses: actions/checkout@v4
121+
- uses: actions/checkout@v5
114122
with:
115123
fetch-depth: 0 # Needed for versioningit to find the repo version
116-
- uses: actions/setup-python@v5
124+
- uses: actions/setup-python@v6
117125
with:
118126
python-version: ${{ matrix.python-version }}
119127

120-
- name: Install dependencies
121-
run: python -m pip install .[drf]
128+
- name: Install uv
129+
uses: astral-sh/setup-uv@v6
130+
with:
131+
python-version: ${{ matrix.python-version }}
132+
version: "0.9.8"
122133

123134
- name: Install dependencies
124-
run: python -m pip install --upgrade pip
125-
-r requirements/requirements-dev.in
126-
-r requirements/requirements-test.in
135+
run: uv pip install .[drf] -r requirements/requirements-dev.in -r requirements/requirements-test.in
136+
env:
137+
UV_SYSTEM_PYTHON: 1
127138

128139
- name: Run unit tests
129140
run: python3 run_tests.py

CHANGES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
1.0.5
2+
-----
3+
- fix project name in sphinx metadata
4+
- fix missing django 5.2 and python 3.13 classifiers in pyproject.toml
5+
16
1.0.4
27
-----
38
- switch jwt library to pyjwt

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
</a>
1717
</p>
1818

19-
This library allow *Single Sign On* (SSO) integration into Django through the [Open ID Connect (OIDC)]() protocol.
19+
This library allows *Single Sign On* (SSO) integration into Django through the [Open ID Connect (OIDC)]() protocol.
2020

21-
It can be used to setup a Single Sign On using an identity provider (Keycloak, etc.) or to login using Google, Twitter, etc.
21+
It can be used to set up a Single Sign On using an identity provider (Keycloak, etc.) or to login using Google, Twitter, etc.
2222

2323
**Warning**: this library has not been audited. However, we are based on [pyoidc](https://github.com/CZ-NIC/pyoidc/) which we believe is a sane OIDC implementation.
2424

@@ -46,7 +46,7 @@ If you are not satisfied with the default configuration, take a look at the cook
4646

4747
## Acknowledgement
4848

49-
This library is built on the work of many others. First all, thanks to all the maintainers of [pyoidc](https://github.com/CZ-NIC/pyoidc/) as they did all the spec implementation. This library is mostly about glue between Django and *pyoidc*.
49+
This library is built on the work of many others. First of all, thanks to all the maintainers of [pyoidc](https://github.com/CZ-NIC/pyoidc/) as they did all the spec implementation. This library is mostly about glue between Django and *pyoidc*.
5050

5151
We were also heavily inspired by:
5252

@@ -78,15 +78,15 @@ INSTALLED_APPS = [
7878
]
7979
```
8080

81-
Don't forget to add the session middleware! Add in your `settings.py`:
81+
Remember to add the session middleware! Add in your `settings.py`:
8282

8383
```python
8484
MIDDLEWARE = [
8585
"django.contrib.sessions.middleware.SessionMiddleware",
8686
]
8787
```
8888

89-
Now is time to run a migrate operation, as we create a database table ([read why here](https://django-pyoidc.readthedocs.io/latest/explanation.html#about-caching)). Run in your project dir:
89+
Now is the time to run a migrate operation, as we create a database table ([read why here](https://django-pyoidc.readthedocs.io/latest/explanation.html#about-caching)). Run in your project dir:
9090

9191
```
9292
./manage.py migrate
@@ -103,7 +103,7 @@ CACHES = {
103103
}
104104
```
105105

106-
Now you can pick an identity provider from the [available providers](https://django-pyoidc.readthedocs.io/latest/reference.html#providers). Providers class are a quick way to generate the library configuration and URLs. You can also configure the settings manually, but this is not recommended if you are not familiar with the OpendID Connect (OIDC) protocol.
106+
Now you can pick an identity provider from the [available providers](https://django-pyoidc.readthedocs.io/latest/reference.html#providers). Provider classes are a quick way to generate the library configuration and URLs. You can also configure the settings manually, but this is not recommended if you are not familiar with the OpendID Connect (OIDC) protocol.
107107

108108
Add the following `DJANGO_PYOIDC` to your `settings.py`:
109109

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
django.setup()
2828

2929
copyright = "Free Software"
30-
project = "Makina Django OIDC"
30+
project = "django_pyoidc"
3131
author = "Paul FLORENCE, Régis LEROY (regilero)"
3232

3333
# -- General configuration ---------------------------------------------------

docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
Welcome to Makina Django OIDC's documentation!
2+
Welcome to django_pyOIDC's documentation!
33
==============================================
44

55

pyproject.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ classifiers=["Topic :: Utilities",
1919
"Framework :: Django :: 5",
2020
"Framework :: Django :: 5.0",
2121
"Framework :: Django :: 5.1",
22+
"Framework :: Django :: 5.2",
2223
"Development Status :: 5 - Production/Stable",
2324
"Programming Language :: Python :: 3 :: Only",
2425
"Programming Language :: Python :: 3.8",
2526
"Programming Language :: Python :: 3.9",
2627
"Programming Language :: Python :: 3.10",
2728
"Programming Language :: Python :: 3.11",
2829
"Programming Language :: Python :: 3.12",
30+
"Programming Language :: Python :: 3.13",
2931
"Topic :: Security"
3032
]
3133
description="Authenticate your users using OpenID Connect (OIDC)"

0 commit comments

Comments
 (0)