From 54d63ef351efe5d172b68b051fdb185593fdd075 Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Jan 21 2019 12:14:17 +0000 Subject: Get rid of __requires__ lines Signed-off-by: Aurélien Bompard --- diff --git a/alembic/update03_to_04.py b/alembic/update03_to_04.py index f271660..f13c583 100644 --- a/alembic/update03_to_04.py +++ b/alembic/update03_to_04.py @@ -34,10 +34,6 @@ file. ''' from __future__ import print_function -## These two lines are needed to run on EL6 -__requires__ = ['SQLAlchemy >= 0.7', 'jinja2 >= 2.4'] -import pkg_resources - import sys import os diff --git a/createdb.py b/createdb.py index 0dbaa7f..9422176 100644 --- a/createdb.py +++ b/createdb.py @@ -1,9 +1,5 @@ #!/usr/bin/python -## These two lines are needed to run on EL6 -__requires__ = ['SQLAlchemy >= 0.7', 'jinja2 >= 2.4'] -import pkg_resources - from fedocal import APP from fedocal.fedocallib import model diff --git a/fedocal.wsgi b/fedocal.wsgi index 790393f..063e254 100644 --- a/fedocal.wsgi +++ b/fedocal.wsgi @@ -1,12 +1,5 @@ #-*- coding: utf-8 -*- -# The three lines below are required to run on EL6 as EL6 has -# two possible version of python-sqlalchemy and python-jinja2 -# These lines make sure the application uses the correct version. -#import __main__ -#__main__.__requires__ = ['SQLAlchemy >= 0.7', 'jinja2 >= 2.4'] -#import pkg_resources - #import os ## Set the environment variable pointing to the configuration file #os.environ['FEDOCAL_CONFIG'] = '/etc/fedocal/fedocal.cfg' diff --git a/fedocal_cron.py b/fedocal_cron.py index 6560cf8..32f1421 100644 --- a/fedocal_cron.py +++ b/fedocal_cron.py @@ -28,11 +28,6 @@ each meeting that asked for it. """ -## These two lines are needed to run on EL6 -__requires__ = ['SQLAlchemy >= 0.7', 'jinja2 >= 2.4'] -import pkg_resources - - import smtplib import warnings diff --git a/runserver.py b/runserver.py index 9ae25ee..c95565f 100644 --- a/runserver.py +++ b/runserver.py @@ -1,9 +1,5 @@ #!/usr/bin/env python2 -# These two lines are needed to run on EL6 -__requires__ = ['SQLAlchemy >= 0.8', 'jinja2 >= 2.4'] -import pkg_resources - import argparse import sys import os diff --git a/tests/test_flask.py b/tests/test_flask.py index 264c9cb..9a70fb1 100644 --- a/tests/test_flask.py +++ b/tests/test_flask.py @@ -28,9 +28,6 @@ """ from __future__ import unicode_literals, absolute_import, print_function -__requires__ = ['SQLAlchemy >= 0.7', 'jinja2 >= 2.4'] -import pkg_resources - import logging import unittest import sys diff --git a/tox.ini b/tox.ini index 99109fb..e64f995 100644 --- a/tox.ini +++ b/tox.ini @@ -10,6 +10,7 @@ deps = nose-cov setenv = FEDOCAL_CONFIG={toxinidir}/tests/fedocal_test.cfg +passenv = HOME commands = nosetests --with-coverage --cover-erase --cover-package=fedocal {posargs}