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.

Sign up for GitHub

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

Jump to bottom

feat: use weasel as spacy project command #12473

Merged
merged 10 commits into from
Jun 7, 2023
Merged

feat: use weasel as spacy project command #12473

merged 10 commits into from
Jun 7, 2023

Conversation

bdura
Copy link
Contributor

@bdura bdura commented Mar 27, 2023 •
edited
Loading

Description

This PR proposes to use weasel (for now, using a direct link to the Github repo) as the spacy project CLI engine.

Types of change

Refactoring.

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.

@bdura
Copy link
Contributor Author

bdura commented Mar 27, 2023

We'll need to publish the package first.

@bdura bdura marked this pull request as draft March 27, 2023 17:02
@svlandeg svlandeg added enhancement Feature requests and improvements feat / cli Feature: Command-line interface labels Mar 27, 2023
@adrianeboyd
Copy link
Contributor

There are multiple ways to do this, but as one way for initial testing, you can specify the github repo like this, adding it to both setup.cfg and requirements.txt:

weasel@git+https://github.com/explosion/weasel.git@commit

Where @commit could also be a branch or a tag, and you can leave out @commit.

I think one of the internal spacy tests that checks requirements may still fail, but you should be able to install the package and check everything else in the CI logs.

@bdura
Copy link
Contributor Author

bdura commented Mar 28, 2023

Thanks for the input @adrianeboyd. This is now ready for review - unless we want to hold off until a newer version of weasel is actually released, in which case we can consider this a proof of concept of sorts.

@bdura bdura marked this pull request as ready for review March 28, 2023 09:44
@adrianeboyd
Copy link
Contributor

Let me mark this as a draft until there's an official release.

@adrianeboyd adrianeboyd marked this pull request as draft March 28, 2023 18:04
@bdura bdura added the 🔜 v4.0 Related to upcoming v4.0 label Jun 1, 2023
@bdura bdura marked this pull request as ready for review June 5, 2023 20:42
@svlandeg
Copy link
Member

svlandeg commented Jun 6, 2023

How does work relate to https://github.com/explosion/spaCy/commits/feature/weasel?

@bdura
Copy link
Contributor Author

bdura commented Jun 7, 2023

How does work relate to https://github.com/explosion/spaCy/commits/feature/weasel?

Hmm, strange: it seems like I'm deleting files that no longer exist within the base branch... This PR is supposed use weasel directly, but I'm not sure what happened - let me merge the base branch first.

@bdura
Copy link
Contributor Author

bdura commented Jun 7, 2023

Ok, that looks better. Again, not sure what exactly happened there.

svlandeg
svlandeg approved these changes Jun 7, 2023
View reviewed changes
Copy link
Member

@svlandeg svlandeg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks!

@bdura bdura merged commit 4788ab2 into explosion:feature/weasel Jun 7, 2023
@bdura bdura deleted the feat/import-weasel branch June 7, 2023 09:15
svlandeg added a commit that referenced this pull request Jul 7, 2023
@svlandeg @bdura
Replace projects functionality with weasel (#12769)
b1b20bf 
* Setting up weasel branch (#12456)

* remove project-specific functionality

* remove project-specific tests

* remove project-specific schemas

* remove project-specific information in about

* remove project-specific functions in util.py

* remove project-specific error strings

* remove project-specific CLI commands

* black formatting

* restore some functions that are used beyond projects

* remove project imports

* remove imports

* remove remote_storage tests

* remove one more project unit test

* update for PR 12394

* remove get_hash and get_checksum

* remove upload_ and download_file methods

* remove ensure_pathy

* revert clumsy fingers

* reinstate E970

* feat: use weasel as spacy project command (#12473)

* feat: use weasel as spacy project command

* build: use constrained requirement for weasel

* feat: add weasel to the library requirements

* build: update weasel to new version

* build: use specific weasel tag

* build: use weasel-0.1.0rc1 from PyPI

* fix: remove weasel from requirements.txt

* fix: requirements.txt and setup.cfg need to reflect each other

* feat: remove legacy spacy project code

* bump version

* further merge fixes

* isort

---------

Co-authored-by: Basile Dura <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@svlandeg svlandeg svlandeg approved these changes

Assignees
No one assigned
Labels
enhancement Feature requests and improvements feat / cli Feature: Command-line interface 🔜 v4.0 Related to upcoming v4.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bdura @adrianeboyd @svlandeg