Skip to content

Commit

Permalink
feat: add fjeltopp's frictionless and frictionless-geojson; remove ji…
Browse files Browse the repository at this point in the history
…nja constraint
  • Loading branch information
ChasNelson1990 committed Jul 12, 2023
1 parent dbe21f4 commit f62ab66
Show file tree
Hide file tree
Showing 6 changed files with 292 additions and 133 deletions.
4 changes: 3 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ python-dotenv = "==1.0.0"
python-jose = "==3.3.0"
setuptools = "==67.2.0"
raven = "==6.10.0"
frictionless = ">=5.13.1"
frictionless = {editable = true, ref = "jinja2_2_10_1", git = "https://github.com/fjelltopp/frictionless-py", extras=["ckan"]}
frictionless-geojson = {editable = true, ref = "v1.0.0", git = "https://github.com/fjelltopp/frictionless-geojson"}
jinja2 = "==2.10.1"
tableschema = "*"

[dev-packages]
Expand Down
404 changes: 281 additions & 123 deletions Pipfile.lock

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions ckan/adx_config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,12 @@ ckanext.authz_service.jwt_private_key = -----BEGIN RSA PRIVATE KEY-----
ckanext.authz_service.jwt_public_key_file = /etc/ckan/jwt_public_key.pem
ckanext.bulk_file_uploader_default_fields = {"restricted_allowed_orgs": "unaids"}

ckanext.validation.schema_directory = /usr/lib/adx/submodules/unaids_data_specifications/table_schemas
ckanext.validation.run_on_create_async = True
ckanext.validation.run_on_update_async = True
ckanext.validation.run_on_create_sync = False
ckanext.validation.run_on_update_sync = False
ckanext.validation.formats = csv xlsx xls shp geojson
ckanext.unaids.schema_directory = /usr/lib/adx/submodules/unaids_data_specifications/table_schemas
ckanext.validation.run_on_create_async = False
ckanext.validation.run_on_update_async = False
ckanext.validation.run_on_create_sync = True
ckanext.validation.run_on_update_sync = True
ckanext.validation.formats = csv xlsx xls geojson
ckanext.validation.default_validation_options = {"skip_errors": ["blank-row"]}

ckanext.unaids.auth0_domain =
Expand Down
1 change: 0 additions & 1 deletion ckan/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ fi
rm -rf /usr/lib/adx/submodules/ckan/ckan/pastertemplates/template/ckanext_+project_shortname+.egg-info
cd /usr/lib/adx/ || exit 1
pipenv sync --dev
pipenv run python -m pip install --no-warn-conflicts jinja2==2.11
echo "installed python packages"
pipenv run python -m pip freeze
echo "show current dir"
Expand Down
2 changes: 1 addition & 1 deletion submodules/ckanext-validation
2 changes: 1 addition & 1 deletion submodules/giftless
Submodule giftless updated from 7ee51c to 3a0576

0 comments on commit f62ab66

Please sign in to comment.