diff options
| author | Kali Kaneko <kali@leap.se> | 2014-08-28 17:00:26 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-08-28 17:00:26 -0500 |
| commit | 3ab68fd26bae17c82dbbb0c0171933b8a7540c73 (patch) | |
| tree | 23716922a5e5186cc65cd2b760b4c1d182736024 /client | |
| parent | 87ad9b4093863fd02abd539f6bb34a63df41c3ce (diff) | |
| parent | a02fa40ccd5c328c666928c547f977565ecd75c1 (diff) | |
Merge remote-tracking branch 'drebs-github/bug/2945_do-not-depend-on-pysqlite2' into develop
Diffstat (limited to 'client')
| -rw-r--r-- | client/changes/VERSION_COMPAT | 11 | ||||
| -rw-r--r-- | client/changes/bug_2945_do-not-depend-on-pysqlite2 | 1 | ||||
| -rw-r--r-- | client/pkg/requirements.pip | 3 |
3 files changed, 12 insertions, 3 deletions
diff --git a/client/changes/VERSION_COMPAT b/client/changes/VERSION_COMPAT index e69de29b..782844d7 100644 --- a/client/changes/VERSION_COMPAT +++ b/client/changes/VERSION_COMPAT @@ -0,0 +1,11 @@ +################################################# +# This file keeps track of the recent changes +# introduced in internal leap dependencies. +# Add your changes here so we can properly update +# requirements.pip during the release process. +# (leave header when resetting) +################################################# +# +# BEGIN DEPENDENCY LIST ------------------------- +# leap.foo.bar>=x.y.z +pysqlcipher>2.6.3 diff --git a/client/changes/bug_2945_do-not-depend-on-pysqlite2 b/client/changes/bug_2945_do-not-depend-on-pysqlite2 new file mode 100644 index 00000000..cf009a23 --- /dev/null +++ b/client/changes/bug_2945_do-not-depend-on-pysqlite2 @@ -0,0 +1 @@ + o Do not depend on pysqlite2 (#2945). diff --git a/client/pkg/requirements.pip b/client/pkg/requirements.pip index ae8d2dac..33286e4c 100644 --- a/client/pkg/requirements.pip +++ b/client/pkg/requirements.pip @@ -20,6 +20,3 @@ leap.soledad.common>=0.3.8 # this is not strictly needed by us, but we need it # until u1db adds it to its release as a dep. oauth - -# pysqlite should not be a dep, see #2945 -pysqlite |