-
Notifications
You must be signed in to change notification settings - Fork 1
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 mix.lock after dependecies update #161
Conversation
It seems I did not understand ~> correctly:
|
I suggest close the PR without merge, when i run:
The |
The lock file ensures that anybody who clones the project has the same (and assumably working) versions of the dependencies. You can always re-sync your lock file yourself if you want to upgrade. See the discussion here: https://stackoverflow.com/questions/4151495/should-gemfile-lock-be-included-in-gitignore. What do you think? |
Probably, we solve the problem by another approach, issue related to this is #167 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The mix.lock file is ok. Re-generating it by deleting it and running the commands you suggested yields exactly the same file.
$ mix deps.clean httpoison mox
$ mix deps.get
Thus, I consider this bump valid. The tests are passing and manual run of the escript works like a charm.
@nappex Do you know how to resolve the conflict? Are you willing to do it? Or do you want to rather ditch this PR altogether? I’d prefer to merge it, since it’s easy and two smaller bumps are better than one big. |
@nappex Resolving the conflict in the mix.lock file should be quite simple as the file as a whole doesn't have any fingerprint that needs to be recalculated. All you need to do is merge the lines. Let me know if you need any assistance! |
I've resolved the conflict by keeping the updated versions from this pull request and also adding the new lines from the master branch for floki and its dependency html_entities. After merging, I ran I'm leaving the conflict resolution in this pull request for you to handle, so you can gain some experience with it. Once you've completed the process, please let me know, and I will review and approve it. |
OK, I found these answers: 1) https://bundler.io/guides/faq.html A: Yes, you should commit it. The presence of a Gemfile.lock in a gem’s repository ensures that a fresh checkout of the repository uses the exact same set of dependencies every time. We believe this makes repositories more friendly towards new and existing contributors. Ideally, anyone should be able to clone the repo, run bundle install, and have passing tests. If you don’t check in your Gemfile.lock, new contributors can get different versions of your dependencies, and run into failing tests that they don’t know how to fix. **2)**https://www.viget.com/articles/bundler-best-practices/ More people advice to keep lock file in your repo. I am not able to say if we can compare gem and mix. |
8b2e7d1
to
9acbb99
Compare
I solved the conflict @Glutexo. It should be fine now, but diff is little bit strange |
9acbb99
to
f0786a2
Compare
I've also solved strange diff, dependecies have not been in order. @Glutexo |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great job, the conflicts have been resolved and the tests are passing on my machine. Thank you for your patience, even though this work might have seemed unnecessary in the context of the related issue #167, which will overwrite these changes.
Updated dependecies by
mix deps.update
by that commandmix.lock
changed. Before merge consider Issue #160