From d4a7175c9ee1bc5ee0365f5ce3e14bf4c871a8a5 Mon Sep 17 00:00:00 2001 From: Pavlos Ratis Date: Sun, 8 Sep 2013 03:56:27 +0300 Subject: split requirements.txt to multiple files --- .travis.yml | 2 +- requirements.txt | 17 --------------- requirements/base.txt | 14 ++++++++++++ requirements/extras/mysql.txt | 1 + requirements/tests.txt | 4 ++++ setup.py | 50 ++++++++++++++++++++++--------------------- 6 files changed, 46 insertions(+), 42 deletions(-) delete mode 100644 requirements.txt create mode 100644 requirements/base.txt create mode 100644 requirements/extras/mysql.txt create mode 100644 requirements/tests.txt diff --git a/.travis.yml b/.travis.yml index 2be9be6..d377514 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ python: env: - DJANGO_VERSION=1.5 install: - - pip install -r requirements.txt coveralls flake8 --use-mirrors + - pip install -r requirements/base.txt -r requirements/tests.txt coveralls flake8 --use-mirrors branches: only: - master diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 067e449..0000000 --- a/requirements.txt +++ /dev/null @@ -1,17 +0,0 @@ -django>=1.5 -django-auth-ldap>=1.1.4 -django-compressor>=1.3 -django-discover-runner>=1.0 -django-otp>=0.1.7 -git+https://github.com/tampakrap/django-ldapdb@okupy#egg=django-ldapdb -mock>=1.0.1 -hg+https://bitbucket.org/psagers/mockldap#egg=mockldap -paramiko>=1.10.1 -passlib>=1.6.1 -pycrypto>=2.6 -pyopenssl>=0.13 -python-ldap>=2.4.10 -python-memcached>=1.53 -python-openid>=2.2.5 -pytz>=2012j -qrcode>=3.0 diff --git a/requirements/base.txt b/requirements/base.txt new file mode 100644 index 0000000..5861981 --- /dev/null +++ b/requirements/base.txt @@ -0,0 +1,14 @@ +django>=1.5 +django-auth-ldap>=1.1.4 +django-compressor>=1.3 +django-otp>=0.1.7 +git+https://github.com/tampakrap/django-ldapdb@okupy#egg=django-ldapdb +paramiko>=1.10.1 +passlib>=1.6.1 +pycrypto>=2.6 +pyopenssl>=0.13 +python-ldap>=2.4.10 +python-memcached>=1.53 +python-openid>=2.2.5 +pytz>=2012j +qrcode>=3.0 diff --git a/requirements/extras/mysql.txt b/requirements/extras/mysql.txt new file mode 100644 index 0000000..1765826 --- /dev/null +++ b/requirements/extras/mysql.txt @@ -0,0 +1 @@ +mysql-python>=1.2.3 diff --git a/requirements/tests.txt b/requirements/tests.txt new file mode 100644 index 0000000..92ef578 --- /dev/null +++ b/requirements/tests.txt @@ -0,0 +1,4 @@ +django-discover-runner>=1.0 +hg+https://bitbucket.org/psagers/mockldap#egg=mockldap +funcparserlib>=0.3.6 +mock>=1.0.1 diff --git a/setup.py b/setup.py index 306ee40..7d28f46 100755 --- a/setup.py +++ b/setup.py @@ -2,8 +2,30 @@ # vim:fileencoding=utf8:et:ts=4:sts=4:sw=4:ft=python from setuptools import setup, find_packages +import glob import okupy +import os +extra_deps = {} +files = glob.glob('requirements/extras/*') +for path in files: + extra_deps[os.path.basename(path).split('.')[0]] = open(path).read().split('\n')[0] + +with open('requirements/base.txt', 'r') as f: + base_deps = [] + for line in f: + if line.startswith('git+') or line.startswith('hg+'): + base_deps.append(line.split('#egg=')[1]) + else: + base_deps.append(line.split('\n')[0]) + +with open('requirements/tests.txt', 'r') as f: + test_deps = [] + for line in f: + if line.startswith('git+') or line.startswith('hg+'): + test_deps.append(line.split('#egg=')[1]) + else: + test_deps.append(line.split('\n')[0]) setup( name='okupy', version=okupy.__version__, @@ -29,35 +51,15 @@ setup( 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Software Development', ], + dependency_links=[ 'https://bitbucket.org/psagers/mockldap/get/default.tar.gz#egg=mockldap', 'https://github.com/tampakrap/django-ldapdb/archive/okupy.tar.gz#egg=django-ldapdb', ], - install_requires=[ - 'django>=1.5', - 'django-auth-ldap>=1.1.4', - 'django-compressor>=1.3', - 'django-ldapdb', - 'django-otp>=0.1.7', - 'paramiko>=1.10.1', - 'passlib>=1.6.1', - 'pycrypto>=2.6', - 'pyopenssl>=0.13', - 'python-ldap>=2.4.10', - 'python-memcached>=1.53', - 'python-openid>=2.2.5', - 'pytz>=2012j', - 'qrcode>=3.0', - ], + install_requires=base_deps, setup_requires=[ 'setuptools>=0.6c11', ], - tests_require=[ - 'django-discover-runner>=1.0', - 'mockldap', - 'mock>=1.0.1', - ], - extras_require={ - 'mysql': ['mysql-python>=1.2.3'], - }, + tests_require=test_deps, + extras_require=extra_deps, ) -- cgit v1.2.3-65-gdbad From 4f56218659d74cb04a2e7282ef867b3e89f58813 Mon Sep 17 00:00:00 2001 From: Pavlos Ratis Date: Sun, 8 Sep 2013 12:45:58 +0300 Subject: switch mockldap VCS url to PyPI package --- requirements/tests.txt | 3 +-- setup.py | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/requirements/tests.txt b/requirements/tests.txt index 92ef578..21556d6 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -1,4 +1,3 @@ django-discover-runner>=1.0 -hg+https://bitbucket.org/psagers/mockldap#egg=mockldap -funcparserlib>=0.3.6 mock>=1.0.1 +mockldap>=0.1 diff --git a/setup.py b/setup.py index 7d28f46..1b2174e 100755 --- a/setup.py +++ b/setup.py @@ -53,7 +53,6 @@ setup( ], dependency_links=[ - 'https://bitbucket.org/psagers/mockldap/get/default.tar.gz#egg=mockldap', 'https://github.com/tampakrap/django-ldapdb/archive/okupy.tar.gz#egg=django-ldapdb', ], install_requires=base_deps, -- cgit v1.2.3-65-gdbad From a71b0f90926c38b4dc10fa966d38a7f70a05a7dc Mon Sep 17 00:00:00 2001 From: Pavlos Ratis Date: Sun, 8 Sep 2013 12:46:13 +0300 Subject: add psycopg2 (PostgreSQL) as an extra dependency --- requirements/extras/postgres.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 requirements/extras/postgres.txt diff --git a/requirements/extras/postgres.txt b/requirements/extras/postgres.txt new file mode 100644 index 0000000..7f762a0 --- /dev/null +++ b/requirements/extras/postgres.txt @@ -0,0 +1 @@ +psycopg2>=2.5.1 -- cgit v1.2.3-65-gdbad From 0fc07e1a784903efd0a4cb87469a55ea87e8e0e7 Mon Sep 17 00:00:00 2001 From: Pavlos Ratis Date: Sun, 8 Sep 2013 13:04:01 +0300 Subject: use oneliner to parse test dependencies --- setup.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/setup.py b/setup.py index 1b2174e..5ccf736 100755 --- a/setup.py +++ b/setup.py @@ -19,13 +19,6 @@ with open('requirements/base.txt', 'r') as f: else: base_deps.append(line.split('\n')[0]) -with open('requirements/tests.txt', 'r') as f: - test_deps = [] - for line in f: - if line.startswith('git+') or line.startswith('hg+'): - test_deps.append(line.split('#egg=')[1]) - else: - test_deps.append(line.split('\n')[0]) setup( name='okupy', version=okupy.__version__, @@ -59,6 +52,6 @@ setup( setup_requires=[ 'setuptools>=0.6c11', ], - tests_require=test_deps, + tests_require=open('requirements/tests.txt').read().split(), extras_require=extra_deps, ) -- cgit v1.2.3-65-gdbad