Development for Gramps 6.1

Development
1

@Nick-Hall At what point do we update master with the changes from maintenance/gramps60 so that we can begin work on Gramps 6.1?

2

I merge the maintenance branch into master on a regular basis. I donā€™t think that there is much to merge at the moment, but I can do another merge tomorrow.

1 Like
3

Thanks! There are the 6.0.4 fixes.

4

Iā€™ve merged the gramps60 branch into master, but we are getting some optimizer unit tests failing.

1 Like
5

Iā€™ll take a look ā€¦ā€¦..

2 Likes
6

Shouldnā€™t master and maintenance/gramps60 be the same?

cd gramps
git checkout master
git pull
git checkout maintenance/gramps60
git pull
git checkout master
git diff maintenance/gramps60

That gives a couple of thousand lines of changes.

7

They wonā€™t be exactly the same because we have made some changes to master after the v6.0 release.

The merge looked good with a couple of dozen files updated and only 2 conflicts. I expect to revert changes to the version.py file, and this time it warned me about the change to the setup.py file. The setup.py file has been replaced by pyproject.toml to I will have to make that change manually.

8

Hi
Yesterday I created a topic under help about issues with creating 6.0.4
from source using setup.py as per the install instructions does this in
anyway relate to the pyproject.toml you are referring to.
phil

9

Thanks, got it. Found the issue: a change in the way that TEST_DIR is defined.

1 Like
10

No, this was just a test path issue for development.