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

Use scipp from pypi index instead of github url for nightlies #234

Merged
merged 4 commits into from
Dec 3, 2024
Merged

Use scipp from pypi index instead of github url for nightlies #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3aa4615
Use scipp from pypi index instead of github url for nightlies
MridulS Nov 22, 2024
91e5747
Add comments about pip resolver behavior
MridulS Dec 3, 2024
1e7ba9b
Merge branch 'main' into scipp_pypi
MridulS Dec 3, 2024
d61c047
Merge branch 'main' into scipp_pypi
nvaytet Dec 3, 2024
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
15 changes: 9 additions & 6 deletions template/requirements/make_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import sys
from argparse import ArgumentParser
from pathlib import Path

Expand Down Expand Up @@ -58,11 +57,15 @@ def as_nightly(repo: str) -> str:
else:
org = "scipp"
if repo == "scipp":
version = f"cp{sys.version_info.major}{sys.version_info.minor}"
base = "https://github.com/scipp/scipp/releases/download/nightly/scipp-nightly"
suffix = "manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
prefix = "scipp @ "
return prefix + "-".join([base, version, version, suffix])
# With the standard pip resolver index-url takes precedence over
# extra-index-url but with uv it's reversed, so if we move to tox-uv
Copy link
Member

Choose a reason for hiding this comment

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

but with uv it's reversed

🙄

# this needs to be reversed.
return (
Copy link
Member

Choose a reason for hiding this comment

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

I think it looks fine. So I guess we also need to start uploading nightly wheels in the index for the other packages?

Copy link
Member Author

Choose a reason for hiding this comment

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

We don't have to but we can to keep things consistent :)

Copy link
Member Author

Choose a reason for hiding this comment

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

for now, let's just start with scipp?

Copy link
Member

@nvaytet nvaytet Dec 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Sure, we start with scipp.
But we need to put the others there as well so that the integration tests are running on latest nightly main, because at the moment, they are using latest released as we cannot install from github (ip address is getting throttled).

But yes, this is not for this PR.

"scipp\n"
"--index-url=https://pypi.anaconda.org/scipp-nightly-wheels/simple/\n"
Copy link
Member

Choose a reason for hiding this comment

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

Do we want to add a comment just to say that the order of the indexes is important here?

"--extra-index-url=https://pypi.org/simple\n"
"--pre"
)
return f"{repo} @ git+https://github.com/{org}/{repo}@main"


Expand Down
3 changes: 3 additions & 0 deletions template/tox.ini.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ commands = pytest {posargs}

[testenv:nightly]
deps = -r requirements/nightly.txt
setenv =
PIP_INDEX_URL = https://pypi.anaconda.org/scipp-nightly-wheels/simple
PIP_EXTRA_INDEX_URL = https://pypi.org/simple
commands = pytest {posargs}

[testenv:unpinned]
Expand Down