diff --git a/Makefile b/Makefile index 807f0ba732..0bc3af431d 100644 --- a/Makefile +++ b/Makefile @@ -110,7 +110,7 @@ push: # locally downloaded packages). requirements: @if [ "$(VIRTUAL_ENV)" ]; then \ - (cd requirements && pip install --no-index setuptools-2.2.tar.gz); \ + (cd requirements && pip install --no-index setuptools-12.0.5.tar.gz); \ (cd requirements && pip install --no-index Django-1.6.7.tar.gz); \ (cd requirements && pip install --no-index -r dev_local.txt); \ $(PYTHON) fix_virtualenv_setuptools.py; \ @@ -122,7 +122,7 @@ requirements: # (downloading from PyPI if necessary). requirements_pypi: @if [ "$(VIRTUAL_ENV)" ]; then \ - pip install setuptools==2.2; \ + pip install setuptools==12.0.5; \ pip install Django\>=1.6.7,\<1.7; \ pip install -r requirements/dev.txt; \ $(PYTHON) fix_virtualenv_setuptools.py; \ diff --git a/awx/main/management/commands/run_socketio_service.py b/awx/main/management/commands/run_socketio_service.py index 0788217a21..7fc892b46b 100644 --- a/awx/main/management/commands/run_socketio_service.py +++ b/awx/main/management/commands/run_socketio_service.py @@ -122,7 +122,9 @@ def notification_handler(server): 'type': 'event', } for session_id, socket in list(server.sockets.iteritems()): + print("Going to emit an event, here are our sessions: %s" % valid_sockets) if session_id in valid_sockets: + print("Sending to session: %s" % str(session_id)) socket.send_packet(packet) class Command(NoArgsCommand): diff --git a/requirements/dev_local.txt b/requirements/dev_local.txt index 315c1e3869..82968bc54d 100644 --- a/requirements/dev_local.txt +++ b/requirements/dev_local.txt @@ -2,7 +2,7 @@ # packages). Install using "pip --no-index -r dev_local.txt". # May need to install these packages separately the first time: -setuptools-2.2.tar.gz +setuptools-12.0.5.tar.gz distribute-0.7.3.zip Django-1.6.7.tar.gz diff --git a/requirements/setuptools-12.0.5.tar.gz b/requirements/setuptools-12.0.5.tar.gz new file mode 100644 index 0000000000..c70e2d7687 Binary files /dev/null and b/requirements/setuptools-12.0.5.tar.gz differ diff --git a/requirements/setuptools-2.2.tar.gz b/requirements/setuptools-2.2.tar.gz deleted file mode 100644 index 3ae2530d9e..0000000000 Binary files a/requirements/setuptools-2.2.tar.gz and /dev/null differ