Skip to content

Commit

Permalink
Do not install psycopg2 from wheel to avoid warning message
Browse files Browse the repository at this point in the history
This is due to a segfault issue as reported in
psycopg/psycopg2#543
  • Loading branch information
ppinatti committed Feb 13, 2018
1 parent b315f03 commit 6a3649b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
5 changes: 3 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# order is the order pip will install, so if package A depends on B make sure B comes first
# postgres python driver
psycopg2>=2.6.1
# postgres python driver, no binary due to https://github.com/psycopg/psycopg2/issues/543
# can be removed when 2.8 is out
psycopg2>=2.7 --no-binary psycopg2
# ORM tool
SQLAlchemy>=1.0.11
# database migrations
Expand Down
3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ def _find_requirements():
file=sys.stderr)
continue
line = line[egg_index+5:]
# normal format: use requirement and drop additional parameters
else:
line = line.split()[0]
req_list.append(line)

return req_list
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/lib/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ def _compose_start(self, dev_mode=False, cli_test=False):
# add auth token to admin user in client to make it ready for use
# better hide token from logs
ret_code, output = self._session.run(
'docker exec tessia_server_1 tess-dbmanage get-token',
'docker exec tessia_server_1 tess-dbmanage get-token 2>/dev/null',
stdout=False)
if ret_code != 0:
raise RuntimeError(
Expand Down

0 comments on commit 6a3649b

Please sign in to comment.