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

Conversation

ines
Copy link
Member

@ines ines commented Nov 29, 2018

Description

Merged master into develop and resolved all the conflicts – worked surprisingly well πŸŽ‰ Not let's see if the tests pass.

Types of change

enhancement / chore

Checklist

  • I have submitted the spaCy Contributor Agreement.
  • I ran the tests, and all new and existing tests passed.
  • My changes don't require a change to the documentation, or if they do, I've added all required information.

aryaprabhudesai and others added 30 commits August 20, 2018 18:56
Typo fix: "models" -> "model"
* 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
* Less norm computations in token similarity

* Contributor agreement
Sorry, don't mean to be nitpicky, I just noticed this when going through the CLI and thought it was a quick fix. That said, if this was intention than please let me know.
* Signed spaCy contributor agreement

* Added polish version of english lex_attrs
* Fix comment

* Introduce bulk merge to increase performance on many span merges

* Sign contributor agreement

* Implement pull request suggestions
* Add words to portuguese language _num_words

* Add words to portuguese language _num_words
* adding e-KTP in tokenizer exceptions list

* add exception token

* removing lines with containing space as it won't matter since we use .split() method in the end, added new tokens in exception

* add tokenizer exceptions list

* combining base_norms with norm_exceptions

* adding norm_exception

* fix double key in lemmatizer

* remove unused import on punctuation.py

* reformat stop_words to reduce number of lines, improve readibility

* updating tokenizer exception

* implement is_currency for lang/id

* adding orth_first_upper in tokenizer_exceptions

* update the norm_exception list

* remove bunch of abbreviations

* adding contributors file
* bug fixes in keras example

* created contributor agreement
Fixed typo on line 6 "regcognizer --> recognizer"
* adding Sinhala language package, stop words, examples and lex_attrs.

* Adding contributor agreement

* Updating contributor agreement
* Fix error
ValueError: cannot resize an array that references or is referenced
by another array in this way.  Use the resize function

* added spaCy Contributor Agreement
…ion (#2799)

* Contributors agreement

* Contributors agreement

* Contributors agreement
frascuchon and others added 16 commits November 13, 2018 23:54
* feat: include universe spec for spacy-wordnet component

* chore: include spaCy contributor agreement
Twitter URL doesn't work on live site
Resolves #2924.

## Description
Fixes problem where multiple visualizations in Jupyter notebooks would have clashing arc IDs, resulting in weirdly positioned arc labels. Generating a random ID prefix so even identical parses won't receive the same IDs for consistency (even if effect of ID clash isn't noticable here.)

### Types of change
bug fix

## Checklist
<!--- Before you submit the PR, go over this checklist and make sure you can
tick off all the boxes. [] -> [x] -->
- [x] I have submitted the spaCy Contributor Agreement.
- [x] I ran the tests, and all new and existing tests passed.
- [x] My changes don't require a change to the documentation, or if they do, I've added all required information.
* fixes symbolic link on py3 and windows
during setup of spacy using command
python -m spacy link en_core_web_sm en
closes #2948

* Update spacy/compat.py

Co-Authored-By: cicorias <cicorias@users.noreply.github.com>
* Catalan language Support

* Ddding Catalan to documentation
<!--- Provide a general summary of your changes in the title. -->

## Description
- [x] Replace marks in params for pytest 4.0 compat ([see here](https://docs.pytest.org/en/latest/deprecations.html#marks-in-pytest-mark-parametrize))
- [x] Un-xfail passing tests (some fixes in a recent update resolved a bunch of issues, but tests were apparently never updated here)

### Types of change
<!-- What type of change does your PR cover? Is it a bug fix, an enhancement
or new feature, or a change to the documentation? -->

## Checklist
<!--- Before you submit the PR, go over this checklist and make sure you can
tick off all the boxes. [] -> [x] -->
- [x] I have submitted the spaCy Contributor Agreement.
- [x] I ran the tests, and all new and existing tests passed.
- [x] My changes don't require a change to the documentation, or if they do, I've added all required information.
@ines ines added the πŸŒ™ nightly Discussion and contributions related to nightly builds label Nov 29, 2018
@ines ines changed the title Port master changes over to develop πŸ’« Port master changes over to develop Nov 29, 2018
@ines ines added the ⚠️ wip Work in progress label Nov 29, 2018
@ines ines changed the base branch from master to develop November 29, 2018 15:24
@ines ines removed the ⚠️ wip Work in progress label Nov 29, 2018
@ines ines merged commit d339530 into develop Nov 29, 2018
@ines ines deleted the chore/port-over-master branch November 29, 2018 15:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
πŸŒ™ nightly Discussion and contributions related to nightly builds
Projects
None yet
Development

Successfully merging this pull request may close these issues.