diff --git a/MANIFEST.in b/MANIFEST.in --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,4 @@ include Makefile include requirements.txt +include requirements-swh.txt include version.txt diff --git a/requirements-swh.txt b/requirements-swh.txt new file mode 100644 --- /dev/null +++ b/requirements-swh.txt @@ -0,0 +1 @@ +swh.core diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt @@ -8,5 +8,4 @@ psycopg2 vcversioner -swh.core diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -3,13 +3,13 @@ def parse_requirements(): requirements = [] - with open('requirements.txt') as f: - for line in f.readlines(): - line = line.strip() - if not line or line.startswith('#'): - continue - requirements.append(line) - + for reqf in ('requirements.txt', 'requirements-swh.txt'): + with open(reqf) as f: + for line in f.readlines(): + line = line.strip() + if not line or line.startswith('#'): + continue + requirements.append(line) return requirements diff --git a/swh/scheduler/celery_backend/listener.py b/swh/scheduler/celery_backend/listener.py --- a/swh/scheduler/celery_backend/listener.py +++ b/swh/scheduler/celery_backend/listener.py @@ -172,6 +172,7 @@ recv.capture(limit=None, timeout=None, wakeup=True) + if __name__ == '__main__': main_backend = SchedulerBackend() event_monitor(main_app, main_backend) diff --git a/swh/scheduler/celery_backend/runner.py b/swh/scheduler/celery_backend/runner.py --- a/swh/scheduler/celery_backend/runner.py +++ b/swh/scheduler/celery_backend/runner.py @@ -49,6 +49,7 @@ backend.commit() + if __name__ == '__main__': for module in main_app.conf.CELERY_IMPORTS: __import__(module)