Python 3-related fixes, moving to pip fonts, fixing Astral errors.

[EVA-2020-02-2.git] / library / setup.py

diff --git a/library/setup.py b/library/setup.py
index 3fdea5ad67e255ac3cd57261e8d4db0cb18428fd..784db513528fe9ccdd1b1b866b98e62bc1e12e1c 100755 (executable)
--- a/library/setup.py
+++ b/library/setup.py
@@ -22,33 +22,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 """
 
 SOFTWARE.
 """
 

-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
-
-classifiers = ['Development Status :: 4 - Beta',
-               'Operating System :: POSIX :: Linux',
-               'License :: OSI Approved :: MIT License',
-               'Intended Audience :: Developers',
-               'Programming Language :: Python :: 2.6',
-               'Programming Language :: Python :: 2.7',
-               'Programming Language :: Python :: 3',
-               'Topic :: Software Development',
-               'Topic :: System :: Hardware']
+from setuptools import setup, __version__
+from pkg_resources import parse_version
+
+minimum_version = parse_version('30.4.0')
+
+if parse_version(__version__) < minimum_version:
+    raise RuntimeError("Package setuptools must be at least version {}".format(minimum_version))

 
 setup(
 
 setup(

-    name='envirophatplus',
-    version='0.0.1',
-    author='Philip Howard',
-    author_email='phil@pimoroni.com',
-    description="""Enviro pHAT Plus environmental monitoring add-on for Raspberry Pi""",
-    long_description=open('README.rst').read() + '\n' + open('CHANGELOG.txt').read(),
-    license='MIT',
-    keywords='Raspberry Pi',
-    url='http://www.pimoroni.com',
-    project_urls={'GitHub': 'https://www.github.com/pimoroni/envirophatplus-python'},
-    classifiers=classifiers,
-    packages=['envirophatplus'],
-    install_requires=['pms5003', 'ltr559', 'st7735']
+    packages=['enviroplus'],
+    install_requires=['setuptools>={}'.format(minimum_version), 'pimoroni-bme280', 'pms5003', 'ltr559', 'st7735', 'ads1015', 'fonts', 'font-roboto', 'astral', 'pytz']

 )
 )