From bb6ffc00355adcdf39c0d2c14159aa78250ad0df Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 9 Jan 2015 11:49:10 -0800 Subject: [PATCH 1/3] Also ignore .venv --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 061e7ec9..62bc3f42 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ wip/ pycallgraph.png /config.sh venv/ +.venv/ From 4611204fdd43bf7189c248bbf0f01ccda18c7748 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 9 Jan 2015 11:50:35 -0800 Subject: [PATCH 2/3] specify pip3 --- misc/madupload.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/misc/madupload.py b/misc/madupload.py index f37066a1..3b4327a0 100755 --- a/misc/madupload.py +++ b/misc/madupload.py @@ -19,6 +19,8 @@ It can be installed with Python's package installer, e.g: {prompt} pip install requests +or + {prompt} pip3 install requests For additional help, see: Bitbucket Wiki http://kfs.org/td/wiki From cb60a75cf4ac30409181b1ffe12a2aa2adf01e65 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 9 Jan 2015 13:50:14 -0800 Subject: [PATCH 3/3] fixes #125 No such station: STEIN 2051/Trevithick port --- corrections.py | 5 +++-- data/Station.csv | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/corrections.py b/corrections.py index 9ebe32ee..9d8211ad 100644 --- a/corrections.py +++ b/corrections.py @@ -34,10 +34,10 @@ "GCRV 4654/HERZEFELD LANDING": "Herzfeld Landing", "GROOMBRIDGE 1618/FRANKUN RING": "Franklin Ring", "HR 5451/MACDONALO HUB": "MacDonald Hub", - "HR 5451/MACOONALO HUB": "MacDonald Hub", "HR 5451/MACOONALD HUB": "MacDonald Hub", + "HR 5451/MACOONALO HUB": "MacDonald Hub", "JAWOLA/SUTCLIFFEPLATFORM": "Sutcliffe Platform", - "LEESTI/GEORGELUCAS": "George Lucas", + "LEESTI/GEORGELUCAS": "George Lucas", "LHS 220/CULPEPERCOLONY": "Culpeper Colony", "LHS 250/KOVALESKY ENTERPRISE": "Kovalevsky Enterprise", "LHS 2884/ABNETT PLATEFORM": "Abnett Platform", @@ -56,6 +56,7 @@ "PERENDI/Shepherd Installation": DELETED, "RHO CANCRI/HAMILTON R,SERVE": "Hamilton Reserve", "RHO CANCRI/HAMILTON R�SERVE": "Hamilton Reserve", + "STEIN 2051/TREVITHICK PORT": DELETED, "TENG YEH/GARAN SURVERY": "Garan Survey", "TRELLA/TITTO COLONY": "Tito Colony", "TYR/GLASHOW": "Glashow Dock", diff --git a/data/Station.csv b/data/Station.csv index eb50355e..2a594f01 100644 --- a/data/Station.csv +++ b/data/Station.csv @@ -3071,7 +3071,6 @@ unq:name@System.system_id,unq:name,ls_from_star,blackmarket,max_pad_size 'SPOCS 208','Thomas Hub',141,'N','L' 'STEIN 2051','Boming Station',1798,'N','M' 'STEIN 2051','Rennie Landing',168,'N','M' -'STEIN 2051','Trevithick Port',0,'?','?' 'STF 1774','Brackett Station',110205,'?','?' 'STF 1774','Coulomb Dock',1621,'?','?' 'STF 1774','Froude Ring',590,'?','?'