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

dvc 2.10.1 #99342

Closed
wants to merge 1 commit into from
Closed

dvc 2.10.1 #99342

wants to merge 1 commit into from

Conversation

pmrowla
Copy link
Contributor

@pmrowla pmrowla commented Apr 15, 2022

Created with brew bump-formula-pr.


This also includes a manual update to pypi_formula_mappings.json (added new bcrypt extra package)

will close iterative/dvc#7569

@BrewTestBot BrewTestBot added the automerge-skip `brew pr-automerge` will skip this pull request label Apr 15, 2022
@SMillerDev
Copy link
Member

This also includes a manual update to pypi_formula_mappings.json (added new bcrypt extra package)

Do they have an install target that would include this?

@pmrowla
Copy link
Contributor Author

pmrowla commented Apr 15, 2022

Do they have an install target that would include this?

Yes, the extra was left out of prior DVC brew releases by mistake (see iterative/dvc#7569)

@chenrui333 chenrui333 added the long build Set a long timeout for formula testing label Apr 15, 2022
@cho-m
Copy link
Member

cho-m commented Apr 17, 2022

I would recommend replacing some extra_packages with corresponding pip extras_require feature name, which Homebrew supports via package_name. This would avoid having to hardcode and manually modify those dependencies.

One option would be to use all and add pyarrow to exclude:

  "dvc": {
    "package_name": "dvc[all]",
    "extra_packages": ["...TODO..."],
    "exclude_packages": ["protobuf", "pyarrow", "six", "tabulate"]
  }

Another option would be to list features out like:

  "dvc": {
    "package_name": "dvc[azure,gdrive,gs,oss,s3,ssh,webdav]",
    "extra_packages": ["...TODO..."],
    "exclude_packages": ["protobuf", "six", "tabulate"]
  }

This will help pick up new dependencies like the missing ossfs.

Ideally, there shouldn't be any extra_packages, but can add oss2 to avoid picking older oss2 that needs aliyun-python-sdk-core-v3.

@pmrowla
Copy link
Contributor Author

pmrowla commented Apr 17, 2022

I would recommend replacing some extra_packages with corresponding pip extras_require feature name, which Homebrew supports via package_name. This would avoid having to hardcode and manually modify those dependencies.

👍

Thanks, specifying dvc[all] this way looks like what we want, we just weren't aware that it actually supported pip extras in this way

@pmrowla
Copy link
Contributor Author

pmrowla commented Apr 18, 2022

PR has been updated to use package_name: dvc[all].

One thing to note is that this still requires passing an additional jmespath<1.0 into pipgrip in order for it to resolve DVC's dependencies properly (see Homebrew/brew#13147 and the other linked issues there)

@cho-m cho-m added the CI-long-timeout [DEPRECATED] Use longer GitHub Actions CI timeout. label Apr 18, 2022
@iMichka iMichka removed the CI-long-timeout [DEPRECATED] Use longer GitHub Actions CI timeout. label Apr 18, 2022
@chenrui333 chenrui333 added the ready to merge PR can be merged once CI is green label Apr 18, 2022
@cho-m
Copy link
Member

cho-m commented Apr 18, 2022

One thing to note is that this still requires passing an additional jmespath<1.0 into pipgrip in order for it to resolve DVC's dependencies properly (see Homebrew/brew#13147 and the other linked issues there)

I wonder if it would be worth enhancing extra_packages to support > and < constraints (I think it only supports unversioned and exact version == right now).

It looks like oss2 v2.14+ no longer uses aliyun-python-sdk-core-v3 (aliyun/aliyun-oss-python-sdk@7c1a93a). Assuming rest of dependency tree is okay, then doing oss2>=2.14.0 should avoid problematic packages.

@BrewTestBot
Copy link
Member

:shipit: @cho-m has triggered a merge.

@pmrowla pmrowla deleted the bump-dvc-2.10.1 branch April 22, 2022 02:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge-skip `brew pr-automerge` will skip this pull request long build Set a long timeout for formula testing ready to merge PR can be merged once CI is green
Projects
None yet
Development

Successfully merging this pull request may close these issues.

OpenSSH private key encryption requires bcrypt with KDF support
6 participants