Skip to content

Commit e92c11c

Browse files
authored
Merge pull request #131 from CHIMEFRB/refactor-pyproject
build(poetry): change deps from carat to gte
2 parents e72d820 + 9c90315 commit e92c11c

5 files changed

Lines changed: 1865 additions & 444 deletions

File tree

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
poetry config virtualenvs.in-project false
6464
poetry config cache-dir ~/.cache/pypoetry
6565
poetry config virtualenvs.path ~/.cache/pypoetry/venv
66-
poetry install
66+
poetry install --with dev
6767
6868
- name: Create NETRC file
6969
run: |

dtcli/utilities/cadcclient.py

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -239,20 +239,23 @@ def size(directory: str, namespace: str = "cadc:CHIMEFRB", timeout: int = 60) ->
239239
query = query.replace("//", "/")
240240
logger.info(f"Running query: {query}")
241241
buffer = StringIO()
242-
sys.stdout = buffer
243-
_, _, queryClient = _connect()
244-
queryClient.query( # type: ignore
245-
query=query,
246-
output_file=None,
247-
response_format="csv",
248-
tmptable=None,
249-
lang="ADQL",
250-
timeout=timeout,
251-
data_only=True,
252-
no_column_names=True,
253-
)
254-
content = buffer.getvalue()
255-
sys.stdout = sys.__stdout__
242+
original_stdout = sys.stdout
243+
try:
244+
sys.stdout = buffer
245+
_, _, queryClient = _connect()
246+
queryClient.query( # type: ignore
247+
query=query,
248+
output_file=None,
249+
response_format="csv",
250+
tmptable=None,
251+
lang="ADQL",
252+
timeout=timeout,
253+
data_only=True,
254+
no_column_names=True,
255+
)
256+
content = buffer.getvalue()
257+
finally:
258+
sys.stdout = original_stdout
256259
return float(content.split("\n")[0])
257260

258261

0 commit comments

Comments
 (0)