瀏覽代碼

some changes in installation scripts

Dimitri Korsch 6 年之前
父節點
當前提交
36b57ac7b8
共有 4 個文件被更改,包括 21 次插入6 次删除
  1. 10 2
      cvdatasets/__init__.py
  2. 1 0
      cvdatasets/_version.py
  3. 1 1
      requirements.txt
  4. 9 3
      setup.py

+ 10 - 2
cvdatasets/__init__.py

@@ -1,5 +1,13 @@
 from .dataset import Dataset, ImageWrapperDataset
-from .annotations import *
+
+from .annotations import BaseAnnotations
+from .annotations import CUB_Annotations
+from .annotations import NAB_Annotations
+from .annotations import CARS_Annotations
+from .annotations import INAT19_Annotations
+from .annotations import FLOWERS_Annotations
+from .annotations import HED_Annotations
+from .annotations import AnnotationType
+
 from .utils import _MetaInfo
 
-__version__ = "0.4.0"

+ 1 - 0
cvdatasets/_version.py

@@ -0,0 +1 @@
+__version__ = "0.4.0"

+ 1 - 1
requirements.txt

@@ -4,4 +4,4 @@ pillow
 matplotlib
 pyyaml
 
-cvargparse~=0.5
+cvargparse~=0.1.5

+ 9 - 3
setup.py

@@ -11,12 +11,18 @@ try: # for pip >= 10
 except ImportError: # for pip <= 9.0.3
 	from pip.req import parse_requirements
 
-import cvdatasets
-install_requires = [line.strip() for line in open("requirements.txt").readlines()]
+here = os.path.abspath(os.path.dirname(__file__))
+# Get __version__ variable
+exec(open(os.path.join(here, 'cvdatasets', '_version.py')).read())
+
+install_requires = [
+	line.strip()
+		for line in open("requirements.txt").readlines()
+]
 
 setup(
 	name='cvdatasets',
-	version=cvdatasets.__version__,
+	version=__version__,
 	description='Wrapper (inofficial) for NA-Birds bataset (http://dl.allaboutbirds.org/nabirds)',
 	author='Dimitri Korsch',
 	author_email='korschdima@gmail.com',