Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ CKAN_SMTP_MAIL_FROM=ckan@localhost
# Extensions
# TODO: Reenable pending https://github.com/GSA/data.gov/issues/3986
# qa archiver
CKAN__PLUGINS=tracking image_view text_view ckan_harvester datajson_validator datajson_harvest geodatagov datagovtheme datagov_harvest z3950_harvester arcgis_harvester geodatagov_geoportal_harvester waf_harvester_collection geodatagov_csw_harvester geodatagov_doc_harvester geodatagov_waf_harvester spatial_metadata spatial_query spatial_harvest_metadata_api dcat dcat_json_interface structured_data datagovcatalog envvars
CKAN__PLUGINS=tracking image_view text_view ckan_harvester datajson_validator datajson_harvest geodatagov datagovtheme datagov_harvest arcgis_harvester geodatagov_geoportal_harvester waf_harvester_collection geodatagov_csw_harvester geodatagov_doc_harvester geodatagov_waf_harvester spatial_metadata spatial_query spatial_harvest_metadata_api dcat dcat_json_interface structured_data datagovcatalog envvars

# Extensions that exist but are not used in dev:
# - ckanext-saml2
Expand Down
3 changes: 1 addition & 2 deletions ckan/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ckanext-datagovtheme==0.3.9
ckanext-datajson==0.1.28
ckanext-dcat @ git+https://github.com/ckan/ckanext-dcat@255fcf1352273f9be98e9f02a5198efc4790c94e
ckanext-envvars==0.0.6
ckanext-geodatagov==0.3.6
ckanext-geodatagov==0.3.7
-e git+https://github.com/GSA/ckanext-harvest.git@8da16a1f993f0fbf18f9fc810ab6ed7dfb7f871a#egg=ckanext_harvest
ckanext-metrics-dashboard==0.1.7
ckanext-saml2auth @ git+https://github.com/GSA/ckanext-saml2auth.git@99f35585c219a5cd39717b8c42cc54cdd959dfb4
Expand Down Expand Up @@ -66,7 +66,6 @@ passlib==1.7.4
pathspec==0.12.1
pika==1.2.1
pip==25.3
ply==3.11
polib==1.2.0
progressbar==2.5
psycopg2==2.9.9
Expand Down
2 changes: 1 addition & 1 deletion ckan/setup/ckan.ini
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ ckan.cors.origin_whitelist = https://data.gov https://www.data.gov
# same origin policy
# TODO: Re-enable pending https://github.com/GSA/data.gov/issues/3986
# qa archiver
ckan.plugins=tracking image_view text_view ckan_harvester datajson_validator datajson_harvest geodatagov datagovtheme datagov_harvest z3950_harvester arcgis_harvester geodatagov_geoportal_harvester waf_harvester_collection geodatagov_csw_harvester geodatagov_doc_harvester geodatagov_waf_harvester spatial_metadata spatial_query spatial_harvest_metadata_api dcat dcat_json_interface structured_data datagovcatalog saml2auth envvars
ckan.plugins=tracking image_view text_view ckan_harvester datajson_validator datajson_harvest geodatagov datagovtheme datagov_harvest arcgis_harvester geodatagov_geoportal_harvester waf_harvester_collection geodatagov_csw_harvester geodatagov_doc_harvester geodatagov_waf_harvester spatial_metadata spatial_query spatial_harvest_metadata_api dcat dcat_json_interface structured_data datagovcatalog saml2auth envvars

# Define which views should be created by default
# (plugins must be loaded in ckan.plugins)
Expand Down
6 changes: 3 additions & 3 deletions ckan/test-catalog-next.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use = config:test-core.ini

ckan.site_title = My Test CKAN Site
ckan.site_description = A test site for testing my CKAN extension
ckan.plugins = envvars image_view text_view datastore datagov_harvest ckan_harvester geodatagov datajson datajson_harvest z3950_harvester arcgis_harvester geodatagov_geoportal_harvester waf_harvester_collection geodatagov_csw_harvester geodatagov_doc_harvester geodatagov_waf_harvester spatial_metadata spatial_query report qa archiver datagovtheme datagovcatalog dcat dcat_json_interface structured_data
ckan.plugins = envvars image_view text_view datastore datagov_harvest ckan_harvester geodatagov datajson datajson_harvest arcgis_harvester geodatagov_geoportal_harvester waf_harvester_collection geodatagov_csw_harvester geodatagov_doc_harvester geodatagov_waf_harvester spatial_metadata spatial_query report qa archiver datagovtheme datagovcatalog dcat dcat_json_interface structured_data
ckan.harvest.mq.type = redis
ckan.tracking_enabled = true
# custom config for test extensions
Expand Down Expand Up @@ -69,13 +69,13 @@ handlers = console

[logger_ckan]
qualname = ckan
handlers =
handlers =
level = INFO

[logger_sqlalchemy]
handlers =
qualname = sqlalchemy.engine
level = WARN
level = WARN

[handler_console]
class = StreamHandler
Expand Down
1 change: 0 additions & 1 deletion e2e/cypress/integration/ckan_extensions.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ describe('CKAN Extensions', () => {
expect(installed_extensions).to.include('datagovtheme');
expect(installed_extensions).to.include('datagov_harvest');
expect(installed_extensions).to.include('geodatagov');
expect(installed_extensions).to.include('z3950_harvester');
expect(installed_extensions).to.include('arcgis_harvester');
expect(installed_extensions).to.include('geodatagov_geoportal_harvester');
expect(installed_extensions).to.include('waf_harvester_collection');
Expand Down