You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
The master branch has in-development code which is only expected to be compatible with the most recent development version of the main library, running on stretch. If that isn't you, use ev3dev-jessie with the jessie branch of this repo.
@WasabiFan This is a valid point, though it causes quite some pain. Is there an easy way to offer a more recent build (daily or weekly) on ev3dev.org/docs/getting-started? I would find it logical if the canonical source for installing ev3dev and the canonical source for demos of the very same would somehow match. It should be easy to get the demos running.
A more recent build of what? The only thing made available on that page is a link to an ev3dev-jessie download, which is the currently-recommended ev3dev version.
... which doesn't match the demos in this repository.
If we want to support newcomers we ought to make sure there are no obstacles in the way to make demos run. When demos run only on stretch it should be easy to install ev3dev based on stretch. If ev3dev based on jessie is still recommended the demos that run only on stretch should be in a development or feature branch. Simple as that.
The demos for Jessie are in the jessie branch. This repository was established after the switch to focusing on Stretch so it has never had content or explanations written for Jessie. Is your complaint that jessie isn't the default branch? That's not something I can change, but perhaps @dwalton76 can.
I think it should be the other way round: master should have Jessie and a stretch branch should have the new features for the upcoming stable ev3dev image, which is not yet recommended for beginners.
This would avoid issues like the ones with were faced with today.
If there's a wish to change branch names, we should follow the convention used elsewhere in ev3dev: have jessie and stretch branches without an ambiguous master. The solution to your problem, however, is to change the default branch to match the current primary ev3dev version.
Then let's do it! Rename master to stretch and make jessie the default branch.
Note that this is not my problem, but I see that this is a pitfall for newcomers. There should be no guessing why things don't "just work" out of the box.
the master branch is the default, it is designed to work with stretch
there is a also a jessie branch
Agreed this is really confusing 👎 Proposal of things we should do
ev3dev-lang-python delete as many stale repositories as we can and see where that leaves us
ev3dev-lang-python rename develop to stretch
ev3dev-lang-python can we delete master since we already have a jessie branch?
ev3dev-lang-python-demo rename master to stretch
Make all three of these repos agree on their default (jessie vs stretch). ev3dev defaults to jessie while ev3dev-lang-python and ev3dev-lang-python-demo default to stretch. @dlech what are your thoughts on this, are you close to switching the default in ev3dev to stretch?
more branches than I care to type out here, many are stale. @WasabiFan@ddemidov are any of these we can delete?
👍 I just deleted a variety of branches that had been merged previously, so it should be a bit cleaner.
Agreed this is really confusing 👎 Proposal of things we should do
I agree with that plan. I'm not entirely sure what the master branch in ev3dev-lang-python was for, but it points to the same ref as jessie right now anyway.
Make all three of these repos agree on their default (jessie vs stretch).
I think we should default to jessie until it is no longer the primary recommended platform.
You will need to jump through some hoops to get the branches of your fork of ev3dev-lang-python-demo to match exactly. If you do not have any outstanding work in your fork, do not have any stars, etc the easiest thing to do is just delete your fork and re-fork ev3dev-lang-python-demo.
If you do have stars, etc you'll have to google around a bit to find the git commands to make your branches match with the parent repo....I don't now what they are off the top of my head. I did not have any stars so I just deleted my repo and re-forked.
Activity
WasabiFan commentedon Feb 8, 2018
The master branch has in-development code which is only expected to be compatible with the most recent development version of the main library, running on stretch. If that isn't you, use ev3dev-jessie with the
jessiebranch of this repo.bittner commentedon Feb 8, 2018
@WasabiFan This is a valid point, though it causes quite some pain. Is there an easy way to offer a more recent build (daily or weekly) on ev3dev.org/docs/getting-started? I would find it logical if the canonical source for installing ev3dev and the canonical source for demos of the very same would somehow match. It should be easy to get the demos running.
WasabiFan commentedon Feb 8, 2018
A more recent build of what? The only thing made available on that page is a link to an ev3dev-jessie download, which is the currently-recommended ev3dev version.
bittner commentedon Feb 8, 2018
... which doesn't match the demos in this repository.
If we want to support newcomers we ought to make sure there are no obstacles in the way to make demos run. When demos run only on stretch it should be easy to install ev3dev based on stretch. If ev3dev based on jessie is still recommended the demos that run only on stretch should be in a development or feature branch. Simple as that.
WasabiFan commentedon Feb 9, 2018
The demos for Jessie are in the jessie branch. This repository was established after the switch to focusing on Stretch so it has never had content or explanations written for Jessie. Is your complaint that jessie isn't the default branch? That's not something I can change, but perhaps @dwalton76 can.
bittner commentedon Feb 9, 2018
Exactly.
I think it should be the other way round:
mastershould have Jessie and astretchbranch should have the new features for the upcoming stable ev3dev image, which is not yet recommended for beginners.This would avoid issues like the ones with were faced with today.
WasabiFan commentedon Feb 9, 2018
If there's a wish to change branch names, we should follow the convention used elsewhere in ev3dev: have
jessieandstretchbranches without an ambiguousmaster. The solution to your problem, however, is to change the default branch to match the current primary ev3dev version.bittner commentedon Feb 9, 2018
Then let's do it! Rename
mastertostretchand makejessiethe default branch.Note that this is not my problem, but I see that this is a pitfall for newcomers. There should be no guessing why things don't "just work" out of the box.
dwalton76 commentedon Feb 9, 2018
I can rename branches this weekend
dwalton76 commentedon Feb 14, 2018
ok so we have
ev3dev
https://github.com/ev3dev/ev3dev
ev3dev-lang-python
https://github.com/ev3dev/ev3dev-lang-python/branches
developis the default branch which is designed to work with stretchmasterandjessiebranchesev3dev-lang-python-demo
https://github.com/ev3dev/ev3dev-lang-python-demo
masterbranch is the default, it is designed to work with stretchjessiebranchAgreed this is really confusing 👎 Proposal of things we should do
developtostretchmastersince we already have ajessiebranch?mastertostretchWasabiFan commentedon Feb 14, 2018
👍 I just deleted a variety of branches that had been merged previously, so it should be a bit cleaner.
I agree with that plan. I'm not entirely sure what the master branch in ev3dev-lang-python was for, but it points to the same ref as
jessieright now anyway.I think we should default to jessie until it is no longer the primary recommended platform.
dwalton76 commentedon Feb 15, 2018
Defaulting everything to jessie sounds good to me
dwalton76 commentedon Mar 3, 2018
@WasabiFan @ddemidov @gregcowell @bittner @dlech FYI made the following branch changes to ev3dev-lang-python-demo:
jessiemastertostretchYou will need to jump through some hoops to get the branches of your fork of ev3dev-lang-python-demo to match exactly. If you do not have any outstanding work in your fork, do not have any stars, etc the easiest thing to do is just delete your fork and re-fork ev3dev-lang-python-demo.
If you do have stars, etc you'll have to google around a bit to find the git commands to make your branches match with the parent repo....I don't now what they are off the top of my head. I did not have any stars so I just deleted my repo and re-forked.
bittner commentedon Mar 4, 2018
Looks good to me.
@jimpanseiscool Can you close this issue?