8000 Fix build · DataONEorg/d1_python@077c145 · GitHub
[go: up one dir, main page]
Skip to content

Commit 077c145

Browse files
rogerdahlrogerdahl
committed
Fix build
1 parent a49a543 commit 077c145

File tree

19 files changed

+85
-93
lines changed

19 files changed

+85
-93
lines changed

‎README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,14 +363,13 @@ Building the release packages from a fresh clone is a simple way of ensuring tha
363363
Create a Python venv to use for build and deploy:
364364

365365
* The package `setup.py` scripts will run in this venv.
366-
* The venv can be reused indefinitly.
366+
* The venv can be reused indefinitely.
367367

368368
$ pyenv virtualenv "x.y.z" venv_build
369369

370370
* Where "x.y.z" is one of the versions listed in `pyenv versions`.
371371
* Pick a version that is close or the same as the version of Python used for testing on Travis.
372372

373-
374373
Build and publish the packages:
375374

376375
* Download current master from GitHub, create binary wheel packages and push the packages to PyPI.

‎client_cli/src/d1_cli/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
# See the License for the specific language governing permissions and
1717
# limitations under the License.
1818

19-
__version__ = "3.4.6"
19+
__version__ = '3.4.7'

‎client_cli/src/setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
def main():
2727
setuptools.setup(
2828
name="dataone.cli",
29-
version="3.4.6",
29+
version='3.4.7',
3030
description="Command-Line Interface (CLI) for DataONE",
3131
author="DataONE Project",
3232
author_email="developers@dataone.org",
@@ -35,8 +35,8 @@ def main():
3535
packages=setuptools.find_packages(),
3636
include_package_data=True,
3737
install_requires=[
38-
"dataone.common >= 3.4.6",
39-
"dataone.libclient >= 3.4.6",
38+
"dataone.common >= 3.4.7",
39+
"dataone.libclient >= 3.4.7",
4040
#
4141
"requests >= 2.22.0",
4242< 10000 code class="diff-text syntax-highlighted-line">
],

‎client_onedrive/src/setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
def main():
2828
setuptools.setup(
2929
name="dataone.onedrive",
30-
version="3.4.6",
30+
version='3.4.7',
3131
description="Filesystem access to the DataONE Workspace",
3232
author="DataONE Project",
3333
author_email="developers@dataone.org",
@@ -36,8 +36,8 @@ def main():
3636
packages=setuptools.find_packages(),
3737
include_package_data=True,
3838
install_requires=[
39-
"dataone.common >= 3.4.6",
40-
"dataone.libclient >= 3.4.6",
39+
"dataone.common >= 3.4.7",
40+
"dataone.libclient >= 3.4.7",
4141
#
4242
"fusepy >= 3.0.1",
4343
"pyxb >= 1.2.6",

‎dev_tools/src/d1_dev/setup-all.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
import subprocess
3030
import sys
3131

32-
import d1_common.utils.ulog
33-
3432
try:
3533
import d1_dev.util
3634
except ImportError:
@@ -52,10 +50,8 @@
5250
# 'csw',
5351
]
5452

55-
5653
log = logging.getLogger(__name__)
57-
d1_common.utils.ulog.setup(is_debug=True)
58-
54+
logging.basicConfig(level=logging.DEBUG)
5955

6056
def main():
6157
if sys.version_info[0] != 3:

‎dev_tools/src/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
def main():
2727
setuptools.setup(
2828
name="dataone.dev",
29-
version="3.4.6",
29+
version='3.4.7',
3030
description="DataONE developer tools",
3131
author="DataONE Project",
3232
author_email="developers@dataone.org",

‎gmn/src/d1_gmn/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
# See the License for the specific language governing permissions and
1717
# limitations under the License.
1818

19-
__version__ = "3.4.6"
19+
__version__ = '3.4.7'

‎gmn/src/setup.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def main():
2828
# noinspection PyUnresolvedReferences
2929
setuptools.setup(
3030
name="dataone.gmn",
31-
version="3.4.6",
31+
version='3.4.7',
3232
description="DataONE Generic Member Node (GMN)",
3333
author="DataONE Project",
3434
author_email="developers@dataone.org",
@@ -37,10 +37,10 @@ def main():
3737
packages=setuptools.find_packages(),
3838
include_package_data=True,
3939
install_requires=[
40-
"dataone.cli >= 3.4.6",
41-
"dataone.common >= 3.4.6",
42-
"dataone.libclient >= 3.4.6",
43-
"dataone.scimeta >= 3.4.6",
40+
"dataone.cli >= 3.4.7",
41+
"dataone.common >= 3.4.7",
42+
"dataone.libclient >= 3.4.7",
43+
"dataone.scimeta >= 3.4.7",
4444
#
4545
"django >= 2.2.3",
4646
"iso8601 >= 0.1.12",

‎lib_client/src/d1_client/baseclient_1_1.py

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,19 +101,10 @@ def query(
101101
response = self.queryResponse(
102102
queryEngine, query_str, vendorSpecific, do_post, **kwargs
103103
)
104-
try:
104+
if self._content_type_is_json(response):
105105
return self._read_json_response(response)
106-
except d1_common.types.exceptions.DataONEException:
107-
pass
108-
try:
109-
return response.json()
110-
except Exception:
111-
pass
112-
try:
113-
return json.loads(response.text)
114-
except Exception:
115-
pass
116-
return self._read_stream_response(response)
106+
else:
107+
return self._read_stream_response(response)
117108

118109
def getQueryEngineDescriptionResponse(
119110
self, queryEngine, vendorSpecific=None, **kwargs

‎lib_client/src/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
def main():
2727
setuptools.setup(
2828
name="dataone.libclient",
29-
version="3.4.6",
29+
version='3.4.7',
3030
description="A DataONE client library for Python",
3131
author="DataONE Project",
3232
author_email="developers@dataone.org",
@@ -35,7 +35,7 @@ def main():
3535
packages=setuptools.find_packages(),
3636
include_package_data=True,
3737
install_requires=[
38-
"dataone.common >= 3.4.6",
38+
"dataone.common >= 3.4.7",
3939
#
4040
"pyxb >= 1.2.6",
4141
"requests-toolbelt >= 0.9.1",

0 commit comments

Comments
 (0)
0