From 90e02c5624c8ad7bbc523e2832d7f899edfc0a89 Mon Sep 17 00:00:00 2001 From: Xavier Bustamante Talavera Date: Mon, 29 Oct 2018 18:51:11 +0100 Subject: [PATCH] Simplify version and apache, bump to 0.2.0b1 --- ereuse_devicehub/__init__.py | 4 ---- examples/apache.conf | 4 ++-- setup.py | 7 +------ 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/ereuse_devicehub/__init__.py b/ereuse_devicehub/__init__.py index 1ca01080..e69de29b 100644 --- a/ereuse_devicehub/__init__.py +++ b/ereuse_devicehub/__init__.py @@ -1,4 +0,0 @@ -from distutils.version import StrictVersion - -__version__ = '0.2.0a13' -version = StrictVersion(__version__) diff --git a/examples/apache.conf b/examples/apache.conf index cd337c86..cfda5300 100644 --- a/examples/apache.conf +++ b/examples/apache.conf @@ -4,11 +4,11 @@ Define servername api.devicetag.io # The domain used to access the server -Define appdir /path/to/app/dir +Define appdir /home/devicetag/sites/${servername}/source/ # The path where the app directory is. Apache must have access to this folder. Define wsgipath ${appdir}/wsgi.wsgi # The location of the .wsgi file -Define pyvenv /path/to/venv +Define pyvenv ${appdir}/venv/ # The path where the virtual environment is (the folder containing bin/activate) diff --git a/setup.py b/setup.py index 59a58c1a..cc726397 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,3 @@ -import re from collections import OrderedDict from setuptools import find_packages, setup @@ -6,9 +5,6 @@ from setuptools import find_packages, setup 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) - test_requires = [ 'pytest', 'requests_mock' @@ -16,7 +12,7 @@ test_requires = [ setup( name='ereuse-devicehub', - version=version, + version='0.2.0b1', url='https://github.com/ereuse/devicehub-teal', project_urls=OrderedDict(( ('Documentation', 'http://devicheub.ereuse.org'), @@ -29,7 +25,6 @@ setup( 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',