From e0e058e943f0495a96a10c099f36cf5a3d1457e9 Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Sat, 27 Jan 2018 09:54:19 +0200 Subject: [PATCH] Update setup script and requirements list. --- dev_requirements.txt | 16 +++++++++------- requirements.txt | 13 ++----------- setup.py | 28 +++++++++++++++------------- 3 files changed, 26 insertions(+), 31 deletions(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index 92eaaa4b..1d976556 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,8 +1,10 @@ -r requirements.txt -ujson -emoji -pytest -pytest-asyncio -uvloop -aioredis -rethinkdb + +ujson>=1.35 +emoji>=0.4.5 +pytest>=3.3.0 +pytest-asyncio>=0.8.0 +uvloop>=0.9.1 +aioredis>=1.0.0 +wheel>=0.30.0 +rethinkdb>=2.3.0 diff --git a/requirements.txt b/requirements.txt index 66620d60..8a63284c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,2 @@ -aiohttp>=2.1.0 -appdirs>=1.4.3 -async-timeout>=1.2.1 -Babel>=2.4.0 -chardet>=3.0.3 -multidict>=2.1.6 -packaging>=16.8 -pyparsing>=2.2.0 -pytz>=2017.2 -six>=1.10.0 -yarl>=0.10.2 +aiohttp>=2.3.5 +Babel>=2.5.1 diff --git a/setup.py b/setup.py index 04da67d2..95377b79 100755 --- a/setup.py +++ b/setup.py @@ -2,9 +2,10 @@ from distutils.core import setup +from pip.req import parse_requirements from setuptools import PackageFinder -from aiogram import VERSION +from aiogram import Stage, VERSION def get_description(): @@ -14,7 +15,7 @@ def get_description(): :return: description :rtype: str """ - with open('README.rst', encoding='utf-8') as f: + with open('README.rst', 'r', encoding='utf-8') as f: return f.read() @@ -25,17 +26,16 @@ def get_requirements(): :return: requirements :rtype: list """ - requirements = [] - with open('requirements.txt', 'r') as file: - for line in file.readlines(): - line = line.strip() - if not line or line.startswith('#'): - continue - requirements.append(line) + filename = 'requirements.txt' + if VERSION.stage == Stage.DEV: + filename = 'dev_' + filename - return requirements + install_reqs = parse_requirements(filename, session='hack') + return [str(ir.req) for ir in install_reqs] +install_requires = get_requirements() + setup( name='aiogram', version=VERSION.version, @@ -48,11 +48,13 @@ setup( long_description=get_description(), classifiers=[ VERSION.pypi_development_status, # Automated change classifier by build stage - 'Programming Language :: Python :: 3.6', 'Environment :: Console', 'Framework :: AsyncIO', - 'Topic :: Software Development :: Libraries :: Application Frameworks', + 'Intended Audience :: Developers', + 'Intended Audience :: System Administrators', 'License :: OSI Approved :: MIT License', + 'Programming Language :: Python :: 3.6', + 'Topic :: Software Development :: Libraries :: Application Frameworks', ], - install_requires=get_requirements() + install_requires=install_requires )