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

chore: pip support extra indices #1537

Closed
wants to merge 28 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ec32344
@pip draft
savingoyal Jun 19, 2023
be25f45
chore: pip deco fixes (#1523)
saikonen Sep 7, 2023
cf59e90
add support for legacy libraries= in conda decorator (#1525)
saikonen Sep 10, 2023
84d6387
chore: fix micromamba detection (#1526)
saikonen Sep 10, 2023
418d526
@pip draft
savingoyal Jun 19, 2023
6543174
vend
savingoyal Sep 10, 2023
ab996cf
rebase
savingoyal Sep 10, 2023
e012ea4
more changes
savingoyal Sep 10, 2023
9190abf
more changes
savingoyal Sep 10, 2023
b7e1224
enable conda channels
savingoyal Sep 10, 2023
0d89e8f
more comments
savingoyal Sep 10, 2023
842dcec
introduce conda_base
savingoyal Sep 10, 2023
ac17578
more changes
savingoyal Sep 10, 2023
687f0d0
address comments
savingoyal Sep 10, 2023
58a9715
address nousersite issue
savingoyal Sep 10, 2023
3b2fe3a
handle cross-platform cache check optimization
savingoyal Sep 11, 2023
dbb3330
handle missing tarballs
savingoyal Sep 11, 2023
674e04e
update comments
savingoyal Sep 11, 2023
af13d71
fix biug
savingoyal Sep 11, 2023
de7c035
address more todos
savingoyal Sep 11, 2023
547c41b
remove stray file
savingoyal Sep 11, 2023
774ee83
fix comments
savingoyal Sep 11, 2023
294645b
fix mac version
savingoyal Sep 12, 2023
d6330be
fix passing multiple channels (#1536)
saikonen Sep 13, 2023
27a16d8
chore: pip decorator fixes (#1535)
saikonen Sep 13, 2023
20649b3
first draft adding indices to pip deco
saikonen Sep 13, 2023
c555d9c
support extra indices for pip
saikonen Sep 13, 2023
bf2fa73
read extra indices from pip configuration instead of passing through …
saikonen Sep 14, 2023
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
2 changes: 1 addition & 1 deletion metaflow/_vendor/vendor_any.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
click==7.1.2
packaging==23.0
packaging==23.0
1 change: 1 addition & 0 deletions metaflow/metaflow_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,7 @@ def get_version(pkg):
return pkg_resources.get_distribution(pkg).version


# TODO: This is no longer in use and can be dispensed with.
# PINNED_CONDA_LIBS are the libraries that metaflow depends on for execution
# and are needed within a conda environment
def get_pinned_conda_libs(python_version, datastore_type):
Expand Down
7 changes: 4 additions & 3 deletions metaflow/plugins/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@
"unbounded_test_foreach_internal",
".test_unbounded_foreach_decorator.InternalTestUnboundedForeachDecorator",
),
("conda", ".conda.conda_step_decorator.CondaStepDecorator"),
("card", ".cards.card_decorator.CardDecorator"),
("pytorch_parallel", ".frameworks.pytorch.PytorchParallelDecorator"),
("airflow_internal", ".airflow.airflow_decorator.AirflowInternalDecorator"),
("pypi", ".pypi.pypi_decorator.PyPIStepDecorator"),
("conda", ".pypi.conda_decorator.CondaStepDecorator"),
]

# Add new flow decorators here
Expand All @@ -53,15 +54,15 @@
# careful with the choice of name though - they become top-level
# imports from the metaflow package.
FLOW_DECORATORS_DESC = [
("conda_base", ".conda.conda_flow_decorator.CondaFlowDecorator"),
("schedule", ".aws.step_functions.schedule_decorator.ScheduleDecorator"),
("project", ".project_decorator.ProjectDecorator"),
("trigger", ".events_decorator.TriggerDecorator"),
("trigger_on_finish", ".events_decorator.TriggerOnFinishDecorator"),
("conda_base", ".pypi.conda_decorator.CondaFlowDecorator"),
]

# Add environments here
ENVIRONMENTS_DESC = [("conda", ".conda.conda_environment.CondaEnvironment")]
ENVIRONMENTS_DESC = [("conda", ".pypi.conda_environment.CondaEnvironment")]

# Add metadata providers here
METADATA_PROVIDERS_DESC = [
Expand Down
90 changes: 0 additions & 90 deletions metaflow/plugins/conda/__init__.py

This file was deleted.

104 changes: 0 additions & 104 deletions metaflow/plugins/conda/batch_bootstrap.py

This file was deleted.

Loading