Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

πŸ’« Port master changes over to develop #2979

Merged
merged 136 commits into from
Nov 29, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
136 commits
Select commit Hold shift + click to select a range
db2c2b2
Create aryaprabhudesai.md (#2681)
aryaprabhudesai Aug 20, 2018
ca747f5
Update _install.jade (#2688)
Aug 22, 2018
559f413
Add FAC to spacy.explain (resolves #2706)
ines Aug 26, 2018
e9022f7
Remove docstrings for deprecated arguments (see #2703)
ines Aug 26, 2018
2684987
When calling getoption() in conftest.py, pass a default option (#2709)
njsmith Sep 3, 2018
4530ddc
update bengali token rules for hyphen and digits (#2731)
aniruddha-adhikary Sep 5, 2018
bdb2165
Less norm computations in token similarity (#2730)
Sep 5, 2018
cebe50b
Remove ')' for clarity (#2737)
mbkupfer Sep 10, 2018
97e2874
added contributor agreement for mbkupfer (#2738)
mbkupfer Sep 10, 2018
77139bc
Basic support for Telugu language (#2751)
sainathadapa Sep 10, 2018
476472d
Lex _attrs for polish language (#2750)
tyburam Sep 10, 2018
aeba99a
Introduces a bulk merge function, in order to solve issue #653 (#2696)
grivaz Sep 10, 2018
885691a
Describe converters more explicitly (see #2643)
ines Sep 12, 2018
907df53
Add multi-threading note to Language.pipe (resolves #2582) [ci skip]
ines Sep 12, 2018
0729d1e
Fix formatting
ines Sep 12, 2018
4e89cfa
Fix dependency scheme docs (closes #2705) [ci skip]
ines Sep 12, 2018
5001d31
Don't set stop word in example (closes #2657) [ci skip]
ines Sep 12, 2018
fe51508
Add words to portuguese language _num_words (#2759)
filipecaixeta Sep 14, 2018
81564cc
Update Indonesian model (#2752)
aongko Sep 14, 2018
2d15859
Fixed spaCy+Keras example (#2763)
free-variation Sep 15, 2018
68b3c54
Adding French hyphenated first name (#2786)
mauryaland Sep 21, 2018
3c4e3ad
Fix typo (closes #2784)
ines Sep 21, 2018
9fd27d7
Fix typo (#2795) [ci skip]
pmj642 Sep 25, 2018
9a016d1
Adding basic support for Sinhala language. (#2788)
keshan Sep 25, 2018
70f4e8a
Also include lowercase norm exceptions
ines Sep 25, 2018
5e0dfb3
Merge branch 'master' of https://github.com/explosion/spaCy
ines Sep 26, 2018
8227566
Fix error (#2802)
darindf Sep 26, 2018
94ad3c5
Add charlax's contributor agreement (#2805)
charlax Sep 27, 2018
966b583
agreement of contributor, may I introduce a tiny pl languge contribut…
phojnacki Sep 27, 2018
014dd47
Add jupyter=True to displacy.render in documentation (#2806)
charlax Sep 27, 2018
71cdbea
Revert "Also include lowercase norm exceptions"
ines Sep 27, 2018
bae6b3e
Merge branch 'master' of https://github.com/explosion/spaCy
honnibal Sep 27, 2018
8809dc4
Remove deprecated encoding argument to msgpack
honnibal Sep 27, 2018
bbdc645
Set up dependency tree pattern matching skeleton (#2732)
skrcode Sep 27, 2018
96fe314
Fix bug when too many entity types. Fixes #2800
honnibal Sep 27, 2018
7277837
Merge branch 'master' of https://github.com/explosion/spaCy
honnibal Sep 27, 2018
2ac69fa
Fix Python 2 test failure
honnibal Sep 27, 2018
276aa83
Require older msgpack-numpy
honnibal Sep 27, 2018
6430b1f
Restore encoding arg on msgpack-numpy
honnibal Sep 27, 2018
05b6103
Try to fix version pin for msgpack-numpy
honnibal Sep 28, 2018
6c498f9
Update Portuguese Language (#2790)
filipecaixeta Sep 29, 2018
405a826
Correct error in spacy universe docs concerning spacy-lookup (#2814)
giannisdaras Oct 1, 2018
9faea3f
Update Keras Example for (Parikh et al, 2016) implementation (#2803)
free-variation Oct 1, 2018
7806dec
Fix typo (closes #2815) [ci skip]
ines Oct 1, 2018
9937ff9
Update regex version dependency
honnibal Oct 2, 2018
40f228c
Set version to 2.0.13.dev3
honnibal Oct 2, 2018
9e4079d
Merge branch 'master' of https://github.com/explosion/spaCy
honnibal Oct 2, 2018
6afc6ff
Skip seemingly problematic test
honnibal Oct 2, 2018
bdebbef
Remove problematic test
honnibal Oct 2, 2018
e4fd2cc
Try previous version of regex
honnibal Oct 2, 2018
4cf5ce2
Revert "Remove problematic test"
honnibal Oct 2, 2018
67ddce6
Unskip test
honnibal Oct 2, 2018
f784e42
Try older version of regex
honnibal Oct 2, 2018
4cd9ec0
πŸ’« Update training examples and use minibatching (#2830)
ines Oct 9, 2018
42c4237
Visual C++ link updated (#2842) (closes #2841) [ci skip]
jacopofar Oct 12, 2018
b76fe08
Correcting lang/ru/examples.py (#2845)
Cinnamy Oct 13, 2018
c3ddf98
Set version to 2.0.13.dev4
honnibal Oct 13, 2018
74a30d8
Add Persian(Farsi) language support (#2797)
JKhakpour Oct 13, 2018
cb57b35
Also include lowercase norm exceptions
ines Oct 13, 2018
fa23be0
Remove in favour of https://github.com/explosion/spaCy/graphs/contrib…
ines Oct 13, 2018
de46286
Merge branch 'master' of https://github.com/explosion/spaCy
honnibal Oct 13, 2018
36514b5
Rule-based French Lemmatizer (#2818)
mauryaland Oct 13, 2018
6a6ae5b
Merge branch 'master' of https://github.com/explosion/spaCy
honnibal Oct 13, 2018
9cfab59
Set version to 2.0.13
honnibal Oct 13, 2018
f0e7da6
Fix formatting and consistency
ines Oct 13, 2018
23d5b4f
Update docs for new version [ci skip]
ines Oct 13, 2018
30aa7f8
Increment version [ci skip]
ines Oct 13, 2018
ac4cadd
Add info on wheels [ci skip]
ines Oct 13, 2018
cb075c8
Adding "This is a sentence" example to Sinhala (#2846)
keshan Oct 13, 2018
8f393b1
Add wheels badge
ines Oct 13, 2018
3decf44
Update badge [ci skip]
ines Oct 13, 2018
76c4338
Update README.rst [ci skip]
ines Oct 13, 2018
7de0dcb
Merge branch 'master' of https://github.com/explosion/spaCy
honnibal Oct 14, 2018
2e675d9
Update murmurhash pin
ines Oct 14, 2018
295da0f
Increment version to 2.0.14.dev0
ines Oct 14, 2018
5a4c5b7
Update GPU docs for v2.0.14
ines Oct 14, 2018
9ebe607
Add wheel to setup_requires
ines Oct 14, 2018
62c70b3
Import prefer_gpu and require_gpu functions from Thinc
honnibal Oct 14, 2018
91593b7
Add tests for prefer_gpu() and require_gpu()
honnibal Oct 14, 2018
6e6f6be
Update requirements and setup.py
honnibal Oct 14, 2018
38aa835
Workaround bug in thinc require_gpu
honnibal Oct 14, 2018
41adf35
Set version to v2.0.14
honnibal Oct 14, 2018
2ad3a4e
Update push-tag script
honnibal Oct 14, 2018
8ccfa52
Unhack prefer_gpu
honnibal Oct 14, 2018
b305b24
Require thinc 6.10.6
honnibal Oct 14, 2018
f02bb08
Update prefer_gpu and require_gpu docs [ci skip]
ines Oct 14, 2018
7202abd
Fix specifiers for GPU
honnibal Oct 14, 2018
d6e9cf8
Set version to 2.0.14.dev1
honnibal Oct 14, 2018
8612b75
Set version to 2.0.14
honnibal Oct 14, 2018
051a6b7
Update Thinc version pin
ines Oct 14, 2018
7bc7fa8
Increment version
ines Oct 14, 2018
fd750ec
Fix msgpack-numpy version pin
ines Oct 15, 2018
a0f6647
Increment version
ines Oct 15, 2018
48b1bc4
Update version to 2.0.16
ines Oct 15, 2018
c6a320c
Update version [ci skip]
ines Oct 15, 2018
5766d09
Redundant ')' in the Stop words' example (#2856)
digest0r Oct 18, 2018
0717894
Documentation improvement regarding joblib and SO (#2867)
Oct 24, 2018
57f274b
raise error when setting overlapping entities as doc.ents (#2880)
grivaz Oct 26, 2018
ad068f5
Fix out-of-bounds access in NER training
honnibal Oct 26, 2018
9447739
Merge branch 'master' of https://github.com/explosion/spaCy
honnibal Oct 26, 2018
2d2765f
Change PyThaiNLP Url (#2876)
wannaphong Oct 27, 2018
b2e2bba
Fix missing comma
honnibal Oct 27, 2018
5a4aeb9
Add example showing a fix-up rule for space entities
honnibal Oct 28, 2018
d4fa9af
Set version to 2.0.17.dev0
honnibal Oct 28, 2018
62358dd
Update regex version
honnibal Oct 28, 2018
a2745d3
Revert "Update regex version"
honnibal Oct 28, 2018
e2ae25d
Try setting older regex version, to align with conda
honnibal Oct 29, 2018
db08b16
Set version to 2.0.17
honnibal Oct 29, 2018
c235ddf
Add spacy-js to universe [ci-skip]
ines Nov 6, 2018
a9fda63
Add spacy-raspberry to universe (closes #2889)
ines Nov 6, 2018
11db4d2
Add script to validate universe json [ci skip]
ines Nov 6, 2018
75e7d50
Removed space in docs + added contributor indo (#2909)
mikelibg Nov 8, 2018
d3d419e
Allow input text of length up to max_length, inclusive (#2922)
danielhers Nov 13, 2018
be99f1c
Include universe spec for spacy-wordnet component (#2919)
frascuchon Nov 13, 2018
1aa91e9
Minor formatting changes [ci skip]
ines Nov 13, 2018
dfcc8f0
Fix image [ci skip]
ines Nov 14, 2018
87ce435
Check if the word is in one of the regular lists specific to each POS…
mauryaland Nov 14, 2018
02fc73c
πŸ’« Create random IDs for SVGs to prevent ID clashes (#2927)
ines Nov 15, 2018
696acb0
Fix typo [ci skip]
ines Nov 24, 2018
7601ae0
fixes symbolic link on py3 and windows (#2949)
cicorias Nov 24, 2018
048416f
Fix formatting
ines Nov 26, 2018
1844bc2
Update universe [ci skip]
ines Nov 26, 2018
98fe1ab
Catalan Language Support (#2940)
mpuig Nov 26, 2018
c80c20e
Sort languages alphabetically [ci skip]
ines Nov 26, 2018
968aff2
Update tests for pytest 4.x (#2965)
ines Nov 26, 2018
9e2ff2f
Fix regex pin to harmonize with conda (#2964)
honnibal Nov 26, 2018
58757c5
Update README.rst
ines Nov 26, 2018
0056694
Fix bug where Vocab.prune_vector did not use 'batch_size' (#2977)
ALSchwalm Nov 28, 2018
0a872ef
Merge branch 'master' into develop
ines Nov 29, 2018
7c547e8
Fix typo
ines Nov 29, 2018
89005a1
Fix typo
ines Nov 29, 2018
7c0725a
Remove duplicate file
ines Nov 29, 2018
d260626
Require thinc 7.0.0.dev2
ines Nov 29, 2018
b468bdb
Add missing import
ines Nov 29, 2018
925f28d
Fix error IDs
ines Nov 29, 2018
2aee46a
Fix tests
ines Nov 29, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
When calling getoption() in conftest.py, pass a default option (#2709)
* When calling getoption() in conftest.py, pass a default option

This is necessary to allow testing an installed spacy by running:

  pytest --pyargs spacy

* Add contributor agreement
  • Loading branch information
njsmith authored and ines committed Sep 3, 2018
commit 26849874adcad723e7ed7883948df34098426086
106 changes: 106 additions & 0 deletions .github/contributors/njsmith.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
# spaCy contributor agreement

This spaCy Contributor Agreement (**"SCA"**) is based on the
[Oracle Contributor Agreement](http://www.oracle.com/technetwork/oca-405177.pdf).
The SCA applies to any contribution that you make to any product or project
managed by us (the **"project"**), and sets out the intellectual property rights
you grant to us in the contributed materials. The term **"us"** shall mean
[ExplosionAI UG (haftungsbeschrΓ€nkt)](https://explosion.ai/legal). The term
**"you"** shall mean the person or entity identified below.

If you agree to be bound by these terms, fill in the information requested
below and include the filled-in version with your first pull request, under the
folder [`.github/contributors/`](/.github/contributors/). The name of the file
should be your GitHub username, with the extension `.md`. For example, the user
example_user would create the file `.github/contributors/example_user.md`.

Read this agreement carefully before signing. These terms and conditions
constitute a binding legal agreement.

## Contributor Agreement

1. The term "contribution" or "contributed materials" means any source code,
object code, patch, tool, sample, graphic, specification, manual,
documentation, or any other material posted or submitted by you to the project.

2. With respect to any worldwide copyrights, or copyright applications and
registrations, in your contribution:

* you hereby assign to us joint ownership, and to the extent that such
assignment is or becomes invalid, ineffective or unenforceable, you hereby
grant to us a perpetual, irrevocable, non-exclusive, worldwide, no-charge,
royalty-free, unrestricted license to exercise all rights under those
copyrights. This includes, at our option, the right to sublicense these same
rights to third parties through multiple levels of sublicensees or other
licensing arrangements;

* you agree that each of us can do all things in relation to your
contribution as if each of us were the sole owners, and if one of us makes
a derivative work of your contribution, the one who makes the derivative
work (or has it made will be the sole owner of that derivative work;

* you agree that you will not assert any moral rights in your contribution
against us, our licensees or transferees;

* you agree that we may register a copyright in your contribution and
exercise all ownership rights associated with it; and

* you agree that neither of us has any duty to consult with, obtain the
consent of, pay or render an accounting to the other for any use or
distribution of your contribution.

3. With respect to any patents you own, or that you can license without payment
to any third party, you hereby grant to us a perpetual, irrevocable,
non-exclusive, worldwide, no-charge, royalty-free license to:

* make, have made, use, sell, offer to sell, import, and otherwise transfer
your contribution in whole or in part, alone or in combination with or
included in any product, work or materials arising out of the project to
which your contribution was submitted, and

* at our option, to sublicense these same rights to third parties through
multiple levels of sublicensees or other licensing arrangements.

4. Except as set out above, you keep all right, title, and interest in your
contribution. The rights that you grant to us under these terms are effective
on the date you first submitted a contribution to us, even if your submission
took place before the date you sign these terms.

5. You covenant, represent, warrant and agree that:

* Each contribution that you submit is and shall be an original work of
authorship and you can legally grant the rights set out in this SCA;

* to the best of your knowledge, each contribution will not violate any
third party's copyrights, trademarks, patents, or other intellectual
property rights; and

* each contribution shall be in compliance with U.S. export control laws and
other applicable export and import laws. You agree to notify us if you
become aware of any circumstance which would make any of the foregoing
representations inaccurate in any respect. We may publicly disclose your
participation in the project, including the fact that you have signed the SCA.

6. This SCA is governed by the laws of the State of California and applicable
U.S. Federal law. Any choice of law rules will not apply.

7. Please place an β€œx” on one of the applicable statement below. Please do NOT
mark both statements:

* [x] I am signing on behalf of myself as an individual and no other person
or entity, including my employer, has or will have rights with respect to my
contributions.

* [ ] I am signing on behalf of my employer or a legal entity and I have the
actual authority to contractually bind that entity.

## Contributor Details

| Field | Entry |
|------------------------------- | -------------------- |
| Name | Nathaniel J. Smith |
| Company name (if applicable) | |
| Title or role (if applicable) | |
| Date | 2018-08-26 |
| GitHub username | njsmith |
| Website (optional) | https://vorpus.org |
13 changes: 11 additions & 2 deletions spacy/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,13 +212,22 @@ def pytest_addoption(parser):


def pytest_runtest_setup(item):
def getopt(opt):
# When using 'pytest --pyargs spacy' to test an installed copy of
# spacy, pytest skips running our pytest_addoption() hook. Later, when
# we call getoption(), pytest raises an error, because it doesn't
# recognize the option we're asking about. To avoid this, we need to
# pass a default value. We default to False, i.e., we act like all the
# options weren't given.
return item.config.getoption("--%s" % opt, False)

for opt in ['models', 'vectors', 'slow']:
if opt in item.keywords and not item.config.getoption("--%s" % opt):
if opt in item.keywords and not getopt(opt):
pytest.skip("need --%s option to run" % opt)

# Check if test is marked with models and has arguments set, i.e. specific
# language. If so, skip test if flag not set.
if item.get_marker('models'):
for arg in item.get_marker('models').args:
if not item.config.getoption("--%s" % arg) and not item.config.getoption("--all"):
if not getopt(arg) and not getopt("all"):
pytest.skip("need --%s or --all option to run" % arg)