Merge pull request #19 from kwilcox/master

SSL fix and 1.5.0
ioos · Jul 21, 2016 · 45e038a · 45e038a
2 parents 8dfc254 + ced343b
commit 45e038a
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 thredds_crawler
 ===============
 
-![Travis Build Status](https://travis-ci.org/asascience-open/thredds_crawler.svg)
+[![Build Status](https://travis-ci.org/asascience-open/thredds_crawler.svg?branch=master)](https://travis-ci.org/asascience-open/thredds_crawler)
 
 A simple crawler/parser for THREDDS catalogs
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.4.0
+1.5.0
diff --git a/tests/test_crawler.py b/tests/test_crawler.py
@@ -67,3 +67,7 @@ def test_modified_time(self):
         bf = datetime(2016, 2, 1, 0, 0)
         c = Crawl("http://tds.maracoos.org/thredds/catalog/MODIS-Chesapeake-Salinity/raw/2016/catalog.xml", before=bf, after=af, debug=True)
         assert len(c.datasets) == 11
+
+    def test_ssl(self):
+        c = Crawl("https://opendap.co-ops.nos.noaa.gov/thredds/catalog/NOAA/DBOFS/MODELS/201501/catalog.xml", debug=True)
+        assert len(c.datasets) > 0
diff --git a/thredds_crawler/__init__.py b/thredds_crawler/__init__.py
@@ -1 +1 @@
-__version__ = '1.4.0'
+__version__ = '1.5.0'
diff --git a/thredds_crawler/crawl.py b/thredds_crawler/crawl.py
@@ -15,7 +15,6 @@
 from dateutil.parser import parse
 import multiprocessing as mp
 
-
 INV_NS = "http://www.unidata.ucar.edu/namespaces/thredds/InvCatalog/v1.0"
 XLINK_NS = "http://www.w3.org/1999/xlink"
 
@@ -38,7 +37,7 @@ def request_xml(url):
     :param str url: URL for the resource to load as an XML
     '''
     try:
-        r = requests.get(url)
+        r = requests.get(url, verify=False)
         return r.text.encode('utf-8')
     except BaseException:
         logger.error("Skipping %s (error parsing the XML)" % url)
@@ -240,7 +239,7 @@ def __init__(self, dataset_url):
         self.data_size   = None
 
         # Get an etree object
-        r = requests.get(dataset_url)
+        r = requests.get(dataset_url, verify=False)
         try:
             tree = etree.XML(r.text.encode('utf-8'))
         except etree.XMLSyntaxError:

diff --git a/thredds_crawler/etree.py b/thredds_crawler/etree.py
@@ -17,4 +17,4 @@
                     # normal ElementTree install
                     import elementtree.ElementTree as etree
                 except ImportError:
-                    raise RuntimeError('You need either lxml or ElementTree')
+                    raise RuntimeError('You need either lxml or ElementTree')