From 2b0f49e8bfc7ed3d71e99d4c73a9fdf19cb493c4 Mon Sep 17 00:00:00 2001 From: Marko Bocevski Date: Thu, 8 Oct 2020 09:10:01 +0200 Subject: [PATCH 1/2] Update html5lib and httpretty --- requirements-dev.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 512bb78..c3caf20 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,3 +1,3 @@ -r requirements.txt -httpretty==0.9.4 +httpretty==1.0.2 nose diff --git a/requirements.txt b/requirements.txt index 483fa21..c476caf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ argparse ckanserviceprovider==0.0.10 -html5lib==1.0.1 +html5lib==1.1 messytables==0.15.2 certifi requests[security]==2.24.0 From 37ace68b0eadcd66c99a0bc0d86eeb8ef2f34b51 Mon Sep 17 00:00:00 2001 From: Marko Bocevski Date: Thu, 8 Oct 2020 09:23:12 +0200 Subject: [PATCH 2/2] Document removal of ftp support due to switching to requests --- datapusher/jobs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datapusher/jobs.py b/datapusher/jobs.py index 3f6c309..2f7a555 100644 --- a/datapusher/jobs.py +++ b/datapusher/jobs.py @@ -348,9 +348,9 @@ def push_to_datastore(task_id, input, dry_run=False): # check scheme url = resource.get('url') scheme = urlsplit(url).scheme - if scheme not in ('http', 'https', 'ftp'): + if scheme not in ('http', 'https'): raise util.JobError( - 'Only http, https, and ftp resources may be fetched.' + 'Only http and https resources may be fetched.' ) # fetch the resource data