Sextant

Merge lp:~jamesh-f/ensoft-sextant/ensoft-sextant into lp:ensoft-sextant

  1. ensoft-sextant
  2. Merge into whiteline
Proposed by James
Status: Merged
Merged at revision: 3
Proposed branch: lp:~jamesh-f/ensoft-sextant/ensoft-sextant
Merge into: lp:ensoft-sextant
Diff against target: 38 lines (+2/-6)
3 files modified
bin/sextant (+0/-4)
setup.py (+1/-1)
src/sextant/web/server.py (+1/-1)
To merge this branch: bzr merge lp:~jamesh-f/ensoft-sextant/ensoft-sextant
Reviewer Review Type Date Requested Status
Ensoft Open Source Pending
Review via email: mp+230996@code.launchpad.net

Commit message

version 1.0.1

Description of the change

version 1.0.1 fixed web server so it looks in the right place for http and js files

To post a comment you must log in.
lp:~jamesh-f/ensoft-sextant/ensoft-sextant updated
182. By Robert Wills <email address hidden>

Move resources to resources/sextant/

183. By Robert Wills <email address hidden>

Remove the path munging hack in sextant.web.server

184. By Patrick Stevens <email address hidden>

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

185. By James Harkin <email address hidden>

fixed Neo4j connection traceback when neo4j isn't running

186. By James Harkin <email address hidden>

sanitise message for connection to web server

187. By James Harkin <email address hidden>

node size fixed

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/sextant'
2--- bin/sextant 2014-07-25 09:39:33 +0000
3+++ bin/sextant 2014-08-15 16:13:24 +0000
4@@ -1,8 +1,4 @@
5 #!/bin/bash
6
7-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
8-
9-export PYTHONPATH=${PYTHONPATH}:${DIR}/../src
10-
11 python -m sextant $@
12
13
14=== modified file 'setup.py'
15--- setup.py 2014-08-15 12:03:01 +0000
16+++ setup.py 2014-08-15 16:13:24 +0000
17@@ -11,7 +11,7 @@
18
19 setup(
20 name='Sextant',
21- version='1.0',
22+ version='1.0.1',
23 description= 'Navigating the C',
24 url='http://open.ensoft.co.uk/Sextant',
25 license='Simplified BSD License',
26
27=== modified file 'src/sextant/web/server.py' (properties changed: -x to +x)
28--- src/sextant/web/server.py 2014-08-14 17:09:12 +0000
29+++ src/sextant/web/server.py 2014-08-15 16:13:24 +0000
30@@ -304,7 +304,7 @@
31 # serve static directory at root
32 root = File(os.path.join(
33 os.path.dirname(os.path.abspath(__file__)),
34- "..", "..", "..", "resources", "web"))
35+ "..", "..", "resources", "web"))
36
37 # serve a dynamic Echoer webpage at /echoer.html
38 root.putChild("echoer.html", Echoer())

Subscribers

People subscribed via source and target branches