From 0e13f18ea4ca3916fff068b85b13454d4f72daf2 Mon Sep 17 00:00:00 2001 From: Henning Peters Date: Fri, 9 Oct 2015 07:23:39 +0200 Subject: [PATCH 1/6] remove compile warning noise --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0c05d890b..a7c27fb74 100644 --- a/setup.py +++ b/setup.py @@ -138,7 +138,7 @@ VERSION = '0.93' def main(modules, is_pypy): language = "cpp" includes = ['.', path.join(sys.prefix, 'include')] - compile_args = ['-O3', '-Wno-strict-prototypes'] + compile_args = ['-O3', '-Wno-strict-prototypes', '-Wno-unused-function'] link_args = [] if sys.prefix == 'darwin': compile_args.append(['-mmacosx-version-min=10.8', '-stdlib=libc++']) From af8d0a2a0901bb8faf77f5a74209fa102f261995 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Fri, 9 Oct 2015 12:42:41 +0200 Subject: [PATCH 2/6] * Increment version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0c05d890b..e386925b6 100644 --- a/setup.py +++ b/setup.py @@ -134,7 +134,7 @@ def run_setup(exts): headers_workaround.install_headers('numpy') -VERSION = '0.93' +VERSION = '0.94' def main(modules, is_pypy): language = "cpp" includes = ['.', path.join(sys.prefix, 'include')] From a3dfe2b90128fcbb549400c390f27ca01fede09b Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Fri, 9 Oct 2015 13:26:17 +0200 Subject: [PATCH 3/6] * Increment data version --- spacy/en/download.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spacy/en/download.py b/spacy/en/download.py index 20e7b5b95..01c87a4e4 100644 --- a/spacy/en/download.py +++ b/spacy/en/download.py @@ -7,7 +7,7 @@ import wget import plac # TODO: Read this from the same source as the setup -VERSION = '0.9.0' +VERSION = '0.9.1' AWS_STORE = 'https://s3-us-west-1.amazonaws.com/media.spacynlp.com' From 876fc99c44f674c61ec4a43e4cd5173a6ea2e3d3 Mon Sep 17 00:00:00 2001 From: Henning Peters Date: Fri, 9 Oct 2015 16:11:56 +0200 Subject: [PATCH 4/6] cleanup looks like this file was accidentally added --- website/src/jade/home/_installation.jade~ | 83 ----------------------- 1 file changed, 83 deletions(-) delete mode 100644 website/src/jade/home/_installation.jade~ diff --git a/website/src/jade/home/_installation.jade~ b/website/src/jade/home/_installation.jade~ deleted file mode 100644 index 9b6b4fa3f..000000000 --- a/website/src/jade/home/_installation.jade~ +++ /dev/null @@ -1,83 +0,0 @@ -mixin Option(name, open) - details(open=open) - summary - h4= name - block - -article.post - header - h2 #[a(href=Meta.url) - - p What's new in v0.90? - - .subhead by #[a(href="//twitter.com/spacy_io", rel="author" target="_blank") #{spaCy}] on #[time #{getDate(Meta.date).fulldate}] - - ul - li Support for gazetteers - li Set Lexeme attributes - #[a.readmore(href=Meta.url) Full Change Log ►] - - -section.intro - p What's - -+Option("conda", true) - pre.language-bash: code - | $ conda install spacy - | $ python -m spacy.en.download - -+Option("pip and virtualenv", true) - p With Python 2.7 or Python 3, using Linux or OSX, run: - - pre.language-bash: code - | $ pip install spacy - | $ python -m spacy.en.download - - p - | The download command fetches and installs about 300mb of data, for - | the parser model and word vectors, which it installs within the spacy.en - | package directory. - - - +Option("Workaround for obsolete system Python", false) - p - | If you're stuck using a server with an old version of Python, and you - | don't have root access, I've prepared a bootstrap script to help you - | compile a local Python install. Run: - - pre.language-bash: code - | $ curl https://raw.githubusercontent.com/honnibal/spaCy/master/bootstrap_python_env.sh | bash && source .env/bin/activate - - - -+Option("Compile from source", false) - p - | The other way to install the package is to clone the github repository, - | and build it from source. This installs an additional dependency, - | Cython. If you're using Python 2, I also recommend installing fabric - | and fabtools – this is how I build the project. - - pre.language-bash: code - | $ git clone https://github.com/honnibal/spaCy.git - | $ cd spaCy - | $ virtualenv .env && source .env/bin/activate - | $ export PYTHONPATH=`pwd` - | $ pip install -r requirements.txt - | $ python setup.py build_ext --inplace - | $ python -m spacy.en.download - | $ pip install pytest - | $ py.test tests/ - - p - | Python packaging is awkward at the best of times, and it's particularly tricky - | with C extensions, built via Cython, requiring large data files. So, - | please report issues as you encounter them. - -+Option("pypy (Unsupported)") - | If PyPy support is a priority for you, please get in touch. We could likely - | fix the remaining issues, if necessary. However, the library is likely to - | be much slower on PyPy, as it's written in Cython, which produces code tuned - | for the performance of CPython. - -+Option("Windows (Unsupported)") - | Unfortunately we don't currently support Windows. From 88b2f7ea5d51a57d3644ce2508b9d9c26913aead Mon Sep 17 00:00:00 2001 From: Henning Peters Date: Fri, 9 Oct 2015 16:30:23 +0200 Subject: [PATCH 5/6] push version and add spacy channel --- website/src/jade/home/_installation.jade | 5 +++++ website/src/jade/home/index.jade | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/website/src/jade/home/_installation.jade b/website/src/jade/home/_installation.jade index 7a9a14bd5..c0e0b1445 100644 --- a/website/src/jade/home/_installation.jade +++ b/website/src/jade/home/_installation.jade @@ -20,6 +20,11 @@ mixin Option(name, open) | $ conda install spacy | $ python -m spacy.en.download all + p Latest stable conda packages are available from the spacy channel: + + pre.language-bash: code + | $ conda install -c https://conda.anaconda.org/spacy spacy + +Option("pip and virtualenv", true) p With Python 2.7 or Python 3, using Linux or OSX, ensure that you have the following packages installed: diff --git a/website/src/jade/home/index.jade b/website/src/jade/home/index.jade index f95f4fd53..89635b180 100644 --- a/website/src/jade/home/index.jade +++ b/website/src/jade/home/index.jade @@ -29,7 +29,7 @@ include ../header.jade li: a.button(href="#example-use") Examples li: a.button(href="#install") | Install - v0.93 + v0.94 article.page.landing-page +Section("Comparisons and Benchmarks", "comparisons", "./_comparisons.jade") From 7a47c0c872f3886c08d3abcb8dd92ef654019817 Mon Sep 17 00:00:00 2001 From: Henning Peters Date: Fri, 9 Oct 2015 16:37:57 +0200 Subject: [PATCH 6/6] push version --- website/src/jade/home/index.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/src/jade/home/index.jade b/website/src/jade/home/index.jade index 89635b180..a77dd323c 100644 --- a/website/src/jade/home/index.jade +++ b/website/src/jade/home/index.jade @@ -35,4 +35,4 @@ include ../header.jade +Section("Comparisons and Benchmarks", "comparisons", "./_comparisons.jade") +Section("Online Demo", "online-demo", "./_online_demo.jade") +Section("Usage by Example", "example-use", "./_usage_examples.jade") - +Section("Install v0.93", "install", "./_installation.jade") + +Section("Install v0.94", "install", "./_installation.jade")