-
Notifications
You must be signed in to change notification settings - Fork 103
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
Update pyproject.toml to fix required dependencies for vendored poetry #678
Conversation
PR conda#637 initially vendored 1.8.2 and dependencies had been updated for that. It then included 1.8.3 which changed some dependencies. This updates the dependencies for 1.8.3. It also fixes an issue with ~= versus = ^ (and therefore relaxes the previous dependencies. Also regenerated the environments/conda-lock.yml file as a result of the modifications on pyproject.toml using `conda-lock --platform linux-64 --platform osx-64 --platform osx-arm64 --platform linux-aarch64 --file=environments/dev-environment.yaml --file=pyproject.toml --lockfile=environments/conda-lock.yml`
✅ Deploy Preview for conda-lock ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
Cool!!! I have an independent alternative approach based on reading the dependencies via conda-lock which I'm using to cross-check. I discovered that conda-lock incorrectly parses tilde and caret dependencies. 🤦 PR incoming... |
I got confused between ~ and ^ so I checked. I hope I got it right this time. I was going with:
|
Thanks @romain-intel for your patience on this! In #664 I can run conda-lock -f ../cleo/pyproject.toml -f ../poetry-core/pyproject.toml -f ../poetry/pyproject.toml -c conda-forge > /tmp/pixi-test/pixi.toml and I get stderr
and stdout # This file was generated by conda-lock for the pixi environment manager.
# For more information, see <https://github.com/conda/conda-lock> and <https://pixi.sh>.
# Source files:
# - ../cleo/pyproject.toml
# - ../poetry-core/pyproject.toml
# - ../poetry/pyproject.toml
[project]
name = "project-name-placeholder"
platforms = ['linux-64', 'osx-arm64', 'osx-64', 'win-64']
channels = ['conda-forge']
[dependencies]
cachecontrol = ">=0.14.0,<0.15.0"
cleo = ">=2.1.0,<3.0.0"
crashtest = ">=0.4.1,<0.5.0"
dulwich = ">=0.21.2,<0.22.0"
importlib-metadata = ">=4.4"
keyring = ">=24.0.0,<25.0.0"
packaging = ">=23.1"
pexpect = ">=4.7.0,<5.0.0"
pkginfo = ">=1.10.0,<2.0.0"
platformdirs = ">=3.0.0,<5"
poetry-core = "1.9.0"
poetry-plugin-export = ">=1.6.0,<2.0.0"
pyproject_hooks = ">=1.0.0,<2.0.0"
python = ">=3.8.0,<4.0.0"
python-build = ">=1.0.3,<2.0.0"
python-fastjsonschema = ">=2.18.0,<3.0.0"
python-installer = ">=0.7.0,<0.8.0"
rapidfuzz = ">=3.0.0,<4.0.0"
requests = ">=2.26.0,<3.0.0"
requests-toolbelt = ">=1.0.0,<2.0.0"
shellingham = ">=1.5.0,<2.0.0"
tomli = ">=2.0.1,<3.0.0"
tomlkit = ">=0.11.4,<1.0.0"
trove-classifiers = ">=2022.5.19"
virtualenv = ">=20.23.0,<21.0.0"
[target.osx-64.dependencies]
xattr = ">=1.0.0,<2.0.0"
[target.osx-arm64.dependencies]
xattr = ">=1.0.0,<2.0.0"
[feature.dev.dependencies]
pre-commit = ">=2.10"
towncrier = ">=22.12.0"
vendoring = ">=1.0"
[feature.doc.dependencies]
sphinx = ">=5.2.3,<6.0.0"
sphinx-rtd-theme = ">=1.0.0,<2.0.0"
[feature.github-actions.dependencies]
pytest-github-actions-annotate-failures = ">=0.1.7,<0.2.0"
[feature.test.dependencies]
coverage = ">=7.2.0"
deepdiff = ">=6.3.0,<7.0.0"
httpretty = ">=1.1.0,<2.0.0"
pytest = ">=8.0.0,<9.0.0"
pytest-cov = ">=4.0.0,<5.0.0"
pytest-mock = ">=3.9.0,<4.0.0"
pytest-randomly = ">=3.12.0,<4.0.0"
pytest-xdist = ">=3.1.0,<4.0.0"
setuptools = ">=60"
tomli-w = ">=1.0.0,<2.0.0"
[feature.typing.dependencies]
mypy = ">=1.8.0"
types-requests = ">=2.28.8"
types-setuptools = ">=57.4.14" Note that the relevant section is It's very possible that there are errors in the above, but I have spotted discrepancies in the version constraints. I believe some discrepancies are due to looking at the poetry/poetry-core/cleo |
Yes -- you are right, I looked at a mixture it looks like. I think the versions you present are correct. Let me update the PR. |
Thanks @romain-intel! I have done this independently in a few different ways, and my work matches yours. |
Description
PR #637 initially vendored 1.8.2 and dependencies had been updated for that. It then included 1.8.3 which changed some dependencies.
This updates the dependencies for 1.8.3. It also fixes an issue with ~= versus = ^ (and therefore relaxes the previous dependencies.
Also regenerated the environments/conda-lock.yml file as a result of the modifications on pyproject.toml using
conda-lock --platform linux-64 --platform osx-64 --platform osx-arm64 --platform linux-aarch64 --file=environments/dev-environment.yaml --file=pyproject.toml --lockfile=environments/conda-lock.yml
Fixes #676