diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-30 17:03:15 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-30 17:03:15 -0300 |
| commit | cfa1974291ccde19b06823f375b27a2f72f2061e (patch) | |
| tree | 8af8f48a54ba9e51e955f63e5884960f375b26d5 | |
| parent | ce72a0596d0e2f49037747c0c19988874e0801c9 (diff) | |
| parent | 8df63e671ee971e5f987320482f020ad7ceeeb6b (diff) | |
Merge remote-tracking branch 'kali/feature/add-version-compat' into develop
| -rw-r--r-- | .gitignore | 12 | ||||
| -rw-r--r-- | changes/VERSION_COMPAT | 10 | ||||
| -rw-r--r-- | docs/release_checklist.wiki | 4 | ||||
| -rw-r--r-- | src/leap/bitmask/util/reqs.txt | 14 |
4 files changed, 17 insertions, 23 deletions
@@ -12,7 +12,6 @@ ui_*.py bin/ build/ core -debian/python-leap-client/ dist/ docs/_build docs/covhtml @@ -20,15 +19,12 @@ include/ lib/ local/ share/ -src/leap/util/reqs.txt -src/leap.egg-info/ -src/leap_client.egg-info -src/leap/_branding.py -src/leap/certs/*.pem -src/*.egg-info -src/pysqlcipher pkg/osx/dist pkg/osx/build + +src/*.egg-info +src/pysqlcipher +src/leap/bitmask/util/reqs.txt MANIFEST _trial_temp* config/* diff --git a/changes/VERSION_COMPAT b/changes/VERSION_COMPAT new file mode 100644 index 00000000..32391745 --- /dev/null +++ b/changes/VERSION_COMPAT @@ -0,0 +1,10 @@ +################################################# +# 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. +################################################# + +leap.common>=0.3.2 +# leap.common.config.get_path_prefix + diff --git a/docs/release_checklist.wiki b/docs/release_checklist.wiki index 8987f0b8..e766d6f8 100644 --- a/docs/release_checklist.wiki +++ b/docs/release_checklist.wiki @@ -17,7 +17,9 @@ * [ ] Update relnotes.txt if needed. * [ ] git rm changes/* * [ ] git commit -av - * [ ] Update dependencies on the current package in the packages that remain if needed (that's why the order). + * [ ] Review pkg/requirements.pip for everything and update if needed (that's why the order). + - See whatever has been introduced in changes/VERSION_COMPAT + - Reset changes/VERSION_COMPAT * [ ] git tag -s X.Y.Z (note the -s so that it's a signed tag) The message should be something like: Tag <package> version X.Y.Z * [ ] git push origin X.Y.Z * [ ] git checkout master && git pull origin master && git merge release-X.Y.Z && git push origin master diff --git a/src/leap/bitmask/util/reqs.txt b/src/leap/bitmask/util/reqs.txt deleted file mode 100644 index 0bcf85dc..00000000 --- a/src/leap/bitmask/util/reqs.txt +++ /dev/null @@ -1,14 +0,0 @@ -requests -srp>=1.0.2 -pyopenssl -keyring -python-dateutil -psutil -ipaddr -twisted -qt4reactor -python-gnupg -leap.common>=0.2.5 -leap.soledad>=0.1.0 -mock -oauth
\ No newline at end of file |