lp:~smoser/ubuntu/precise/python-boto/2.1.1

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/precise/python-boto at revision 21

Barry Warsaw (community): Approve on 2011-12-06

Ubuntu branches: Pending requested 2011-11-30

Diff: 20111 lines (+4866/-8215)

125 files modified

MANIFEST.in (+0/-1)
PKG-INFO (+1/-1)
bin/cq (+11/-4)
bin/cwutil (+140/-0)
bin/lss3 (+29/-8)
bin/pyami_sendmail (+6/-1)
bin/s3multiput (+317/-0)
bin/s3put (+0/-196)
bin/sdbadmin (+0/-168)
boto.egg-info/PKG-INFO (+0/-15)
boto.egg-info/SOURCES.txt (+0/-240)
boto.egg-info/dependency_links.txt (+0/-1)
boto.egg-info/top_level.txt (+0/-1)
boto/__init__.py (+56/-14)
boto/auth.py (+16/-6)
boto/cacerts/cacerts.txt (+633/-0)
boto/cloudformation/__init__.py (+25/-0)
boto/cloudformation/connection.py (+223/-0)
boto/cloudformation/stack.py (+289/-0)
boto/cloudformation/template.py (+43/-0)
boto/cloudfront/__init__.py (+7/-4)
boto/cloudfront/distribution.py (+218/-18)
boto/connection.py (+242/-59)
boto/ec2/__init__.py (+2/-0)
boto/ec2/address.py (+12/-3)
boto/ec2/autoscale/__init__.py (+0/-589)
boto/ec2/autoscale/activity.py (+0/-74)
boto/ec2/autoscale/group.py (+0/-290)
boto/ec2/autoscale/instance.py (+0/-60)
boto/ec2/autoscale/launchconfig.py (+0/-186)
boto/ec2/autoscale/request.py (+0/-38)
boto/ec2/blockdevicemapping.py (+18/-9)
boto/ec2/cloudwatch/__init__.py (+0/-621)
boto/ec2/cloudwatch/alarm.py (+104/-34)
boto/ec2/cloudwatch/datapoint.py (+0/-40)
boto/ec2/cloudwatch/metric.py (+0/-80)
boto/ec2/connection.py (+259/-93)
boto/ec2/ec2object.py (+7/-2)
boto/ec2/elb/__init__.py (+0/-440)
boto/ec2/elb/healthcheck.py (+0/-67)
boto/ec2/elb/instancestate.py (+0/-54)
boto/ec2/elb/listelement.py (+0/-31)
boto/ec2/elb/listener.py (+0/-71)
boto/ec2/elb/loadbalancer.py (+0/-193)
boto/ec2/instance.py (+37/-6)
boto/ec2/instanceinfo.py (+0/-47)
boto/ec2/securitygroup.py (+20/-4)
boto/ec2/snapshot.py (+8/-6)
boto/ec2/spotpricehistory.py (+3/-0)
boto/emr/connection.py (+146/-67)
boto/emr/instance_group.py (+21/-11)
boto/emr/step.py (+7/-1)
boto/exception.py (+6/-5)
boto/file/bucket.py (+21/-10)
boto/file/key.py (+38/-7)
boto/fps/connection.py (+39/-19)
boto/gs/bucket.py (+20/-0)
boto/gs/key.py (+54/-0)
boto/gs/resumable_upload_handler.py (+35/-28)
boto/https_connection.py (+4/-1)
boto/iam/connection.py (+21/-7)
boto/iam/summarymap.py (+42/-0)
boto/manage/cmdshell.py (+38/-12)
boto/mashups/iobject.py (+1/-1)
boto/mturk/connection.py (+2/-2)
boto/mturk/question.py (+5/-4)
boto/provider.py (+20/-2)
boto/rds/__init__.py (+67/-43)
boto/roboto/awsqueryrequest.py (+30/-2)
boto/roboto/awsqueryservice.py (+11/-7)
boto/route53/connection.py (+68/-54)
boto/s3/bucket.py (+122/-18)
boto/s3/bucketlistresultset.py (+4/-2)
boto/s3/connection.py (+19/-13)
boto/s3/key.py (+171/-20)
boto/s3/resumable_download_handler.py (+8/-1)
boto/sdb/connection.py (+21/-11)
boto/sdb/db/manager/sdbmanager.py (+24/-7)
boto/sdb/db/model.py (+46/-0)
boto/sdb/db/sequence.py (+2/-2)
boto/sdb/item.py (+3/-5)
boto/ses/__init__.py (+46/-1)
boto/ses/connection.py (+19/-8)
boto/sns/__init__.py (+59/-0)
boto/sns/connection.py (+44/-11)
boto/sqs/connection.py (+71/-48)
boto/storage_uri.py (+56/-6)
boto/sts/__init__.py (+70/-0)
boto/sts/connection.py (+90/-0)
boto/sts/credentials.py (+90/-0)
boto/utils.py (+7/-1)
boto/vpc/__init__.py (+267/-35)
boto/vpc/internetgateway.py (+72/-0)
boto/vpc/routetable.py (+109/-0)
boto/vpc/subnet.py (+5/-2)
debian/changelog (+12/-0)
setup.cfg (+0/-5)
setup.py (+7/-5)
tests/__init__.py (+0/-20)
tests/autoscale/__init__.py (+0/-21)
tests/autoscale/test_connection.py (+0/-95)
tests/db/test_lists.py (+0/-97)
tests/db/test_password.py (+0/-128)
tests/db/test_query.py (+0/-152)
tests/db/test_sequence.py (+0/-109)
tests/devpay/test_s3.py (+0/-177)
tests/ec2/__init__.py (+0/-20)
tests/ec2/test_connection.py (+0/-170)
tests/s3/__init__.py (+0/-20)
tests/s3/cb_test_harnass.py (+0/-71)
tests/s3/mock_storage_service.py (+0/-315)
tests/s3/other_cacerts.txt (+0/-70)
tests/s3/test_connection.py (+0/-189)
tests/s3/test_gsconnection.py (+0/-148)
tests/s3/test_https_cert_validation.py (+0/-137)
tests/s3/test_pool.py (+0/-232)
tests/s3/test_resumable_downloads.py (+0/-557)
tests/s3/test_resumable_uploads.py (+0/-581)
tests/s3/test_versioning.py (+0/-145)
tests/sdb/__init__.py (+0/-20)
tests/sdb/test_connection.py (+0/-118)
tests/sqs/__init__.py (+0/-20)
tests/sqs/test_connection.py (+0/-136)
tests/test.py (+0/-107)
tests/utils/test_password.py (+0/-101)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

22. By Scott Moser on 2011-11-30

update changelog with respect to delta from debian

21. By Scott Moser on 2011-11-30

merge in upstream 2.1.1.

So far I've only taken upstream files, and done so with advice
from #bzr so we can potentially resolve the renamed files issues for the
future (previously, 'bzr diff' would show whole file removes and adds
of the same content).

  $ bzr merge-upstream
  $ for d in *; do [ $d = "debian" ] && continue;
      bzr revert -r tag:upstream-2.1.1 $d; done

next is to re-apply any relevant ubuntu/debian delta.

20. By Loïc Minier on 2011-11-30

Release 2.0-2ubuntu1 to precise

19. By Scott Moser on 2011-11-30

* Sync with debian.
* Remaining changes from debian:
  - debian/watch: fix for mangled versions (#650480)
* Changes from upstream:
  - boto/auth.py: use email.utils.formatdate(usegmt=True) instead of strftime
    as the latter breaks when boto is used from application setting up
    locales (like bpython or ipython); upstream issue #140.
* Dropped delta:
  - debian/rules: Run testsuite during build but ignore failures
    since it currently doesn't pass.
  - debian/rules, debian/control: Transition from pysupport to dh_python2
    (LP: #788514)
  - debian/rules:
    + README removed (no longer in source tarball)
    + doc install of cq.py removed (it is now installed to /usr/bin)
* Promote new upstream to unstable (Closes: #638931).
* New upstream release.
* Convert packaging to dh_python2 (Closes: #631430).
* Updated to Debian Policy version 3.9.2.
* Patched to include Python 2.7 in httplib work-around for https
  signatures. Thanks Matthias Klose. (Closes: #607120)

18. By Scott Moser on 2011-07-14

* New upstream release.
* Remaining changes from debian:
  - debian/rules: Run testsuite during build but ignore failures
    since it currently doesn't pass.
  - debian/rules, debian/control: Transition from pysupport to dh_python2
    (LP: #788514)
  - debian/rules:
    + README removed (no longer in source tarball)
    + doc install of cq.py removed (it is now installed to /usr/bin)
* Changes from upstream:
  - boto/auth.py: use email.utils.formatdate(usegmt=True) instead of strftime
    as the latter breaks when boto is used from application setting up
    locales (like bpython or ipython); upstream issue #140.
* Dropped delta from upstream:
  - boto/ec2/snapshot.py: work around non-int data in volumeSize
    returned from Eucalyptus. LP: #520707. [fix is upstream]
  - boto/connection.py: Handle 2.7 the same way as 2.6 for httplib
    compatibility. LP: #688773. [fix is upstream]

17. By Barry Warsaw on 2011-06-23

debian/rules, debian/control: Transition from pysupport to dh_python2
(LP: #788514)

16. By Scott Moser on 2011-05-26

* Merge from debian unstable (LP: #788651). Remaining changes:
  - debian/rules: Run testsuite during build but ignore failures
    since it currently doesn't pass.
  - boto/ec2/snapshot.py: work around non-int data in volumeSize
    returned from Eucalyptus. LP: #520707.
  - boto/connection.py: Handle 2.7 the same way as 2.6 for httplib
    compatibility. LP: #688773.
  - boto/cloudfront/__init__.py, boto/connection.py: use
    email.utils.formatdate(usegmt=True) instead of strftime as the latter
    breaks when boto is used from application setting up locales (like
    bpython or ipython); upstream issue #140.
* boto.egg-info/SOURCES.txt: add last EOL, as it is now in debian

15. By Loïc Minier on 2011-03-04

* boto/cloudfront/__init__.py, boto/connection.py: use
  email.utils.formatdate(usegmt=True) instead of strftime as the latter
  breaks when boto is used from application setting up locales (like bpython
  or ipython); upstream issue #140.
* boto.egg-info/SOURCES.txt: remove last EOL again to have less diff with
  upstream.

14. By Matthias Klose on 2010-12-14

Handle 2.7 the same way as 2.6 for httplib compatibility. LP: #688773.

13. By Scott Moser on 2010-02-17

work around non-int data in volumeSize (LP: #520707)