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.

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 requirements-extra.txt Trains package to release version #1226

Closed
wants to merge 0 commits into from

Conversation

bmartinn
Copy link
Contributor

@bmartinn bmartinn commented Mar 24, 2020

@Borda , I noticed the requirements-extra.txt points to an RC version of Trains.
Since if in a requirements.txt the minimum version is an RC version, pip will always pull the latest pre-release version. I don't think this is what we want, especially with the CI :)
I fixed requirements-extra.txt to point to the latest released version.

Apologies for the mess ...

EDIT:
For the sake of completeness, I also added a reference to Trains in the README visualization section

@Borda
Copy link
Member

Borda commented Mar 24, 2020

@bmartinn Thx, it seems that you worked with some older version...
could you please rebase on on actual master?

@Borda Borda added the docs Documentation related label Mar 24, 2020
@Borda Borda added this to the 0.7.2 milestone Mar 24, 2020
@bmartinn
Copy link
Contributor Author

bmartinn commented Mar 24, 2020

@Borda, I already just (2 hours ago) merged the latest Master branch into my branch and pushed the PR.
GitHub somehow shows previous commits that are unrelated...
Am I missing something ?

@Borda
Copy link
Member

Borda commented Mar 24, 2020

that is the difference between merge and rebase... merge just add the missing commits to your branch... on the other hand, rebase takes mater and place your commit on the top so the diff shows just the newly added commits, pls see https://medium.com/datadriveninvestor/git-rebase-vs-merge-cc5199edd77c
image

@bmartinn
Copy link
Contributor Author

bmartinn commented Mar 24, 2020

@Borda, my deepest apologizes, I can totally see my mistake. Let me see if I can fix it...

EDIT:
A clean PR here

@Borda
Copy link
Member

Borda commented Mar 24, 2020

@bmartinn no need for an apology! I meant it just as friendly advice and we thank you for you contribution!

@Borda Borda removed this from the 0.7.2 milestone Mar 24, 2020
@Borda
Copy link
Member

Borda commented Mar 24, 2020

another FRIENDLY advice, there is no need to creating new Prs, after the rebase you just git push --force to the actual branch and it updates the PR :]

@bmartinn
Copy link
Contributor Author

Actually the PR closed automatically the minute I forced pushed the upstream/master head (I guess since the original PR commit id was deleted ...)

@Borda
Copy link
Member

Borda commented Mar 25, 2020

yeah, true it closes if the content is identical, so it is better to push it after rebase... it is also possible to reopen it but never mind, let's continue :]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs Documentation related
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants