[Biopython-dev] Biopython 1.56 release plans

[Peter]

2010/11/5 Tiago Antão <tiagoantao at gmail.com>:
> 2010/11/5 Peter <biopython at maubp.freeserve.co.uk>:
>> If you agree the rebased branch is sane, it should be trivial to
>> now merge that onto the master as a fast-forward merge.
>> (But I would check first that the master hasn't changed, and
>> if it has, repeat the rebase).
>
> Many thanks for the guide, maybe in the future I will have the
> courage to do it myself.
>
> Go ahead and commit the changes. I will make sure the module
> is sane this Sunday.

Done. The master hadn't changed in the meantime so I didn't
have to re-rebase:

$ git checkout master
Switched to branch "master"
$ git merge tiago-pop-gen
Updating 065e235..4f318a4
Fast forward
 Bio/PopGen/FDist/Async.py            |   21 +-
 Bio/PopGen/FDist/Controller.py       |  125 +-
 Bio/PopGen/FDist/Utils.py            |   68 +-
 Bio/PopGen/FDist/__init__.py         |    1 -
 Bio/PopGen/GenePop/EasyController.py |   10 +-
 Bio/PopGen/GenePop/FileParser.py     |   69 +-
 Tests/PopGen/data_dfst_outfile       |  300 +
 Tests/PopGen/dfdist1                 | 1204 +
 Tests/PopGen/dout.cpl                |  300 +
 Tests/PopGen/dout.dat                |50000 ++++++++++++++++++++++++++++++++++
 Tests/test_PopGen_DFDist.py          |  106 +
 Tests/test_PopGen_FDist_nodepend.py  |   20 +-
 12 files changed, 52176 insertions(+), 48 deletions(-)
 create mode 100644 Tests/PopGen/data_dfst_outfile
 create mode 100644 Tests/PopGen/dfdist1
 create mode 100644 Tests/PopGen/dout.cpl
 create mode 100644 Tests/PopGen/dout.dat
 create mode 100644 Tests/test_PopGen_DFDist.py

Then publishing it,

$ git push origin master
Counting objects: 120, done.
Delta compression using 8 threads.
Compressing objects: 100% (106/106), done.
Writing objects: 100% (106/106), 133.46 KiB, done.
Total 106 (delta 79), reused 0 (delta 0)
To git at github.com:biopython/biopython.git
   065e235..4f318a4  master -> master

And removing my now pointless public branch:

$ git push peterjc :tiago-pop-gen
To git at github.com:peterjc/biopython.git
 - [deleted]         tiago-pop-gen

We need to update the NEWS file now.

Peter