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

Update Dependencies #953

Merged
merged 8 commits into from
May 18, 2018
Merged

Update Dependencies #953

merged 8 commits into from
May 18, 2018

Conversation

mrniket
Copy link
Contributor

@mrniket mrniket commented May 17, 2018

This PR allows us to add aimmo as a dependency to codeforlife-portal

OlafSzmidt
OlafSzmidt previously approved these changes May 17, 2018
View reviewed changes
@OlafSzmidt
Copy link

OlafSzmidt commented May 17, 2018 •
edited
Loading

Looks fine but unfortunately:

pkg_resources.VersionConflict: (Django 1.8.2 (/home/travis/virtualenv/python2.7.12/lib/python2.7/site-packages), Requirement.parse('django==1.8.3'))

OlafSzmidt
OlafSzmidt approved these changes May 18, 2018
View reviewed changes
Copy link

@OlafSzmidt OlafSzmidt left a comment

Choose a reason for hiding this comment

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

Looks good.

One of the TODO comments points to #688 btw.

@mrniket mrniket merged commit 6594532 into master May 18, 2018
@mrniket mrniket deleted the update_deps branch May 18, 2018 09:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@OlafSzmidt OlafSzmidt OlafSzmidt approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mrniket @OlafSzmidt