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

Sync v4 with latest from master #12371

Merged
merged 2 commits into from
Mar 6, 2023
Merged

Conversation

rmitsch
Copy link
Contributor

@rmitsch rmitsch commented Mar 6, 2023

[DON'T SQUASH MERGE]

Description

Syncing v4 with master. This contains only this fix, as the CI fails without it.

Types of change

Chore.

Checklist

  • I confirm that I have the right to submit this contribution under the project's MIT license.
  • 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.

…#12368)

* Handle deprecation of pkg_resources

* Replace `pkg_resources` with `importlib_metadata` for `spacy info
--url`
* Remove requirements check from `spacy project` given the lack of
alternatives

* Fix installed model URL method and CI test

* Fix types/handling, simplify catch-all return

* Move imports instead of disabling requirements check

* Format

* Reenable test with ignored deprecation warning

* Fix except

* Fix return
@rmitsch rmitsch added meta Meta topics, e.g. repo organisation and issue management 🔜 v4.0 Related to upcoming v4.0 labels Mar 6, 2023
@rmitsch rmitsch self-assigned this Mar 6, 2023
@svlandeg svlandeg self-requested a review March 6, 2023 14:02
.github/azure-steps.yml Outdated Show resolved Hide resolved
@rmitsch rmitsch force-pushed the sync/master-into-v4 branch 2 times, most recently from b81f8fb to 79378d1 Compare March 6, 2023 14:25
@rmitsch rmitsch marked this pull request as ready for review March 6, 2023 14:44
spacy/cli/info.py Outdated Show resolved Hide resolved
# Conflicts:
#	.github/azure-steps.yml
@svlandeg svlandeg removed their request for review March 6, 2023 15:44
@adrianeboyd adrianeboyd merged commit 8ca71f9 into explosion:v4 Mar 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
meta Meta topics, e.g. repo organisation and issue management 🔜 v4.0 Related to upcoming v4.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants