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.

Sign up for GitHub

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

Jump to bottom

Fix marker parsing and grouping during resolution #2384

Merged
merged 10 commits into from
Jun 22, 2018
Merged

Fix marker parsing and grouping during resolution #2384

merged 10 commits into from
Jun 22, 2018

Conversation

techalchemy
Copy link
Member

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

@techalchemy
Copy link
Member Author

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

@techalchemy techalchemy reopened this Jun 19, 2018
uranusjr
uranusjr reviewed Jun 21, 2018
View reviewed changes
pipenv/core.py Outdated
@@ -103,7 +101,7 @@
):
INSTALL_LABEL = '🎅 '
else:
INSTALL_LABEL = '🐍 '
INSTALL_LABEL = '🝝 '
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wait

uranusjr
uranusjr reviewed Jun 22, 2018
View reviewed changes
tests/integration/test_sync.py Outdated
@@ -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")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extra dot?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops

@techalchemy
Exclude dependencies with failing markers from lock
9f58768 
Signed-off-by: Dan Ryan <dan@danryan.co>
@techalchemy
Add pytz-2018 wheel
93aceb1 
Signed-off-by: Dan Ryan <dan@danryan.co>
@techalchemy
Minor code cleanup
c31a311 
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>
@techalchemy
Catch AttributeErrors when resolving sdists
15bcf36 
Signed-off-by: Dan Ryan <dan@danryan.co>
@techalchemy
explicitly turn possible InlineTableElement to dict
32a89d9 
Signed-off-by: Dan Ryan <dan@danryan.co>

Add updated regex dependency

Signed-off-by: Dan Ryan <dan@danryan.co>
@techalchemy
Fix pip cahce dir argument
6c62d94 
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>
@techalchemy
Update integration test
efe3965 
Signed-off-by: Dan Ryan <dan@danryan.co>
@techalchemy
Use the real marker parser -- confirmed working
6343acb 
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>
@techalchemy
Update news
f91c9e0 
Signed-off-by: Dan Ryan <dan@danryan.co>
@techalchemy
Minor control flow and test logic updates
b74c658 
Signed-off-by: Dan Ryan <dan@danryan.co>
@techalchemy techalchemy merged commit f307507 into master Jun 22, 2018
@techalchemy techalchemy mentioned this pull request Jun 23, 2018
Closed
@techalchemy techalchemy changed the title Exclude failing markers Fix marker parsing and grouping during resolution Jun 23, 2018
@techalchemy techalchemy added Type: Bug 🐛 This issue is a bug. Type: Enhancement 💡 This is a feature or enhancement request. Category: Dependency Resolution Issue relates to dependency resolution. Category: Performance Issue relates to performance Type: Vendored Dependencies This issue affects vendored dependencies within pipenv. labels Jun 23, 2018
@techalchemy techalchemy deleted the exclude-failing-markers branch June 26, 2018 05:06
This was referenced Jul 15, 2018
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@uranusjr uranusjr uranusjr left review comments

Assignees
No one assigned
Labels
Category: Dependency Resolution Issue relates to dependency resolution. Category: Performance Issue relates to performance Type: Bug 🐛 This issue is a bug. Type: Enhancement 💡 This is a feature or enhancement request. Type: Vendored Dependencies This issue affects vendored dependencies within pipenv.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@techalchemy @uranusjr