Merge lp:~pedronis/uservice-logging/use-pip-cache-for-dev-n-testing into lp:uservice-logging

Proposed by Samuele Pedroni on 2015-09-02
Status: Merged
Approved by: Samuele Pedroni on 2015-09-02
Approved revision: 27
Merged at revision: 26
Proposed branch: lp:~pedronis/uservice-logging/use-pip-cache-for-dev-n-testing
Merge into: lp:uservice-logging
Diff against target: 74 lines (+17/-8)
4 files modified
.bzrignore (+1/-0)
Makefile (+13/-6)
README.rst (+2/-1)
uservice_logging/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~pedronis/uservice-logging/use-pip-cache-for-dev-n-testing
Reviewer Review Type Date Requested Status
Thomi Richards (community) 2015-09-02 Approve on 2015-09-02
Review via email: mp+269932@code.launchpad.net

Commit message

use pip-cache for dev and testing

Description of the change

use pip-cache for dev and testing

I went ahead and populated the pip-cache already

To post a comment you must log in.

Thanks for fixing this - one diff comment for you to consider.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2015-07-31 14:52:16 +0000
3+++ .bzrignore 2015-09-02 14:50:12 +0000
4@@ -3,3 +3,4 @@
5 uservice_logging.egg-info
6 env
7 __pycache__
8+pip-cache
9
10=== modified file 'Makefile'
11--- Makefile 2015-07-31 14:52:16 +0000
12+++ Makefile 2015-09-02 14:50:12 +0000
13@@ -1,15 +1,22 @@
14+PIP_CACHE_BRANCH = lp:~tanuki/uservice-logging/pip-cache
15+
16 env:
17 virtualenv -p python3 env
18
19 clean:
20- rm -rf env uservice_logging.egg-info
21+ rm -rf env uservice_logging.egg-info build dist
22 find -name '*.pyc' -delete
23 find -name '*.~*' -delete
24
25 bootstrap: env
26- env/bin/pip install -q -r test_requirements.txt
27-
28-check: test
29+ test -d pip-cache || bzr branch $(PIP_CACHE_BRANCH) pip-cache
30+ bzr pull -d pip-cache $(PIP_CACHE_BRANCH)
31+ env/bin/pip install --no-index --find-links=pip-cache -q -r test_requirements.txt
32+
33+clean-pip-cache:
34+ rm -rf pip-cache
35+
36+check: clean test
37
38 test: bootstrap raw-test raw-lint
39
40@@ -19,6 +26,6 @@
41 lint: bootstrap raw-lint
42
43 raw-lint:
44- env/bin/flake8 --max-line-length=99 uservice_logging
45+ env/bin/flake8 --max-line-length=99 --select=E,W,F,C,N uservice_logging
46
47-.PHONY: clean bootstrap check raw-test test raw-lint lint
48+.PHONY: env clean bootstrap clean-pip-cache check test raw-test lint raw-lint
49
50=== modified file 'README.rst'
51--- README.rst 2015-08-24 09:38:50 +0000
52+++ README.rst 2015-09-02 14:50:12 +0000
53@@ -7,7 +7,8 @@
54 Hacking Notes:
55 ==============
56
57-To hack on the library, create a python3 virtual environment::
58+To hack on the library, create a python3 virtual environment with the
59+development dependencies getting the project pip-cache::
60
61 $ make bootstrap
62
63
64=== modified file 'uservice_logging/__init__.py'
65--- uservice_logging/__init__.py 2015-08-21 13:34:53 +0000
66+++ uservice_logging/__init__.py 2015-09-02 14:50:12 +0000
67@@ -29,6 +29,6 @@
68 # If the releaselevel is 'final', then the tarball will be major.minor.micro.
69 # Otherwise it is major.minor.micro~$(revno).
70
71-__version__ = (0, 10, 1, 'final')
72+__version__ = (0, 10, 2, 'dev')
73
74 from .logging import configure_logging # noqa

Subscribers

People subscribed via source and target branches

to all changes: