Skip to content

Commit

Permalink
Relax pyramid dependency version constraint (#143)
Browse files Browse the repository at this point in the history
Co-authored-by: Leon Kuchenbecker <[email protected]>
  • Loading branch information
zupo and lkuchenb authored Jun 13, 2021
1 parent 3a58f48 commit 91b97a2
Show file tree
Hide file tree
Showing 5 changed files with 104 additions and 106 deletions.
192 changes: 96 additions & 96 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ These packages tackle the same problem-space:
We do our best to follow the rules below.

* Support the latest few releases of Python, currently Python 3.7, 3.8, and 3.9.
* Support the latest few releases of Pyramid, currently 1.10.7 and 1.10.8.
* Support the latest few releases of Pyramid, currently 1.10.7 through 2.0.
* Support the latest few releases of `openapi-core`, currently 0.13.4 through 0.13.8.
* See `Pipfile.lock` for a frozen-in-time known-good-set of all dependencies.

Expand Down
8 changes: 4 additions & 4 deletions inject_minimal_openapi-core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ fi
if [[ $(python --version) =~ 3\.7 ]]; then
echo "Replacing the Pyramid version in Pipfile.lock with the minimal supported version"

grep "==1.10.8" Pipfile.lock
sed -i 's/"==1.10.8"/"==1.10.7"/g' Pipfile.lock
grep '"==2.0"' Pipfile.lock
sed -i 's/"==2.0"/"==1.10.7"/g' Pipfile.lock

grep "06e99d3174586921490203288e2cc9cd43d12992306f924ca32a2c59233386a9" Pipfile.lock
sed -i s/06e99d3174586921490203288e2cc9cd43d12992306f924ca32a2c59233386a9/9ad975d336cfe315ab80b3c9b9f4b3af3bc08fe05f7e057265eb1eb1dcdfc48e/g Pipfile.lock
grep "45431b387587ed0fac6213b54d6e9f0936f0cc85238a8f5af7852fc9484c5c77" Pipfile.lock
sed -i s/45431b387587ed0fac6213b54d6e9f0936f0cc85238a8f5af7852fc9484c5c77/9ad975d336cfe315ab80b3c9b9f4b3af3bc08fe05f7e057265eb1eb1dcdfc48e/g Pipfile.lock
fi
6 changes: 2 additions & 4 deletions pyramid_openapi3/tests/test_permissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from pyramid.security import Allow
from pyramid.security import Authenticated
from pyramid.security import NO_PERMISSION_REQUIRED
from pyramid.session import UnencryptedCookieSessionFactoryConfig
from pyramid.session import SignedCookieSessionFactory
from webtest.app import TestApp

import pytest
Expand Down Expand Up @@ -35,9 +35,7 @@ def app(spec: str, permission: str) -> Router:

# Setup security
config.set_default_permission("view")
config.set_session_factory(
UnencryptedCookieSessionFactoryConfig("itsaseekreet")
)
config.set_session_factory(SignedCookieSessionFactory("itsaseekreet"))
config.set_authentication_policy(SessionAuthenticationPolicy())
config.set_authorization_policy(ACLAuthorizationPolicy())
config.set_root_factory(get_default_context)
Expand Down
Loading

0 comments on commit 91b97a2

Please sign in to comment.