Merge branch 'master' of github.com:henningpeters/spaCy

fabfile.py

@@ -68,7 +68,7 @@ def web():
         local('jade -P %s --out %s' % (jade_loc, out_loc))
 
     with virtualenv(VENV_DIR):
-        local('./website/create_code_samples tests/website/ website/src/code/')
+        local('./website/create_code_samples spacy/tests/website/ website/src/code/')
 
     jade('home/index.jade', '')
     jade('docs/index.jade', 'docs/')
@@ -79,8 +79,12 @@ def web():
         if post_dir.is_dir() \
         and (post_dir / 'index.jade').exists() \
         and (post_dir / 'meta.jade').exists():
-            jade(str(post_dir / 'index.jade'), path.join('blogs', post_dir.parts[-1]))
-        
+            jade(str(post_dir / 'index.jade'), path.join('blog', post_dir.parts[-1]))
+
+
+def web_publish():
+    local('aws s3 sync --delete website/site/ s3://spacy.io')
+
 
 def web_publish(assets_path):
     local('aws s3 sync --delete website/site/ s3://spacy.io')

requirements.txt

@@ -10,4 +10,4 @@ plac
 six
 ujson
 cloudpickle
-sputnik == 0.5.1
+sputnik == 0.5.2

setup.py

@@ -179,7 +179,7 @@ def run_setup(exts):
         license="MIT",
         install_requires=['numpy', 'murmurhash == 0.24', 'cymem == 1.30', 'preshed == 0.44',
                           'thinc == 4.0.0', "text_unidecode", 'plac', 'six',
-                          'ujson', 'cloudpickle', 'sputnik == 0.5.1'],
+                          'ujson', 'cloudpickle', 'sputnik == 0.5.2'],
         setup_requires=["headers_workaround"],
         cmdclass = {'build_ext': build_ext_subclass },
     )

website/README.md

@@ -15,7 +15,7 @@ The Stack
 --------
 The site is built with the [Jade](http://jade-lang.com/) template language.
 
-See [the Makefile](Makefile) for more
+See [fabfile.py](/fabfile.py) under ```web()``` for more
 
 
 Developing
@@ -23,8 +23,7 @@ Developing
 To make and test changes
 ```
   npm install jade --global
-  cd website
-  make
-  python -m SimpleHTTPServer 8000
+  fab web
+  python -m SimpleHTTPServer 8000 website/site
 ```
-Then visit [localhost:8000/src/...](http://localhost:8000/src/)
+Then visit [localhost:8000](http://localhost:8000)

website/create_code_samples

@@ -26,7 +26,7 @@ def main(src_dirname, dst_dirname):
             continue
     
         # Remove test_ prefix and .py suffix
-        name = filename[6:-3]
+        name = filename[5:-3]
         with io.open(os.path.join(src_dirname, filename), 'r', encoding='utf8') as file_:
             source = file_.readlines()
         tree = ast.parse("".join(source))