Launchpad itself

Merge ~cjwatson/launchpad:maxminddb-1.5.1 into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. maxminddb-1.5.1
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: ae0c56c94179b31135ec4ee95da3b5b1ecfa37ca
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:maxminddb-1.5.1
Merge into: launchpad:master
Diff against target: 13 lines (+1/-1)
1 file modified
constraints.txt (+1/-1)
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
Review via email: mp+374469@code.launchpad.net

Commit message

Upgrade to maxminddb 1.5.1

This fixes an ImportWarning during the test suite
(https://github.com/maxmind/MaxMind-DB-Reader-python/issues/31).

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/constraints.txt b/constraints.txt
2index 33861d8..091e569 100644
3--- a/constraints.txt
4+++ b/constraints.txt
5@@ -276,7 +276,7 @@ m2r==0.1.13
6 manuel==1.7.2
7 Markdown==2.3.1
8 martian==0.11
9-maxminddb==1.4.1
10+maxminddb==1.5.1
11 meliae==0.2.0.final.0
12 mistune==0.8.3
13 mock==1.0.1

Subscribers

People subscribed via source and target branches

to status/vote changes: