Rev 3284: Add PyPI metadata to setup.py, and use shorter version numbers in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sun Mar 16 10:50:04 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3284
revision-id:pqm at pqm.ubuntu.com-20080316104950-lk2bdr7v3p02bzh1
parent: pqm at pqm.ubuntu.com-20080316022632-ffx10piei10k7k7d
parent: mbp at sourcefrog.net-20080316082521-xmex8wq1uyj6cxyh
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2008-03-16 10:49:50 +0000
message:
Add PyPI metadata to setup.py, and use shorter version numbers
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3185.1.13
revision-id:mbp at sourcefrog.net-20080316082521-xmex8wq1uyj6cxyh
parent: mbp at sourcefrog.net-20080316081603-9rnm6ezzo15t6g7l
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: setup_py
timestamp: Sun 2008-03-16 19:25:21 +1100
message:
Fix doctest syntax
modified:
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3185.1.12
revision-id:mbp at sourcefrog.net-20080316081603-9rnm6ezzo15t6g7l
parent: mbp at sourcefrog.net-20080316010308-p0aaf3xs8na9x9zc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: setup_py
timestamp: Sun 2008-03-16 19:16:03 +1100
message:
Restore bzrlib.version_string variable
modified:
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3185.1.11
revision-id:mbp at sourcefrog.net-20080316010308-p0aaf3xs8na9x9zc
parent: mbp at sourcefrog.net-20080316002848-k15ig4yowukkbv1d
parent: pqm at pqm.ubuntu.com-20080315223418-lzsk2wwoz9f56awd
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: setup_py
timestamp: Sun 2008-03-16 12:03:08 +1100
message:
Resolve news conflicts
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
------------------------------------------------------------
revno: 3185.1.10
revision-id:mbp at sourcefrog.net-20080316002848-k15ig4yowukkbv1d
parent: mbp at sourcefrog.net-20080316002635-gkyntik4e696526w
parent: pqm at pqm.ubuntu.com-20080315174441-l8xpw6femn0syal1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: setup_py
timestamp: Sun 2008-03-16 11:28:48 +1100
message:
Merge trunk
removed:
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
index.txt index.txt-20071121073725-0corxykv5irjal00-1
added:
bzrlib/directory_service.py directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
bzrlib/tests/tree_implementations/test_annotate_iter.py test_annotate_iter.p-20080315092519-h4dc43rntmfmq16d-1
doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
doc/en/admin-guide/ docenadminguide-20080305135054-y7y2c986yf94zljn-1
doc/en/admin-guide/index.txt index.txt-20080305140741-ecw0lap8dxkxc05g-1
doc/en/user-guide/revnos.txt revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
tools/package_mf.py package_mf.py-20080206141953-323gd0qb2z3tn5pc-1
renamed:
bzrlib/plugins/launchpad/lp_indirect.py => bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_indirect.py => bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_nonascii.py testnonascii.py-20051018022645-ea1d8b6477b058a6
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_registry.py test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/configobj/docs/BSD-LICENSE.txt BSDLICENSE.txt-20051018184548-29b89ff3102657f5
bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
bzrlib/version_info_formats/format_custom.py format_custom.py-20071029100350-ajovqhbpb5khf6gu-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
------------------------------------------------------------
revno: 3185.1.9
revision-id:mbp at sourcefrog.net-20080316002635-gkyntik4e696526w
parent: mbp at sourcefrog.net-20080117071430-6f8pb4q3ixtz3gyz
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: setup_py
timestamp: Sun 2008-03-16 11:26:35 +1100
message:
Show short version in a more terse form, like "1.2dev"
modified:
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3185.1.8
revision-id:mbp at sourcefrog.net-20080117071430-6f8pb4q3ixtz3gyz
parent: mbp at sourcefrog.net-20080117071324-w6ta4vzprpl4ouas
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: setup_py
timestamp: Thu 2008-01-17 18:14:30 +1100
message:
Call candidate releases rc, consistent with our practice
modified:
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3185.1.7
revision-id:mbp at sourcefrog.net-20080117071324-w6ta4vzprpl4ouas
parent: mbp at sourcefrog.net-20080117070223-16c0n9qtb7ac2rza
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: setup_py
timestamp: Thu 2008-01-17 18:13:24 +1100
message:
Always take README text from the right directory (thanks jam)
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3185.1.6
revision-id:mbp at sourcefrog.net-20080117070223-16c0n9qtb7ac2rza
parent: mbp at sourcefrog.net-20080117065910-n2jbm4xxvxmdhvwk
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: setup_py
timestamp: Thu 2008-01-17 18:02:23 +1100
message:
Document shorter version numbers
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3185.1.5
revision-id:mbp at sourcefrog.net-20080117065910-n2jbm4xxvxmdhvwk
parent: mbp at sourcefrog.net-20080117065852-oozn9ewcibv76s4w
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: setup_py
timestamp: Thu 2008-01-17 17:59:10 +1100
message:
Use a shorter version number, and check that it makes sense.
modified:
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3185.1.4
revision-id:mbp at sourcefrog.net-20080117065852-oozn9ewcibv76s4w
parent: mbp at sourcefrog.net-20080116013357-kq1rx9lxgng1fcke
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: setup_py
timestamp: Thu 2008-01-17 17:58:52 +1100
message:
doc
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3185.1.3
revision-id:mbp at sourcefrog.net-20080116013357-kq1rx9lxgng1fcke
parent: mbp at sourcefrog.net-20080116013046-q7fjh2vtr1wltimk
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: setup_py
timestamp: Wed 2008-01-16 12:33:57 +1100
message:
Take long package description from README rather than duplicating it
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3185.1.2
revision-id:mbp at sourcefrog.net-20080116013046-q7fjh2vtr1wltimk
parent: mbp at sourcefrog.net-20080116013017-7js5xni7kc3wf1qu
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: setup_py
timestamp: Wed 2008-01-16 12:30:46 +1100
message:
Add more metadata to setup.py (#183391)
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3185.1.1
revision-id:mbp at sourcefrog.net-20080116013017-7js5xni7kc3wf1qu
parent: pqm at pqm.ubuntu.com-20080115235859-r1zm2a49cqjfnl2b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: setup_py
timestamp: Wed 2008-01-16 12:30:17 +1100
message:
Fix ReST indents in README
modified:
README README-20050309040720-8f368abf9f346b9d
=== modified file 'NEWS'
--- a/NEWS 2008-03-15 22:34:18 +0000
+++ b/NEWS 2008-03-16 01:03:08 +0000
@@ -31,6 +31,9 @@
* Restore auto-detection of plink.exe on Windows. (Dmitry Vasiliev)
+ * Version number is now shown as "1.2" or "1.2pr2", without zeroed or
+ missing final fields. (Martin Pool)
+
* The backup directory created by ``upgrade`` is now called
``backup.bzr``, not ``.bzr.backup``. (Martin Albisetti)
=== modified file 'README'
--- a/README 2008-01-04 00:42:06 +0000
+++ b/README 2008-01-16 01:30:17 +0000
@@ -26,44 +26,44 @@
Bazaar highlights
=================
- * Easy to use and intuitive.
-
- Only five commands are needed to do all basic operations, and all
- commands have documentation accessible via 'bzr help command'.
- Bazaar's interface is also easy to learn for CVS and Subversion users.
-
- * Robust and reliable.
-
- Bazaar is developed under an extensive test suite. Branches can be
- checked and verified for integrity at any time, and revisions can be
- signed with PGP/GnuPG.
-
- * Publish branches with HTTP.
-
- Branches can be hosted on an HTTP server with no need for special
- software on the server side. Branches can be uploaded by bzr itself
- over SSH (SFTP), or with rsync.
-
- * Adapts to multiple environments.
-
- Bazaar runs on Linux and Windows, fully supports Unicode filenames,
- and suits different development models, including centralized.
-
- * Easily extended and customized.
-
- A rich Python interface is provided for extending and embedding,
- including a plugin interface. There are already many available plugins,
- most of them registered at http://bazaar-vcs.org/PluginRegistry.
-
- * Smart merging.
-
- Changes will never be merged more than once, conflicts will be
- minimized, and identical changes are dealt with well.
-
- * Vibrant and active community.
-
- Help with Bazaar is obtained easily, via the mailing list, or the IRC
- channel.
+* Easy to use and intuitive.
+
+ Only five commands are needed to do all basic operations, and all
+ commands have documentation accessible via 'bzr help command'.
+ Bazaar's interface is also easy to learn for CVS and Subversion users.
+
+* Robust and reliable.
+
+ Bazaar is developed under an extensive test suite. Branches can be
+ checked and verified for integrity at any time, and revisions can be
+ signed with PGP/GnuPG.
+
+* Publish branches with HTTP.
+
+ Branches can be hosted on an HTTP server with no need for special
+ software on the server side. Branches can be uploaded by bzr itself
+ over SSH (SFTP), or with rsync.
+
+* Adapts to multiple environments.
+
+ Bazaar runs on Linux and Windows, fully supports Unicode filenames,
+ and suits different development models, including centralized.
+
+* Easily extended and customized.
+
+ A rich Python interface is provided for extending and embedding,
+ including a plugin interface. There are already many available plugins,
+ most of them registered at http://bazaar-vcs.org/PluginRegistry.
+
+* Smart merging.
+
+ Changes will never be merged more than once, conflicts will be
+ minimized, and identical changes are dealt with well.
+
+* Vibrant and active community.
+
+ Help with Bazaar is obtained easily, via the mailing list, or the IRC
+ channel.
Registration and Feedback
@@ -72,19 +72,19 @@
If you encounter any problems with Bazaar, need help understanding it, or would
like to offer suggestions or feedback, please get in touch with us:
- * Ask a question through our web support interface, at
- https://answers.launchpad.net/bzr/
-
- * Report bugs at https://bugs.edge.launchpad.net/bzr/+filebug
-
- * Write to us at bazaar at lists.canonical.com
- You can join the list at <https://lists.ubuntu.com/mailman/listinfo/bazaar>.
- You don't need to subscribe to post, but your first post will be held
- briefly for manual moderation.
-
- * Talk to us in irc://irc.ubuntu.com/bzr
-
- * And see http://bazaar-vcs.org/BzrSupport for more.
+* Ask a question through our web support interface, at
+ https://answers.launchpad.net/bzr/
+
+* Report bugs at https://bugs.edge.launchpad.net/bzr/+filebug
+
+* Write to us at bazaar at lists.canonical.com
+ You can join the list at <https://lists.ubuntu.com/mailman/listinfo/bazaar>.
+ You don't need to subscribe to post, but your first post will be held
+ briefly for manual moderation.
+
+* Talk to us in irc://irc.ubuntu.com/bzr
+
+* And see http://bazaar-vcs.org/BzrSupport for more.
If you would like to help us improve Bazaar by telling us about yourself and
what we could do better, please register and complete the online survey here:
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2008-02-25 07:28:29 +0000
+++ b/bzrlib/__init__.py 2008-03-16 08:25:21 +0000
@@ -46,11 +46,48 @@
# API compatibility version: bzrlib is currently API compatible with 0.18.
api_minimum_version = (0, 18, 0)
-if version_info[3] == 'final':
- version_string = '%d.%d.%d' % version_info[:3]
-else:
+def _format_version_tuple(version_info):
+ """Turn a version number 5-tuple into a short string.
+
+ This format matches <http://docs.python.org/dist/meta-data.html>
+ and the typical presentation used in Python output.
+
+ This also checks that the version is reasonable: the sub-release must be
+ zero for final releases, and non-zero for alpha, beta and preview.
+
+ >>> print _format_version_tuple((1, 0, 0, 'final', 0))
+ 1.0
+ >>> print _format_version_tuple((1, 2, 0, 'dev', 0))
+ 1.2dev
+ >>> print _format_version_tuple((1, 1, 1, 'candidate', 2))
+ 1.1.1rc2
+ """
+ if version_info[2] == 0:
+ main_version = '%d.%d' % version_info[:2]
+ else:
+ main_version = '%d.%d.%d' % version_info[:3]
+
+ __release_type = version_info[3]
+ __sub = version_info[4]
+
+ # check they're consistent
+ if __release_type == 'final' and __sub == 0:
+ __sub_string = ''
+ elif __release_type == 'dev' and __sub == 0:
+ __sub_string = 'dev'
+ elif __release_type in ('alpha', 'beta') and __sub != 0:
+ __sub_string = __release_type[0] + str(__sub)
+ elif __release_type == 'candidate' and __sub != 0:
+ __sub_string = 'rc' + str(__sub)
+ else:
+ raise AssertionError("version_info %r not valid" % version_info)
+
version_string = '%d.%d.%d.%s.%d' % version_info
-__version__ = version_string
+ return main_version + __sub_string
+
+__version__ = _format_version_tuple(version_info)
+version_string = __version__
+
# allow bzrlib plugins to be imported.
import bzrlib.plugin
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2008-03-06 14:12:45 +0000
+++ b/bzrlib/tests/__init__.py 2008-03-16 00:28:48 +0000
@@ -111,6 +111,7 @@
MODULES_TO_TEST = []
MODULES_TO_DOCTEST = [
+ bzrlib,
bzrlib.timestamp,
bzrlib.errors,
bzrlib.export,
=== modified file 'setup.py'
--- a/setup.py 2008-03-11 08:49:42 +0000
+++ b/setup.py 2008-03-16 00:28:48 +0000
@@ -7,25 +7,55 @@
"""
import os
+import os.path
import sys
if sys.version_info < (2, 4):
sys.stderr.write("[ERROR] Not a supported Python version. Need 2.4+\n")
sys.exit(1)
+# NOTE: The directory containing setup.py, whether run by 'python setup.py' or
+# './setup.py' or the equivalent with another path, should always be at the
+# start of the path, so this should find the right one...
import bzrlib
+def get_long_description():
+ dirname = os.path.dirname(__file__)
+ readme = os.path.join(dirname, 'README')
+ f = open(readme, 'rb')
+ try:
+ return f.read()
+ finally:
+ f.close()
+
+
##
# META INFORMATION FOR SETUP
-
-META_INFO = {'name': 'bzr',
- 'version': bzrlib.__version__,
- 'author': 'Canonical Ltd',
- 'author_email': 'bazaar at lists.canonical.com',
- 'url': 'http://www.bazaar-vcs.org/',
- 'description': 'Friendly distributed version control system',
- 'license': 'GNU GPL v2',
- }
+# see http://docs.python.org/dist/meta-data.html
+META_INFO = {
+ 'name': 'bzr',
+ 'version': bzrlib.__version__,
+ 'author': 'Canonical Ltd',
+ 'author_email': 'bazaar at lists.canonical.com',
+ 'url': 'http://www.bazaar-vcs.org/',
+ 'description': 'Friendly distributed version control system',
+ 'license': 'GNU GPL v2',
+ 'download_url': 'http://bazaar-vcs.org/Download',
+ 'long_description': get_long_description(),
+ 'classifiers': [
+ 'Development Status :: 6 - Mature',
+ 'Environment :: Console',
+ 'Intended Audience :: Developers',
+ 'Intended Audience :: System Administrators',
+ 'License :: OSI Approved :: GNU General Public License (GPL)',
+ 'Operating System :: Microsoft :: Windows',
+ 'Operating System :: OS Independent',
+ 'Operating System :: POSIX',
+ 'Programming Language :: Python',
+ 'Programming Language :: C',
+ 'Topic :: Software Development :: Version Control',
+ ],
+ }
# The list of packages is automatically generated later. Add other things
# that are part of BZRLIB here.
More information about the bazaar-commits
mailing list