Fix build

Author: rogerdahl

README.md

@@ -363,14 +363,13 @@ Building the release packages from a fresh clone is a simple way of ensuring tha
 Create a Python venv to use for build and deploy:
 
 * The package `setup.py` scripts will run in this venv.
-* The venv can be reused indefinitly.
+* The venv can be reused indefinitely.
 
     $ pyenv virtualenv "x.y.z" venv_build
 
 * Where "x.y.z" is one of the versions listed in `pyenv versions`.
 * Pick a version that is close or the same as the version of Python used for testing on Travis.
 
-
 Build and publish the packages:
 
 * Download current master from GitHub, create binary wheel packages and push the packages to PyPI.

client_cli/src/d1_cli/version.py

@@ -16,4 +16,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.4.6"
+__version__ = '3.4.7'

client_cli/src/setup.py

@@ -26,7 +26,7 @@
 def main():
     setuptools.setup(
         name="dataone.cli",
-        version="3.4.6",
+        version='3.4.7',
         description="Command-Line Interface (CLI) for DataONE",
         author="DataONE Project",
         author_email="[email protected]",
@@ -35,8 +35,8 @@ def main():
         packages=setuptools.find_packages(),
         include_package_data=True,
         install_requires=[
-            "dataone.common >= 3.4.6",
-            "dataone.libclient >= 3.4.6",
+            "dataone.common >= 3.4.7",
+            "dataone.libclient >= 3.4.7",
             #
             "requests >= 2.22.0",
         ],

client_onedrive/src/setup.py

@@ -27,7 +27,7 @@
 def main():
     setuptools.setup(
         name="dataone.onedrive",
-        version="3.4.6",
+        version='3.4.7',
         description="Filesystem access to the DataONE Workspace",
         author="DataONE Project",
         author_email="[email protected]",
@@ -36,8 +36,8 @@ def main():
         packages=setuptools.find_packages(),
         include_package_data=True,
         install_requires=[
-            "dataone.common >= 3.4.6",
-            "dataone.libclient >= 3.4.6",
+            "dataone.common >= 3.4.7",
+            "dataone.libclient >= 3.4.7",
             #
             "fusepy >= 3.0.1",
             "pyxb >= 1.2.6",

dev_tools/src/d1_dev/setup-all.py

@@ -29,8 +29,6 @@
 import subprocess
 import sys
 
-import d1_common.utils.ulog
-
 try:
     import d1_dev.util
 except ImportError:
@@ -52,10 +50,8 @@
     # 'csw',
 ]
 
-
 log = logging.getLogger(__name__)
-d1_common.utils.ulog.setup(is_debug=True)
-
+logging.basicConfig(level=logging.DEBUG)
 
 def main():
     if sys.version_info[0] != 3:

dev_tools/src/setup.py

@@ -26,7 +26,7 @@
 def main():
     setuptools.setup(
         name="dataone.dev",
-        version="3.4.6",
+        version='3.4.7',
         description="DataONE developer tools",
         author="DataONE Project",
         author_email="[email protected]",

gmn/src/d1_gmn/version.py

@@ -16,4 +16,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.4.6"
+__version__ = '3.4.7'

gmn/src/setup.py

@@ -28,7 +28,7 @@ def main():
     # noinspection PyUnresolvedReferences
     setuptools.setup(
         name="dataone.gmn",
-        version="3.4.6",
+        version='3.4.7',
         description="DataONE Generic Member Node (GMN)",
         author="DataONE Project",
         author_email="[email protected]",
@@ -37,10 +37,10 @@ def main():
         packages=setuptools.find_packages(),
         include_package_data=True,
         install_requires=[
-            "dataone.cli >= 3.4.6",
-            "dataone.common >= 3.4.6",
-            "dataone.libclient >= 3.4.6",
-            "dataone.scimeta >= 3.4.6",
+            "dataone.cli >= 3.4.7",
+            "dataone.common >= 3.4.7",
+            "dataone.libclient >= 3.4.7",
+            "dataone.scimeta >= 3.4.7",
             #
             "django >= 2.2.3",
             "iso8601 >= 0.1.12",

lib_client/src/d1_client/baseclient_1_1.py

@@ -101,19 +101,10 @@ def query(
         response = self.queryResponse(
             queryEngine, query_str, vendorSpecific, do_post, **kwargs
         )
-        try:
+        if self._content_type_is_json(response):
             return self._read_json_response(response)
-        except d1_common.types.exceptions.DataONEException:
-            pass
-        try:
-            return response.json()
-        except Exception:
-            pass
-        try:
-            return json.loads(response.text)
-        except Exception:
-            pass
-        return self._read_stream_response(response)
+        else:
+            return self._read_stream_response(response)
 
     def getQueryEngineDescriptionResponse(
         self, queryEngine, vendorSpecific=None, **kwargs

lib_client/src/setup.py

@@ -26,7 +26,7 @@
 def main():
     setuptools.setup(
         name="dataone.libclient",
-        version="3.4.6",
+        version='3.4.7',
         description="A DataONE client library for Python",
         author="DataONE Project",
         author_email="[email protected]",
@@ -35,7 +35,7 @@ def main():
         packages=setuptools.find_packages(),
         include_package_data=True,
         install_requires=[
-            "dataone.common >= 3.4.6",
+            "dataone.common >= 3.4.7",
             #
             "pyxb >= 1.2.6",
             "requests-toolbelt >= 0.9.1",