Changes for #311 #312

nackko · 2018-03-21T21:47:23Z

My first attempt at contributing. (Full disclosure https://github.com/f8full/findmybikes)

I tried to resolve the issue I opened regarding the use of a GBFS feed instead of an XML one for the Montréal Bixi system in Québec, Canada

@eskerda obviously I didn't know I could add a comment before submitting a pull request (it also IS my first github PR #proud), sry for the double tagging !

Of course I'll undertake any further required changes or tests, please let me know

Cheers,

F.

-added bixi-montreal (modeled on bixi-toronto) Relates to eskerda#311, some more work must be done somewhere to remove the old parsing though

-removed Bixi Montréal from bixi.json My guess is that removes the XML parsing from the system. Next commit will remove the XML scapper code

-removed XML feed scrapper No other pertinent pieces of code could be found searching keyword 'bixi' : https://github.com/eskerda/pybikes/search?utf8=%E2%9C%93&q=bixi&type=

nackko

I meant parser. Doh !

eskerda

Hello @f8full , thanks for the contribution!

Please review the comments. The only thing left to do is to undo the deleting of bixi.py. All the other changes look good and ready to merge.

eskerda · 2018-03-23T00:20:14Z

pybikes/bixi.py

-            'public': utils.str2bool(data['public']),
-            'latestUpdateTime': data['latestUpdateTime']
-        }
-        return station


This file cannot be deleted yet. Other systems (these are present on pybikes/data/bixi.json) are using it.

Ooopsy
I learnt my lesson
nackko@7c3cdf9

someday I may write a parser for this file that would feed pybikes
https://github.com/NABSA/gbfs/blob/master/systems.csv

cheers,

eskerda · 2018-03-23T00:20:34Z

pybikes/data/bixi.json

-            },
-            "feed_url": "https://montreal.bixi.com/data/bikeStations.xml",
-            "format": "xml"
-        },


eskerda · 2018-03-23T00:20:45Z

pybikes/data/gbfs.json

+                ]
+            },
+            "feed_url": "https://api-core.bixi.com/gbfs/gbfs.json"
+        },


This reverts commit 7f043af.

nackko · 2018-03-23T00:48:22Z

I think
nackko@7c3cdf9
should do the trick, thks GitHub desktop !

eskerda · 2018-03-23T15:11:19Z

Looks good. Now the problem with that revert commit is that the whole git blame on bixi.py points to you, for no particular reason.

Revert commits are good for reverting things that have already landed master or some downstream projects, but in this case, being a PR, there's no reason for not rewriting history and doing a force push.

There are many ways you can do this if you want. If not, I can cherry-pick the needed commits on a branch and merge it myself, but I think it's always interesting to learn git the hard way :) So, here's how you can get that fixed:

(Easy) Reset hard to origin/master and cherry pick commits

Since you are doing these changes on your master, you cannot reset hard into origin master, but you can rewind the head to the latest commit here

# This will put your head the same as the current pybikes head
git reset --hard 9d35934a3155c5b709c4039481ca31463006101f 
# The changes you did, however, are still somewhere so you can cherry pick them
git cherry-pick e6741000d5bbb8b38e44294e53975c31b28086e9
git cherry-pick 1d12a62377e018c3aa1caf2dad59e12867b8b84c

Now force push your repo, this PR should get updated.

git push -f origin master

(Medium) Use git rebase interactive

Simply

git rebase -i HEAD~4

Now it will show a screen with 4 commits, you want to remove from there the ones you are not interested into (the last two lines). This is the reason why you usually want to give git commits descriptive messages. So you can know what this commit does without having to read the description or the changes it does.

Again, force push that, and this PR should get updated.

A note on working on master

Usually, avoid working on master, and instead work on a feature branch. A branch can be created like

git checkout -b my-feature-branch-name

After this, you are on a different branch, you can play on that branch, commit things, and whenever you go back to master, things will be like they were before

git checkout master

You can list the branches that you have by

git branch

You can switch between branches the same way

git checkout my-feature-branch-name

You would then push that feature branch onto your repo, and then follow the usual way to create a pull request.

The idea behind this is, usually, that you want master to be the same (or not up to date) to mine, and try to avoid diverging from there. Also, unless justified, you should never force push on master, since you could leave other people that had your master on a detached state.

eskerda

See my comment on fixing the history on this PR

nackko · 2018-03-24T19:05:39Z

Just opened #313 by branching correctly as you described. I'll fix my repo using the great guidance you shared, thks for that !

Fabrice V added 3 commits March 21, 2018 17:27

eskerda#311 Use GBFS feed for Bixi Montréal system

e674100

-added bixi-montreal (modeled on bixi-toronto) Relates to eskerda#311, some more work must be done somewhere to remove the old parsing though

eskerda#311 Use GBFS feed for Bixi Montréal system

1d12a62

-removed Bixi Montréal from bixi.json My guess is that removes the XML parsing from the system. Next commit will remove the XML scapper code

eskerda#311 Use GBFS feed for Bixi Montréal system

7f043af

-removed XML feed scrapper No other pertinent pieces of code could be found searching keyword 'bixi' : https://github.com/eskerda/pybikes/search?utf8=%E2%9C%93&q=bixi&type=

This was referenced Mar 21, 2018

Use GBFS feed for Bixi Montréal system #311

Closed

Vetting of PR #92, V1.1 before merge MobilityData/gbfs#93

Closed

nackko commented Mar 22, 2018

View reviewed changes

eskerda requested changes Mar 23, 2018

View reviewed changes

Revert "eskerda#311 Use GBFS feed for Bixi Montréal system"

7c3cdf9

This reverts commit 7f043af.

eskerda requested changes Mar 23, 2018

View reviewed changes

nackko closed this Mar 24, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Changes for #311 #312

Changes for #311 #312

nackko commented Mar 21, 2018

nackko left a comment

eskerda left a comment

eskerda Mar 23, 2018

nackko Mar 23, 2018

eskerda Mar 23, 2018

eskerda Mar 23, 2018

nackko commented Mar 23, 2018 •

edited

Loading

eskerda commented Mar 23, 2018 •

edited

Loading

eskerda left a comment

nackko commented Mar 24, 2018 •

edited

Loading

Changes for #311 #312

Changes for #311 #312

Conversation

nackko commented Mar 21, 2018

nackko left a comment

Choose a reason for hiding this comment

eskerda left a comment

Choose a reason for hiding this comment

eskerda Mar 23, 2018

Choose a reason for hiding this comment

nackko Mar 23, 2018

Choose a reason for hiding this comment

eskerda Mar 23, 2018

Choose a reason for hiding this comment

eskerda Mar 23, 2018

Choose a reason for hiding this comment

nackko commented Mar 23, 2018 • edited Loading

eskerda commented Mar 23, 2018 • edited Loading

(Easy) Reset hard to origin/master and cherry pick commits

(Medium) Use git rebase interactive

A note on working on master

eskerda left a comment

Choose a reason for hiding this comment

nackko commented Mar 24, 2018 • edited Loading

nackko commented Mar 23, 2018 •

edited

Loading

eskerda commented Mar 23, 2018 •

edited

Loading

nackko commented Mar 24, 2018 •

edited

Loading