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

Import simplification & dev dependencies #51

Merged
merged 7 commits into from
Oct 25, 2024
Merged

Import simplification & dev dependencies #51

merged 7 commits into from
Oct 25, 2024

Conversation

sidnarayanan
Copy link
Collaborator

  • Move dev dependencies to [dev] extra so that users can do pip install -e '.[dev]'. uv sync should still work.
  • Demote gsm8k and hotpotqa to aviary.envs submodules
  • Add aviary.core to organize imports. Note that we cannot auto-import in aviary/__init__.py due to native namespace packaging.

@dosubot dosubot bot added the size:L This PR changes 100-499 lines, ignoring generated files. label Sep 26, 2024
pyproject.toml Show resolved Hide resolved
pyproject.toml Outdated Show resolved Hide resolved
"SQLAlchemy[aiosqlite]~=2.0", # Match aviary dependencies
"aviary.gsm8k[typing]", # So `uv sync` pulls this in, and for type stubs
"aviary.hotpotqa", # So `uv sync` pulls this in
"fhaviary[image,llm,server,typing,xml]",
Copy link
Collaborator

Choose a reason for hiding this comment

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

Does this actually work (referring to other extras within this extra)?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yep - just tested uv pip install -e '.[dev]' on a clean env and all extras were pulled in.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Also CI is passing, which would need these dependencies

Copy link
Contributor

@whitead whitead left a comment

Choose a reason for hiding this comment

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

lgtm

"SQLAlchemy[aiosqlite]~=2.0", # Match aviary dependencies
"aviary.gsm8k[typing]", # So `uv sync` pulls this in, and for type stubs
"aviary.hotpotqa", # So `uv sync` pulls this in
"codeflash",
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should we remove codeflash from here?

Copy link
Collaborator

@jamesbraza jamesbraza left a comment

Choose a reason for hiding this comment

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

@sidnarayanan sidnarayanan merged commit 17e0795 into main Oct 25, 2024
6 checks passed
@sidnarayanan sidnarayanan deleted the re-org branch October 25, 2024 20:56
jamesbraza added a commit that referenced this pull request Oct 26, 2024
@jamesbraza jamesbraza mentioned this pull request Oct 26, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size:L This PR changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants