summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Jones <mat@matburt.net>2015-01-30 16:52:35 +0100
committerMatthew Jones <mat@matburt.net>2015-01-30 16:52:35 +0100
commitbd542bc336a79b700e56b23d4d6f0c638dfc55b6 (patch)
tree293a5e71399ab284b29e9440620928932a915cbe
parentUpgrade keyring to 4.1 (diff)
downloadawx-bd542bc336a79b700e56b23d4d6f0c638dfc55b6.tar.xz
awx-bd542bc336a79b700e56b23d4d6f0c638dfc55b6.zip
Update some of the dev requirements stuff
-rw-r--r--Makefile4
-rw-r--r--awx/main/management/commands/run_socketio_service.py2
-rw-r--r--requirements/dev_local.txt2
-rw-r--r--requirements/setuptools-12.0.5.tar.gzbin0 -> 626973 bytes
-rw-r--r--requirements/setuptools-2.2.tar.gzbin786831 -> 0 bytes
5 files changed, 5 insertions, 3 deletions
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
--- /dev/null
+++ b/requirements/setuptools-12.0.5.tar.gz
Binary files differ
diff --git a/requirements/setuptools-2.2.tar.gz b/requirements/setuptools-2.2.tar.gz
deleted file mode 100644
index 3ae2530d9e..0000000000
--- a/requirements/setuptools-2.2.tar.gz
+++ /dev/null
Binary files differ