changes from fuhu's fork

GSA · Dec 16, 2024 · 6cdd387 · 6cdd387
1 parent b2c6cfc
commit 6cdd387
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,6 +7,7 @@ on:
       - 'v*'
   pull_request:
     branches: main
+  workflow_dispatch:
 
 jobs:
   code_quality:
@@ -17,7 +18,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.8'
+          python-version: '3.10'
 
       - name: Install flake8
         run: |
@@ -33,8 +34,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ '3.7', '3.8', '3.9']
-        ckan-version: ["2.9", "2.10"]
+        python-version: ['3.10']
+        ckan-version: ["2.10", "2.11"]
     name: Python ${{ matrix.python-version }} extension test
 
     services:

diff --git a/ckanext/saml2auth/tests/responses/unsigned0.xml b/ckanext/saml2auth/tests/responses/unsigned0.xml
@@ -17,17 +17,17 @@
       <saml:NameID SPNameQualifier="{{ entity_id }}" Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient">_ce3d2948b4cf20146dee0a0b3dd6f69b6cf86f62d7</saml:NameID>
       <saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer">
         <saml:SubjectConfirmationData 
-          NotOnOrAfter="2024-01-18T06:21:48Z" 
+          NotOnOrAfter="2034-01-18T06:21:48Z" 
           Recipient="{{ recipient }}" 
           InResponseTo="ONELOGIN_4fee3b046395c4e751011e97f8900b5273d56685"/>
       </saml:SubjectConfirmation>
     </saml:Subject>
-    <saml:Conditions NotBefore="2021-01-08T01:01:18Z" NotOnOrAfter="2031-01-18T06:21:48Z">
+    <saml:Conditions NotBefore="2021-01-08T01:01:18Z" NotOnOrAfter="2041-01-18T06:21:48Z">
       <saml:AudienceRestriction>
         <saml:Audience>{{ entity_id }}</saml:Audience>
       </saml:AudienceRestriction>
     </saml:Conditions>
-    <saml:AuthnStatement AuthnInstant="{{ issue_instant }}" SessionNotOnOrAfter="2031-01-18T09:01:48Z" SessionIndex="_be9967abd904ddcae3c0eb4189adbe3f71e327cf93">
+    <saml:AuthnStatement AuthnInstant="{{ issue_instant }}" SessionNotOnOrAfter="2041-01-18T09:01:48Z" SessionIndex="_be9967abd904ddcae3c0eb4189adbe3f71e327cf93">
       <saml:AuthnContext>
         <saml:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:Password</saml:AuthnContextClassRef>
       </saml:AuthnContext>

diff --git a/ckanext/saml2auth/tests/test_helpers.py b/ckanext/saml2auth/tests/test_helpers.py
@@ -30,7 +30,7 @@
 def test_generate_password():
     password = h.generate_password()
     assert len(password) == 8
-    assert type(password) == str
+    assert isinstance(password, str), "Password must be a string"
 
 
 def test_default_login_disabled_by_default():

diff --git a/setup.py b/setup.py
@@ -41,8 +41,7 @@
     long_description_content_type='text/markdown',
 
     # The project's main homepage.
-    url='https://github.com/keitaroinc/'\
-            'ckanext-saml2auth',
+    url='https://github.com/keitaroinc/ckanext-saml2auth',
 
     # Author details
     author='''Keitaro Inc''',