Vendor Poetry #240

maresb · 2022-09-17T08:10:15Z

Closes #235

Still in early stages, but want to test with CI.

I haven't forgotten the alternative proposal to write my own solver, but vendoring seems like the most straightforward place to start.

netlify · 2022-09-17T08:10:21Z

✅ Deploy Preview for conda-lock ready!

Name	Link
🔨 Latest commit	`75ad80b`
🔍 Latest deploy log	https://app.netlify.com/sites/conda-lock/deploys/6343bedd81d8e70009890936
😎 Deploy Preview	https://deploy-preview-240--conda-lock.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

maresb · 2022-09-17T09:27:52Z

Current goals:

~~Get tests to pass~~ ✔️
~~Fix pre-commit~~ ✔️
~~Eliminate extraneous dependencies from vendored Poetry~~ ✔️

maresb · 2022-09-18T20:10:51Z

Rebased on #241 and cleaned up commits

maresb · 2022-09-19T12:54:11Z

Weird, the .whl is missing a bunch of files which are included in the sdist... I'll have to look into this once I get the chance.

maresb · 2022-09-19T21:36:59Z

I think the missing files may have simply been setuptools weirdness. Rebasing on main with Hatch, it looks like everything's there now.

maresb · 2022-09-19T21:38:26Z

BTW, my vendored poetry is also subvendoring all sorts of stuff. 🙄 Do I need to write a license aggregator now? 😂

mariusvniekerk · 2022-09-24T22:45:30Z

@maresb you can potentially make use of vendoring which is the thing that pip uses. We can't use if for conda since conda can't easily be installed using pip, but for poetry it should work fine. vendoring takes care of license aggregation etc.

maresb · 2022-09-25T07:19:44Z

Unfortunately your advice came slightly too late. I'm just putting the finishing touches on a tool I made yesterday.

maresb · 2022-10-03T12:40:12Z

This seems to be fundamentally working. But I still want to see if I can simplify things by using vendoring...

maresb · 2022-10-04T07:12:28Z

Ok, this is almost ready to go. vendoring allowed me to make a few steps declarative rather than imperative, but it made a big mess of the subvendored licenses. I think I just need to do some quick refactoring into a cleanup script.

mariusvniekerk · 2022-10-06T21:18:13Z

@maresb I've got a similar one in #256 that uses vendoring to update conda

Because we can't mix it with git+https <https://stackoverflow.com/a/50695493>

Generated by running migrate-code on: conda_lock/scripts/vendor_poetry/migration.py migrate-code record: {"migration_name": "Vendor poetry", "stage_id": [1], "migrate_code_version": "1.0.0"}

Generated by running migrate-code on: conda_lock/scripts/vendor_poetry/migration.py migrate-code record: {"migration_name": "Vendor poetry", "stage_id": [2], "migrate_code_version": "1.0.0"}

Generated by running migrate-code on: conda_lock/scripts/vendor_poetry/migration.py migrate-code record: {"migration_name": "Vendor poetry", "stage_id": [3], "migrate_code_version": "1.0.0"}

Generated by running migrate-code on: conda_lock/scripts/vendor_poetry/migration.py migrate-code record: {"migration_name": "Vendor poetry", "stage_id": [4], "migrate_code_version": "1.0.0"}

Generated by running migrate-code on: conda_lock/scripts/vendor_poetry/migration.py migrate-code record: {"migration_name": "Vendor poetry", "stage_id": [5], "migrate_code_version": "1.0.0"}

Generated by running migrate-code on: conda_lock/scripts/vendor_poetry/migration.py migrate-code record: {"migration_name": "Vendor poetry", "stage_id": [6], "migrate_code_version": "1.0.0"}

Generated by running migrate-code on: conda_lock/scripts/vendor_poetry/migration.py migrate-code record: {"migration_name": "Vendor poetry", "stage_id": [7], "migrate_code_version": "1.0.0"}

Generated by running migrate-code on: conda_lock/scripts/vendor_poetry/migration.py migrate-code record: {"migration_name": "Vendor poetry", "stage_id": [8], "migrate_code_version": "1.0.0"}

maresb mentioned this pull request Sep 17, 2022

'Unregistered SAT variable name' #202

Closed

maresb force-pushed the vendor-poetry branch from 6d9453f to c7a0d9f Compare September 18, 2022 20:10

maresb force-pushed the vendor-poetry branch from d088c72 to 16f0435 Compare September 19, 2022 21:32

maresb mentioned this pull request Sep 22, 2022

Minor refactoring #243

Merged

maresb force-pushed the vendor-poetry branch 4 times, most recently from b63fa8d to 83fa665 Compare October 3, 2022 12:03

maresb force-pushed the vendor-poetry branch from 83fa665 to 4da8d26 Compare October 3, 2022 22:23

mariusvniekerk approved these changes Oct 7, 2022

View reviewed changes

maresb added 7 commits October 9, 2022 23:22

Add *.patch to trailing-whitespace exclude

183042a

Make pyright ignore more specific

b95e3b2

Update .gitattributes

25fe506

Minor changes to LICENSE

4238f2f

Update vendoring README

9ab26d2

Create vendoring migration script

3769420

Remove hashes from vendor.txt

52e515c

Because we can't mix it with git+https <https://stackoverflow.com/a/50695493>

maresb force-pushed the vendor-poetry branch from d708276 to 522a889 Compare October 10, 2022 06:31

Fix missing newline in requirements.txt

afb5464

maresb added 8 commits October 9, 2022 23:40

Add vendored dependency requirements to conda-lock

6fedc8b

Generated by running migrate-code on: conda_lock/scripts/vendor_poetry/migration.py migrate-code record: {"migration_name": "Vendor poetry", "stage_id": [1], "migrate_code_version": "1.0.0"}

Update pypi_solver.py to use vendored Poetry imports

4288fed

Generated by running migrate-code on: conda_lock/scripts/vendor_poetry/migration.py migrate-code record: {"migration_name": "Vendor poetry", "stage_id": [2], "migrate_code_version": "1.0.0"}

Remove pexpect, requests_toolbelt, and shellingham as dependencies

6233cbb

Generated by running migrate-code on: conda_lock/scripts/vendor_poetry/migration.py migrate-code record: {"migration_name": "Vendor poetry", "stage_id": [3], "migrate_code_version": "1.0.0"}

Remove upper bounds on poetry dependencies

cf52308

Generated by running migrate-code on: conda_lock/scripts/vendor_poetry/migration.py migrate-code record: {"migration_name": "Vendor poetry", "stage_id": [4], "migrate_code_version": "1.0.0"}

Use 'vendoring sync' to vendor dependencies

1ea6055

Generated by running migrate-code on: conda_lock/scripts/vendor_poetry/migration.py migrate-code record: {"migration_name": "Vendor poetry", "stage_id": [5], "migrate_code_version": "1.0.0"}

Delete botched license file copies

28e3620

Generated by running migrate-code on: conda_lock/scripts/vendor_poetry/migration.py migrate-code record: {"migration_name": "Vendor poetry", "stage_id": [6], "migrate_code_version": "1.0.0"}

Recreate license files

c38ff67

Generated by running migrate-code on: conda_lock/scripts/vendor_poetry/migration.py migrate-code record: {"migration_name": "Vendor poetry", "stage_id": [7], "migrate_code_version": "1.0.0"}

Describe vendored dependencies in conda-lock LICENSE

75ad80b

Generated by running migrate-code on: conda_lock/scripts/vendor_poetry/migration.py migrate-code record: {"migration_name": "Vendor poetry", "stage_id": [8], "migrate_code_version": "1.0.0"}

maresb force-pushed the vendor-poetry branch from 522a889 to 75ad80b Compare October 10, 2022 06:42

maresb mentioned this pull request Oct 10, 2022

conda license is missing #259

Open

maresb marked this pull request as ready for review October 10, 2022 06:49

mariusvniekerk merged commit 9870b27 into conda:main Oct 10, 2022

maresb deleted the vendor-poetry branch October 10, 2022 14:57

This was referenced Dec 15, 2022

Deprecate pip_support optional dependency group #299

Closed

Fix error bollwyvl/conda-lock#1

Merged

maresb mentioned this pull request Mar 4, 2024

Update vendored Poetry to 1.8.0 #613

Open

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Vendor Poetry #240

Vendor Poetry #240

maresb commented Sep 17, 2022 •

edited

Loading

netlify bot commented Sep 17, 2022 •

edited

Loading

maresb commented Sep 17, 2022 •

edited

Loading

maresb commented Sep 18, 2022

maresb commented Sep 19, 2022

maresb commented Sep 19, 2022 •

edited

Loading

maresb commented Sep 19, 2022

mariusvniekerk commented Sep 24, 2022

maresb commented Sep 25, 2022

maresb commented Oct 3, 2022

maresb commented Oct 4, 2022

mariusvniekerk commented Oct 6, 2022

Vendor Poetry #240

Vendor Poetry #240

Conversation

maresb commented Sep 17, 2022 • edited Loading

netlify bot commented Sep 17, 2022 • edited Loading

✅ Deploy Preview for conda-lock ready!

maresb commented Sep 17, 2022 • edited Loading

maresb commented Sep 18, 2022

maresb commented Sep 19, 2022

maresb commented Sep 19, 2022 • edited Loading

maresb commented Sep 19, 2022

mariusvniekerk commented Sep 24, 2022

maresb commented Sep 25, 2022

maresb commented Oct 3, 2022

maresb commented Oct 4, 2022

mariusvniekerk commented Oct 6, 2022

maresb commented Sep 17, 2022 •

edited

Loading

netlify bot commented Sep 17, 2022 •

edited

Loading

maresb commented Sep 17, 2022 •

edited

Loading

maresb commented Sep 19, 2022 •

edited

Loading