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

Proposed by Samuele Pedroni
Status: Merged
Approved by: Samuele Pedroni
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) Approve
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.
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) wrote :

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
=== modified file '.bzrignore'
--- .bzrignore 2015-07-31 14:52:16 +0000
+++ .bzrignore 2015-09-02 14:50:12 +0000
@@ -3,3 +3,4 @@
3uservice_logging.egg-info3uservice_logging.egg-info
4env4env
5__pycache__5__pycache__
6pip-cache
67
=== modified file 'Makefile'
--- Makefile 2015-07-31 14:52:16 +0000
+++ Makefile 2015-09-02 14:50:12 +0000
@@ -1,15 +1,22 @@
1PIP_CACHE_BRANCH = lp:~tanuki/uservice-logging/pip-cache
2
1env:3env:
2 virtualenv -p python3 env4 virtualenv -p python3 env
35
4clean:6clean:
5 rm -rf env uservice_logging.egg-info7 rm -rf env uservice_logging.egg-info build dist
6 find -name '*.pyc' -delete8 find -name '*.pyc' -delete
7 find -name '*.~*' -delete9 find -name '*.~*' -delete
810
9bootstrap: env11bootstrap: env
10 env/bin/pip install -q -r test_requirements.txt12 test -d pip-cache || bzr branch $(PIP_CACHE_BRANCH) pip-cache
1113 bzr pull -d pip-cache $(PIP_CACHE_BRANCH)
12check: test14 env/bin/pip install --no-index --find-links=pip-cache -q -r test_requirements.txt
15
16clean-pip-cache:
17 rm -rf pip-cache
18
19check: clean test
1320
14test: bootstrap raw-test raw-lint21test: bootstrap raw-test raw-lint
1522
@@ -19,6 +26,6 @@
19lint: bootstrap raw-lint26lint: bootstrap raw-lint
2027
21raw-lint:28raw-lint:
22 env/bin/flake8 --max-line-length=99 uservice_logging29 env/bin/flake8 --max-line-length=99 --select=E,W,F,C,N uservice_logging
2330
24.PHONY: clean bootstrap check raw-test test raw-lint lint31.PHONY: env clean bootstrap clean-pip-cache check test raw-test lint raw-lint
2532
=== modified file 'README.rst'
--- README.rst 2015-08-24 09:38:50 +0000
+++ README.rst 2015-09-02 14:50:12 +0000
@@ -7,7 +7,8 @@
7Hacking Notes:7Hacking Notes:
8==============8==============
99
10To hack on the library, create a python3 virtual environment::10To hack on the library, create a python3 virtual environment with the
11development dependencies getting the project pip-cache::
1112
12 $ make bootstrap13 $ make bootstrap
1314
1415
=== modified file 'uservice_logging/__init__.py'
--- uservice_logging/__init__.py 2015-08-21 13:34:53 +0000
+++ uservice_logging/__init__.py 2015-09-02 14:50:12 +0000
@@ -29,6 +29,6 @@
29# If the releaselevel is 'final', then the tarball will be major.minor.micro.29# If the releaselevel is 'final', then the tarball will be major.minor.micro.
30# Otherwise it is major.minor.micro~$(revno).30# Otherwise it is major.minor.micro~$(revno).
3131
32__version__ = (0, 10, 1, 'final')32__version__ = (0, 10, 2, 'dev')
3333
34from .logging import configure_logging # noqa34from .logging import configure_logging # noqa

Subscribers

People subscribed via source and target branches

to all changes: