turnip

Merge ~pappacena/turnip:reverting-pygit-dep-version into turnip:master

  1. Git
  2. lp:~pappacena/turnip
  3. reverting-pygit-dep-version
  4. Merge into master
Proposed by Thiago F. Pappacena
Status: Merged
Approved by: Thiago F. Pappacena
Approved revision: 49924b0d156c1a028b015a3d17a8e1182997708c
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~pappacena/turnip:reverting-pygit-dep-version
Merge into: turnip:master
Diff against target: 29 lines (+5/-2)
2 files modified
Makefile (+4/-1)
requirements.txt (+1/-1)
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
Colin Watson (community) Approve
Review via email: mp+380546@code.launchpad.net

Commit message

Downgrading pycparser to comply with pygit dependency of pycparser<2.18.

pycparser was mistakenly upgraded previously, and `make check` didn't warn about the missing dependency - so, CI allowed the merge. This dependency was only checked at runtime when running `make run-api`. To avoid future problems, we are adding `pip check` as a step when running `make check`.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve
Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index fd37a2f..c514366 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -75,7 +75,10 @@ lint: $(ENV)
6 @$(FLAKE8) --exclude=__pycache__,version_info.py turnip
7 $(PYTHON) setup.py check --restructuredtext --strict
8
9-check: test lint
10+pip-check: $(ENV)
11+ $(PIP) check
12+
13+check: pip-check test lint
14
15 run-api: $(ENV)
16 $(PSERVE) api.ini --reload
17diff --git a/requirements.txt b/requirements.txt
18index c66347c..e81dffb 100644
19--- a/requirements.txt
20+++ b/requirements.txt
21@@ -30,7 +30,7 @@ PasteDeploy==2.1.0
22 pbr==5.4.4
23 pep8==1.5.7
24 pyasn1==0.4.8
25-pycparser==2.19
26+pycparser==2.17
27 pycrypto==2.6.1
28 pyflakes==0.8.1
29 pygit2==0.27.4

Subscribers

People subscribed via source and target branches