From d85521505976d0a9f177d5f535e79ba840801c6d Mon Sep 17 00:00:00 2001 From: DailyDreaming Date: Tue, 5 Nov 2019 09:28:11 -0800 Subject: [PATCH 1/2] Reposition import. --- hca/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hca/config.py b/hca/config.py index 5fd90844..8460bdb1 100644 --- a/hca/config.py +++ b/hca/config.py @@ -2,7 +2,6 @@ import logging import os -import tqdm from tweak import Config as _Config @@ -37,6 +36,7 @@ class ProgressBarStreamHandler(object): """ @staticmethod def write(msg): + import tqdm # imported here to avoid unnecessary dependency breaks tqdm.tqdm.write(msg, end='') From 483d894bb31f4f5f659cbb930af64d3a709130f4 Mon Sep 17 00:00:00 2001 From: DailyDreaming Date: Tue, 5 Nov 2019 09:58:33 -0800 Subject: [PATCH 2/2] Hard-code version. --- hca/config.py | 2 +- setup.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hca/config.py b/hca/config.py index 8460bdb1..5fd90844 100644 --- a/hca/config.py +++ b/hca/config.py @@ -2,6 +2,7 @@ import logging import os +import tqdm from tweak import Config as _Config @@ -36,7 +37,6 @@ class ProgressBarStreamHandler(object): """ @staticmethod def write(msg): - import tqdm # imported here to avoid unnecessary dependency breaks tqdm.tqdm.write(msg, end='') diff --git a/setup.py b/setup.py index 266f3189..8d78f4bf 100755 --- a/setup.py +++ b/setup.py @@ -2,13 +2,12 @@ import os from setuptools import setup, find_packages -from hca.version import __version__ install_requires = [line.rstrip() for line in open(os.path.join(os.path.dirname(__file__), "requirements.txt"))] setup( name="hca", - version=__version__, + version='6.6.0dev', url='https://github.com/HumanCellAtlas/dcp-cli', license='Apache Software License', author='Human Cell Atlas contributors',