Skip to content

Commit faddcfb

Browse files
committed
adding prosper_version coverage to project
1 parent be7a0b1 commit faddcfb

3 files changed

Lines changed: 66 additions & 12 deletions

File tree

publicAPI/__init__.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
"""__init__.py: Flask app configuration"""
22
from os import path
3+
import warnings
34

4-
from flask import Flask
5+
try:
6+
from flask import Flask
57

6-
import publicAPI.crest_endpoint as crest_endpoint
7-
import publicAPI.config as config
8-
import publicAPI.split_utils as split_utils
8+
import publicAPI.crest_endpoint as crest_endpoint
9+
import publicAPI.config as config
10+
import publicAPI.split_utils as split_utils
911

10-
import prosper.common.prosper_logging as p_logging
12+
import prosper.common.prosper_logging as p_logging
13+
except ImportError:
14+
warnings.warn('pre-install mode -- requirements not installed', UserWarning)
1115

1216
HERE = path.abspath(path.dirname(__file__))
1317

publicAPI/_version.py

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
"""_version.py: track package version information"""
2+
from os import path
3+
import warnings
4+
5+
INSTALLED = True
6+
try: #pragma: no cover
7+
import prosper.common.prosper_version as p_version
8+
except ImportError:
9+
INSTALLED = False
10+
11+
HERE = path.abspath(path.dirname(__file__))
12+
13+
def get_version():
14+
"""find current version information
15+
16+
Returns:
17+
(str): version information
18+
19+
"""
20+
if not INSTALLED:
21+
warnings.warn(
22+
'Unable to resolve package version until installed',
23+
UserWarning
24+
)
25+
return '0.0.0' #can't parse version without stuff installed
26+
27+
return p_version.get_version(HERE)
28+
29+
__version__ = get_version()

setup.py

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,31 @@
11
"""Setup.py for ProsperAPI Flask project"""
2-
2+
from codecs import open
3+
import importlib
34
from os import path, listdir
5+
46
from setuptools import setup, find_packages
57
from setuptools.command.test import test as TestCommand
6-
from codecs import open
78

89
HERE = path.abspath(path.dirname(__file__))
9-
__version__ = '1.2.1'
10+
__package_name__ = 'ProsperAPI'
11+
__app_name__ = 'publicAPI'
12+
13+
def get_version(package_name):
14+
"""find __version__ for making package
15+
16+
Args:
17+
package_path (str): path to _version.py folder (abspath > relpath)
18+
19+
Returns:
20+
(str) __version__ value
21+
22+
"""
23+
module = package_name + '._version'
24+
package = importlib.import_module(module)
25+
26+
version = package.__version__
27+
28+
return version
1029

1130
def hack_find_packages(include_str):
1231
"""patches setuptools.find_packages issue
@@ -75,15 +94,17 @@ def run_tests(self):
7594
exit(errno)
7695

7796
with open('README.rst', 'r', 'utf-8') as f:
78-
readme = f.read()
97+
README = f.read()
7998

8099
setup(
81-
name='ProsperAPI',
100+
name=__package_name__,
101+
description='REST API for exposing Prosper data',
102+
long_description=README,
82103
author='John Purcell',
83104
author_email='prospermarketshow@gmail.com',
84105
url='https://github.com/EVEprosper/ProsperAPI',
85-
download_url='https://github.com/EVEprosper/ProsperAPI/tarball/v' + __version__,
86-
version=__version__,
106+
download_url='https://github.com/EVEprosper/' + __package_name__ + '/tarball/v' + get_version(__app_name__),
107+
version=get_version(__app_name__),
87108
license='MIT',
88109
classifiers=[
89110
'Programming Language :: Python :: 3.5'

0 commit comments

Comments
 (0)