Merge lp:~patrickas/ensoft-sextant/101_release into lp:ensoft-sextant

[Patrick Stevens]

1.0.1 release: move resources to resources/sextant, and update sextant.web.server to work with this change.

Ready for 1.0.1 release: move /resources to /resources/sextant; remove a few development-machine-specific lines of /bin/sextant; make sextant.web.server work with the new resources location.

[Patrick Stevens (patrickas)]

File permissions have changed *again*.

review: Needs Fixing

[lp:~patrickas/ensoft-sextant/101_release]

184. By Patrick Stevens <email address hidden> on 2014-08-18

Fix file permissions on src/sextant/web/server.py

[James (jamesh-f)]

Approve changes fix path problems for pip install

review: Approve

[Patrick Stevens (patrickas)]

Keep bin/sextant as it was - exporting an extra thing to the PythonPath isn't actually harmful, and it means we can continue to run Sextant from source.

[lp:~patrickas/ensoft-sextant/101_release]

185. By Patrick Stevens <email address hidden> on 2014-08-18

Restore bin/sextant changes

[Patrick Stevens (patrickas)]

review: Approve

=== added directory 'resources/sextant'
=== renamed directory 'resources/web' => 'resources/sextant/web'
=== modified file 'setup.py'
--- setup.py	2014-08-15 12:03:01 +0000
+++ setup.py	2014-08-18 14:19:39 +0000
@@ -11,7 +11,7 @@
 
 setup(
     name='Sextant',
-    version='1.0',
+    version='1.0.1',
     description= 'Navigating the C',
     url='http://open.ensoft.co.uk/Sextant',
     license='Simplified BSD License',
@@ -19,7 +19,7 @@
     package_dir={'sextant': 'src/sextant', 'resources': 'resources', 'etc': 'etc'},
     scripts=['bin/sextant'],
     install_requires=['neo4jrestclient', 'twisted'],
-    package_data={'resources': ['web/*'], 'etc': ['*.conf']},
+    package_data={'resources': ['sextant/web/*'], 'etc': ['*.conf']},
 )
 
 
 
=== modified file 'src/sextant/web/server.py'
--- src/sextant/web/server.py	2014-08-14 17:09:12 +0000
+++ src/sextant/web/server.py	2014-08-18 14:19:39 +0000
@@ -14,11 +14,7 @@
 from twisted.internet import defer
 
 import logging
-
 import os
-import sys  # hack to get the Sextant module imported
-sys.path.append(os.path.realpath('../..'))
-
 import json
 import requests
 
@@ -304,7 +300,7 @@
     # serve static directory at root
     root = File(os.path.join(
         os.path.dirname(os.path.abspath(__file__)),
-        "..", "..", "..", "resources", "web"))
+        "..", "..", "..", "resources", "sextant", "web"))
 
     # serve a dynamic Echoer webpage at /echoer.html
     root.putChild("echoer.html", Echoer())