Restructure the code about python-dali HOT 6 CLOSED

I've started this process in a separate branch, caiwan:dev

from python-dali.

I see the first thing you did in this branch was merge from my master. Can I suggest you rebase on my master instead? That'll make the history look a lot more understandable, and give me the possibility of using your commits as they are without merging or cherry-picking.

from python-dali.

I don't really know how to do so, that is the problem. I'm using git for years, and I'm still a newbie.

Anyway, I changed things a bit around: commands/ and interface/ also goes into dali/ folder.

from python-dali.

Hmm. Looking at the history at the moment, I think it's probably best if you start again from my current master - it has all the changes you made apart from the __unicode__ / __str__ ones that we're not keeping, and which you got rid of when you merged from my master.

On the command line it'll be something like this (starting in your branch 'dev'):

git fetch upstream
git checkout -b newdev upstream/master
git cherry-pick dev

You are now in a branch "newdev" with your commit from dev applied on top of my current master.

You could then do:

git branch -d dev
git checkout -b dev

Then you can push it to github. The first time you push you have to force it, because you're not pushing on top of what github currently sees as the dev branch.

from python-dali.

I suggest you don't work on moving things around at the moment, though, because that will make the other changes that you make difficult to compare to my tree.

The "device.py" file definitely doesn't belong with the device driver and daliserver interface; ultimately it will go in its own subpackage along with "bus.py".

I'm not sure about "address.py" yet. Some of the addressing concepts are shared between control gear and control devices, although the address spaces are separate; it may still make sense to have this shared between the two.

Before each commit, please would you check that the unit tests still pass with python -m unittest discover.

from python-dali.

I guess this issue can be closed in favour of #21

from python-dali.