From 5029c1687332fe4c21331c840cf9ff58261f7706 Mon Sep 17 00:00:00 2001 From: Xavier Bustamante Talavera Date: Sat, 7 Jul 2018 18:51:15 +0200 Subject: [PATCH] Better installation; add example_app --- MANIFEST.in | 3 ++- ereuse_devicehub/__init__.py | 4 ++++ example_app.py | 10 ++++++++++ setup.py | 38 +++++++++++++++++++++++++++++------- 4 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 example_app.py diff --git a/MANIFEST.in b/MANIFEST.in index 0c3c1dec..ed58eac1 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1,2 @@ -recursive-include ereuse_devicehub/dummy/files *.yaml \ No newline at end of file +recursive-include ereuse_devicehub/dummy/files *.yaml +recursive-include ereuse_devicehub/ *.pyi \ No newline at end of file diff --git a/ereuse_devicehub/__init__.py b/ereuse_devicehub/__init__.py index e69de29b..157edf70 100644 --- a/ereuse_devicehub/__init__.py +++ b/ereuse_devicehub/__init__.py @@ -0,0 +1,4 @@ +from distutils.version import StrictVersion + +__version__ = '0.2.0a10' +version = StrictVersion(__version__) diff --git a/example_app.py b/example_app.py new file mode 100644 index 00000000..ffa2f5e5 --- /dev/null +++ b/example_app.py @@ -0,0 +1,10 @@ +from ereuse_devicehub.config import DevicehubConfig +from ereuse_devicehub.devicehub import Devicehub + + +class MyConfig(DevicehubConfig): + ORGANIZATION_NAME = 'My org' + ORGANIZATION_TAX_ID = 'foo-bar' + + +app = Devicehub(MyConfig()) diff --git a/setup.py b/setup.py index 0bb1fe74..543a321d 100644 --- a/setup.py +++ b/setup.py @@ -1,24 +1,37 @@ +import re +from collections import OrderedDict + from setuptools import find_packages, setup -with open('README.md') as f: +with open('README.md', encoding='utf8') as f: long_description = f.read() +with open('ereuse_devicehub/__init__.py', 'rt', encoding='utf8') as f: + version = re.search(r'__version__ = \'(.*?)\'', f.read()).group(1) + setup( name='ereuse-devicehub', - version='0.2.0a10', - packages=find_packages(), + version=version, url='https://github.com/ereuse/devicehub-teal', + project_urls=OrderedDict(( + ('Documentation', 'http://devicheub.ereuse.org'), + ('Code', 'http://github.com/ereuse/devicehub-teal'), + ('Issue tracker', 'https://tree.taiga.io/project/ereuseorg-devicehub/issues?q=rules') + )), license='Affero', author='eReuse.org team', author_email='x.bustamante@ereuse.org', - include_package_data=True, description='A system to manage devices focusing reuse.', + packages=find_packages(), + include_package_data=True, + platforms='any', + python_requires='>=3.5.3', long_description=long_description, long_description_content_type='text/markdown', install_requires=[ 'teal>=0.2.0a6', 'marshmallow_enum', - 'ereuse-utils[Naming]>=0.3.0b2', + 'ereuse-utils[Naming]>=0.4b1', 'psycopg2-binary', 'requests', 'requests-toolbelt', @@ -29,6 +42,14 @@ setup( 'PyYAML', 'python-stdnum' ], + extras_require={ + 'docs': [ + 'sphinx', + 'sphinxcontrib-httpdomain >= 1.5.0', + 'sphinxcontrib-plantuml >= 0.11', + 'sphinxcontrib-websupport >= 1.0.1' + ] + }, tests_requires=[ 'pytest', 'pytest-datadir', @@ -37,12 +58,15 @@ setup( classifiers=[ 'Development Status :: 2 - Pre-Alpha', 'Environment :: Web Environment', + 'Framework :: Flask', 'Intended Audience :: Developers', + 'License :: OSI Approved :: GNU Affero General Public License v3' 'Operating System :: OS Independent', 'Programming Language :: Python :: 3 :: Only', 'Programming Language :: Python :: 3.5', - 'Topic :: Internet :: WWW/HTTP :: HTTP Servers', + 'Programming Language :: Python :: 3.6', + 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', + 'Topic :: Internet :: WWW/HTTP :: WSGI :: Application', 'Topic :: Software Development :: Libraries :: Python Modules', - 'License :: OSI Approved :: GNU Affero General Public License v3' ] )