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
=== modified file 'CHANGELOG'
--- CHANGELOG 2018-06-05 09:32:45 +0000
+++ CHANGELOG 2018-06-13 16:43:22 +0000
@@ -1,6 +1,12 @@
1ChangeLog for conn-check1ChangeLog for conn-check
2========================2========================
33
41.5.1 (2018-06-07)
5------------------
6
7 - Remove unwanted dependencies accidentally included
8
9
41.5.0 (2018-06-05)101.5.0 (2018-06-05)
5------------------11------------------
612
713
=== modified file 'Makefile'
--- Makefile 2018-06-05 09:32:45 +0000
+++ Makefile 2018-06-13 16:43:22 +0000
@@ -64,13 +64,13 @@
64 $(ENV)/bin/pip wheel --wheel-dir=$(WHEELS_DIR) -r ${EXTRA}-requirements.txt64 $(ENV)/bin/pip wheel --wheel-dir=$(WHEELS_DIR) -r ${EXTRA}-requirements.txt
6565
66build-wheels-all-extras: pip-wheel $(WHEELS_DIR) $(ENV)66build-wheels-all-extras: pip-wheel $(WHEELS_DIR) $(ENV)
67 ls *-requirements.txt | grep -vw 'devel\|test' | xargs -L 1 \67 ls *-requirements.txt | grep -vw 'devel\|test\|snap' | xargs -L 1 -t \
68 $(ENV)/bin/pip wheel --wheel-dir=$(WHEELS_DIR) -r68 $(ENV)/bin/pip wheel --wheel-dir=$(WHEELS_DIR) -r
6969
70test-wheels: build-wheels build-wheels-all-extras70test-wheels: build-wheels build-wheels-all-extras
71 $(ENV)/bin/pip install -r test-requirements.txt71 $(ENV)/bin/pip install -r test-requirements.txt
72 $(ENV)/bin/pip install --upgrade --no-index --find-links $(WHEELS_DIR) -r requirements.txt72 $(ENV)/bin/pip install --upgrade --no-index --find-links $(WHEELS_DIR) -r requirements.txt
73 ls *-requirements.txt | grep -vw 'devel\|test' | xargs -L 1 \73 ls *-requirements.txt | grep -vw 'devel\|test\|snap' | xargs -L 1 \
74 $(ENV)/bin/pip install --ignore-installed --no-index --find-links $(WHEELS_DIR) -r74 $(ENV)/bin/pip install --ignore-installed --no-index --find-links $(WHEELS_DIR) -r
75 $(MAKE) test75 $(MAKE) test
7676
7777
=== modified file 'conn_check/version.txt'
--- conn_check/version.txt 2018-06-05 09:32:45 +0000
+++ conn_check/version.txt 2018-06-13 16:43:22 +0000
@@ -1,1 +1,1 @@
11.5.011.5.1
22
=== modified file 'requirements.txt'
--- requirements.txt 2018-01-25 20:12:34 +0000
+++ requirements.txt 2018-06-13 16:43:22 +0000
@@ -1,11 +1,8 @@
1appdirs
2characteristic >= 14.01characteristic >= 14.0
3cryptography >= 0.52cryptography >= 0.5
4ndg-httpsclient3ndg-httpsclient
5packaging
6pyasn14pyasn1
7pyOpenSSL5pyOpenSSL
8pyparsing
9service-identity6service-identity
10requests7requests
11Twisted >= 178Twisted >= 17

Subscribers

People subscribed via source and target branches

to all changes: