Merge lp:~bloodearnest/conn-check/1.5.1 into lp:conn-check

Proposed by Simon Davy on 2018-06-13
Status: Merged
Approved by: Simon Davy on 2018-06-13
Approved revision: 142
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~bloodearnest/conn-check/1.5.1
Merge into: lp:conn-check
Diff against target: 59 lines (+9/-6)
4 files modified
CHANGELOG (+6/-0)
Makefile (+2/-2)
conn_check/version.txt (+1/-1)
requirements.txt (+0/-3)
To merge this branch: bzr merge lp:~bloodearnest/conn-check/1.5.1
Reviewer Review Type Date Requested Status
Tom Wardill 2018-06-13 Approve on 2018-06-13
Review via email: mp+347922@code.launchpad.net

Commit message

Tag 1.5.1 release, and fix test-wheels make target

To post a comment you must log in.
Tom Wardill (twom) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CHANGELOG'
2--- CHANGELOG 2018-06-05 09:32:45 +0000
3+++ CHANGELOG 2018-06-13 16:43:22 +0000
4@@ -1,6 +1,12 @@
5 ChangeLog for conn-check
6 ========================
7
8+1.5.1 (2018-06-07)
9+------------------
10+
11+ - Remove unwanted dependencies accidentally included
12+
13+
14 1.5.0 (2018-06-05)
15 ------------------
16
17
18=== modified file 'Makefile'
19--- Makefile 2018-06-05 09:32:45 +0000
20+++ Makefile 2018-06-13 16:43:22 +0000
21@@ -64,13 +64,13 @@
22 $(ENV)/bin/pip wheel --wheel-dir=$(WHEELS_DIR) -r ${EXTRA}-requirements.txt
23
24 build-wheels-all-extras: pip-wheel $(WHEELS_DIR) $(ENV)
25- ls *-requirements.txt | grep -vw 'devel\|test' | xargs -L 1 \
26+ ls *-requirements.txt | grep -vw 'devel\|test\|snap' | xargs -L 1 -t \
27 $(ENV)/bin/pip wheel --wheel-dir=$(WHEELS_DIR) -r
28
29 test-wheels: build-wheels build-wheels-all-extras
30 $(ENV)/bin/pip install -r test-requirements.txt
31 $(ENV)/bin/pip install --upgrade --no-index --find-links $(WHEELS_DIR) -r requirements.txt
32- ls *-requirements.txt | grep -vw 'devel\|test' | xargs -L 1 \
33+ ls *-requirements.txt | grep -vw 'devel\|test\|snap' | xargs -L 1 \
34 $(ENV)/bin/pip install --ignore-installed --no-index --find-links $(WHEELS_DIR) -r
35 $(MAKE) test
36
37
38=== modified file 'conn_check/version.txt'
39--- conn_check/version.txt 2018-06-05 09:32:45 +0000
40+++ conn_check/version.txt 2018-06-13 16:43:22 +0000
41@@ -1,1 +1,1 @@
42-1.5.0
43+1.5.1
44
45=== modified file 'requirements.txt'
46--- requirements.txt 2018-01-25 20:12:34 +0000
47+++ requirements.txt 2018-06-13 16:43:22 +0000
48@@ -1,11 +1,8 @@
49-appdirs
50 characteristic >= 14.0
51 cryptography >= 0.5
52 ndg-httpsclient
53-packaging
54 pyasn1
55 pyOpenSSL
56-pyparsing
57 service-identity
58 requests
59 Twisted >= 17

Subscribers

People subscribed via source and target branches

to all changes: