Skip to content

Commit 0334733

Browse files
Merge pull request #200 from italia/idpy-frks
Satosa and PySAML2 forks alignment
2 parents 3b29f25 + 0d5f377 commit 0334733

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

README-DEV.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ read [this](README.idpy.forks.mngmnt.md) for any further explaination about how
55

66
All the patches and features are currently merged and available with the following releases:
77

8-
- [pysaml2](https://github.com/peppelinux/pysaml2/tree/pplnx-v7.0.1-1)
8+
- [pysaml2](https://github.com/peppelinux/pysaml2/tree/pplnx-v7.5.2)
99
- [SATOSA](https://github.com/peppelinux/SATOSA/tree/oidcop-v8.0.0)
1010

1111
## Pending contributions to idpy

README.idpy.forks.mngmnt.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ cd pysaml2/
66
77
# create current pplnx branch
88
git remote add ppl nx https://github.com/peppelinux/pysaml2.git
9-
# git checkout --orphan pplnx-v7.4.2
9+
# git checkout --orphan pplnx-v7.5.2
1010
# git reset --hard
1111
# git pull origin master
1212
13-
git checkout -b pplnx-v7.4.2
13+
git checkout -b pplnx-v7.5.2
1414
1515
# pplnx's patches
1616
@@ -32,10 +32,10 @@ python3 -m pytest tests/ -x
3232
git clone https://github.com/identitypython/satosa -o satosa
3333
cd satosa
3434
git remote add pplnx https://github.com/peppelinux/SATOSA.git
35-
# git checkout --orphan pplnx-v8.4.0
35+
# git checkout --orphan pplnx-v8.5.1
3636
# git reset --hard
3737
# git pull origin master
38-
git checkout -b pplnx-v8.4.0
38+
git checkout -b pplnx-v8.5.1
3939
4040
pip install -r tests/test_requirements.txt
4141
pip install pymongo

gallery/iam-proxy.svg

Lines changed: 4 additions & 4 deletions
Loading

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "iam-proxy-italia"
3-
version = "2.2.1"
3+
version = "3.0"
44
description = "IAM Proxy"
55
authors = [
66
{name = "Giuseppe De Marco",email = "demarcog83@gmail.com"}
@@ -9,8 +9,8 @@ license = {text = "Apache 2.0"}
99
readme = "README.md"
1010
requires-python = ">=3.9,<4.0"
1111
dependencies = [
12-
"pysaml2 @ git+https://github.com/peppelinux/pysaml2.git@pplnx-v7.5.0",
13-
"satosa @ git+https://github.com/peppelinux/SATOSA.git@pplnx-v8.5.0",
12+
"pysaml2 @ git+https://github.com/peppelinux/pysaml2.git@pplnx-v7.5.2",
13+
"satosa @ git+https://github.com/peppelinux/SATOSA.git@pplnx-v8.5.1",
1414
"pymongo (>=4.10.1,<5.0.0)",
1515
"satosa-oidcop (>=2.0.0)",
1616
"uwsgi (>=2.0.28,<3.0.0)",

0 commit comments

Comments
 (0)