Просмотр исходного кода

using pathlib instead of strings and "path.join". new version

Dimitri Korsch 5 лет назад
Родитель
Сommit
1f1476eb30
4 измененных файлов с 11 добавлено и 12 удалено
  1. 2 1
      Makefile
  2. 1 1
      cvdatasets/_version.py
  3. 1 1
      scripts/info_files/info.yml
  4. 7 9
      setup.py

+ 2 - 1
Makefile

@@ -11,7 +11,8 @@ test_deploy:
 	python setup.py sdist upload -r pypitest
 
 get_version:
-	@python -c "import nabirds; print('v{}'.format(nabirds.__version__))"
+	@printf "v"
+	@python setup.py --version
 
 run_tests:
 	@bash scripts/tests.sh .

+ 1 - 1
cvdatasets/_version.py

@@ -1 +1 @@
-__version__ = "0.5.0"
+__version__ = "0.5.1"

+ 1 - 1
scripts/info_files/info.yml

@@ -1,4 +1,4 @@
-BASE_DIR: /home/korsch1/korsch/
+BASE_DIR: /home/korsch_data/
 
 DATA_DIR: datasets
 MODEL_DIR: models

+ 7 - 9
setup.py

@@ -1,8 +1,5 @@
 #!/usr/bin/env python
-
-import os
-import pkg_resources
-import sys
+from pathlib import Path
 
 from setuptools import setup, find_packages
 
@@ -10,20 +7,21 @@ try: # for pip >= 10
 	from pip._internal.req import parse_requirements
 except ImportError: # for pip <= 9.0.3
 	from pip.req import parse_requirements
+pkg_name = "cvdatasets"
 
-here = os.path.abspath(os.path.dirname(__file__))
+cwd = Path(__file__).parent.resolve()
 # Get __version__ variable
-exec(open(os.path.join(here, 'cvdatasets', '_version.py')).read())
+exec(open(cwd / pkg_name / '_version.py').read())
 
 install_requires = [
 	line.strip()
-		for line in open("requirements.txt").readlines()
+		for line in open(cwd / "requirements.txt").readlines()
 ]
 
 setup(
-	name='cvdatasets',
+	name=pkg_name,
 	version=__version__,
-	description='Wrapper (inofficial) for NA-Birds bataset (http://dl.allaboutbirds.org/nabirds)',
+	description='Wrapper for various computer vision datasets (especially fine-grained)',
 	author='Dimitri Korsch',
 	author_email='korschdima@gmail.com',
 	license='MIT License',