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

Fix marker parsing and grouping during resolution #2384

Merged
merged 10 commits into from Jun 22, 2018

Conversation

Projects
None yet
2 participants
@techalchemy
Member

techalchemy commented Jun 19, 2018

  • Dependencies with markers that don't match the current environment will now be skipped during pipenv lock
@techalchemy

This comment has been minimized.

Member

techalchemy commented Jun 19, 2018

Apparently I snuck in a script update for invoke and a changelog update

@techalchemy techalchemy reopened this Jun 19, 2018

@@ -103,7 +101,7 @@
):
INSTALL_LABEL = '🎅 '
else:
INSTALL_LABEL = '🐍 '
INSTALL_LABEL = '🝝 '

This comment has been minimized.

@uranusjr

@techalchemy techalchemy force-pushed the exclude-failing-markers branch from 0329f6a to ed3aefb Jun 22, 2018

@@ -22,7 +22,7 @@ def test_sync_error_without_lockfile(PipenvInstance, pypi):
@pytest.mark.lock
def test_mirror_lock_sync(PipenvInstance, pypi):
with temp_environ(), PipenvInstance(chdir=True) as p:
mirror_url = os.environ.pop('PIPENV_TEST_INDEX', "https://pypi.python.org/simple")
mirror_url = os.environ.pop('PIPENV_TEST_INDEX', "https://pypi.kennethreitz..org/simple")

This comment has been minimized.

@uranusjr

uranusjr Jun 22, 2018

Member

Extra dot?

This comment has been minimized.

@techalchemy

techalchemy added some commits Jun 19, 2018

Exclude dependencies with failing markers from lock
Signed-off-by: Dan Ryan <dan@danryan.co>
Add pytz-2018 wheel
Signed-off-by: Dan Ryan <dan@danryan.co>
Minor code cleanup
Signed-off-by: Dan Ryan <dan@danryan.co>

Add pytz and certifi updates

Signed-off-by: Dan Ryan <dan@danryan.co>

Fix nondeterministic resolution bug

- Update dependencies
- Fix some issues with test logic
- Update piptools patch

Signed-off-by: Dan Ryan <dan@danryan.co>

Update more packages

Signed-off-by: Dan Ryan <dan@danryan.co>

Update tests and utils

Signed-off-by: Dan Ryan <dan@danryan.co>

Still need to tackle last few failures

- this will seriously help with resolution issues

Add alembic new version

Signed-off-by: Dan Ryan <dan@danryan.co>
Catch `AttributeErrors` when resolving sdists
Signed-off-by: Dan Ryan <dan@danryan.co>
explicitly turn possible `InlineTableElement` to dict
Signed-off-by: Dan Ryan <dan@danryan.co>

Add updated regex dependency

Signed-off-by: Dan Ryan <dan@danryan.co>
Fix pip cahce dir argument
Signed-off-by: Dan Ryan <dan@danryan.co>

Add snaptime sdist

Signed-off-by: Dan Ryan <dan@danryan.co>

Update core.py encoding and add gitattributes

Signed-off-by: Dan Ryan <dan@danryan.co>

Fix deploy test

Signed-off-by: Dan Ryan <dan@danryan.co>

Add pytest things

Signed-off-by: Dan Ryan <dan@danryan.co>

Add py sdist

Signed-off-by: Dan Ryan <dan@danryan.co>
Update integration test
Signed-off-by: Dan Ryan <dan@danryan.co>
Use the real marker parser -- confirmed working
Signed-off-by: Dan Ryan <dan@danryan.co>

Typo fix

Signed-off-by: Dan Ryan <dan@danryan.co>

Move away from structlog for testing

Signed-off-by: Dan Ryan <dan@danryan.co>

Remove em-dash and ellipsis characters

- Replace with dashes and dots

Signed-off-by: Dan Ryan <dan@danryan.co>
Update news
Signed-off-by: Dan Ryan <dan@danryan.co>
Minor control flow and test logic updates
Signed-off-by: Dan Ryan <dan@danryan.co>

@techalchemy techalchemy force-pushed the exclude-failing-markers branch from ed3aefb to b74c658 Jun 22, 2018

@techalchemy techalchemy merged commit f307507 into master Jun 22, 2018

2 checks passed

buildkite/pipenv Build #494 passed (5 minutes, 55 seconds)
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details

@techalchemy techalchemy changed the title from Exclude failing markers to Fix marker parsing and grouping during resolution Jun 23, 2018

@techalchemy techalchemy deleted the exclude-failing-markers branch Jun 26, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment