Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use saml2auth upstream #611

Merged
merged 9 commits into from
Oct 26, 2022
Merged

Use saml2auth upstream #611

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
41e1605
update: use upstream
nickumia-reisys Oct 24, 2022
5585eef
Merge branch 'main' into use-saml2auth-upstream
nickumia-reisys Oct 24, 2022
312b7ed
fix: does saml2auth need to be editable??
nickumia-reisys Oct 24, 2022
4d87cc5
Merge branch 'use-saml2auth-upstream' of github.com:GSA/catalog.data.…
nickumia-reisys Oct 24, 2022
45e1414
fix: try editable properly?
nickumia-reisys Oct 24, 2022
23cb860
Merge branch 'main' into use-saml2auth-upstream
jbrown-xentity Oct 24, 2022
5587eee
Merge branch 'main' into use-saml2auth-upstream
robert-bryson Oct 24, 2022
30e8750
Merge branch 'main' into use-saml2auth-upstream
nickumia-reisys Oct 25, 2022
fc1ccb4
revert: accidentally deleted spatial haha...
nickumia-reisys Oct 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ckan/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ ckan @ git+https://github.com/ckan/[email protected]
ckanext-dcat @ git+https://github.com/ckan/ckanext-dcat@master
-e git+https://github.com/ckan/ckanext-harvest.git@master#egg=ckanext-harvest
-e git+https://github.com/gsa/ckanext-spatial.git@datagov#egg=ckanext-spatial
# git+https://github.com/keitaroinc/ckanext-saml2auth.git@main#egg=ckanext-saml2auth
git+https://github.com/gsa/ckanext-saml2auth.git@main#egg=ckanext-saml2auth
git+https://github.com/keitaroinc/ckanext-saml2auth.git@main#egg=ckanext-saml2auth
-e git+https://github.com/ckan/ckanext-qa.git@master#egg=ckanext-qa
-e git+https://github.com/ckan/ckanext-archiver.git@master#egg=ckanext-archiver
-e git+https://github.com/ckan/ckanext-report.git@master#egg=ckanext-report
Expand Down
3 changes: 1 addition & 2 deletions ckan/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ ckanext-googleanalyticsbasic==0.2.0
-e git+https://github.com/ckan/ckanext-harvest.git@cb0a7034410f217b2274585cb61783582832c8d5#egg=ckanext_harvest
-e git+https://github.com/ckan/ckanext-qa.git@1731b59d2bf82b06f7866c204b26eb7c6c9ea1f9#egg=ckanext_qa
-e git+https://github.com/ckan/ckanext-report.git@24ade58d126d9480286c7bd1a904f20186d83988#egg=ckanext_report
ckanext-saml2auth @ git+https://github.com/gsa/ckanext-saml2auth.git@0493d1d7ad321760911bed8b189ecbf02099033d
-e git+https://github.com/gsa/ckanext-spatial.git@fbd3e2b3f67cc1038e4c7950731438b36da4d8b1#egg=ckanext_spatial
-e git+https://github.com/keitaroinc/ckanext-saml2auth.git@e00a4dd7206dbe8cbef6f7fae065dba9280e3fd5#egg=ckanext_saml2auth
ckantoolkit==0.0.7
click==7.1.2
cryptography==38.0.1
Expand Down