Explicitly require psycopg2.

The downstream spec file was recently refactored to use Python dependency autogeneration, and in the process all Requires: lines on Python packages were removed, including psycopg2. This caused Bodhi to fail to run when installed from that spec file, highlighting that upstream should have listed psycopg2 as a requirement. PostgreSQL is Bodhi's only supported database and has long been so, though it has not been formally listed in the requirements.txt until this commit. Signed-off-by: Randy Barlow <[email protected]> (cherry picked from commit 2f8dd96)
fedora-infra · Feb 14, 2019 · bf13c70 · bf13c70
1 parent 2b65b8c
commit bf13c70
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/devel/ci/Dockerfile-f28 b/devel/ci/Dockerfile-f28
@@ -33,6 +33,7 @@ RUN dnf install --disablerepo rawhide-modular -y \
     python2-markdown \
     python2-mock \
     python2-pillow \
+    python2-psycopg2 \
     python2-pyramid-mako \
     python2-pytest-cov \
     python2-responses \
@@ -54,6 +55,7 @@ RUN dnf install --disablerepo rawhide-modular -y \
     python3-mock \
     python3-munch \
     python3-pillow \
+    python3-psycopg2 \
     python3-pydocstyle \
     python3-pylibravatar \
     python3-pyramid-mako \

diff --git a/devel/ci/Dockerfile-f29 b/devel/ci/Dockerfile-f29
@@ -34,6 +34,7 @@ RUN dnf install --disablerepo rawhide-modular -y \
     python2-markdown \
     python2-mock \
     python2-pillow \
+    python2-psycopg2 \
     python2-pyramid-mako \
     python2-pytest-cov \
     python2-responses \
@@ -55,6 +56,7 @@ RUN dnf install --disablerepo rawhide-modular -y \
     python3-mock \
     python3-munch \
     python3-pillow \
+    python3-psycopg2 \
     python3-pydocstyle \
     python3-pylibravatar \
     python3-pyramid-mako \

diff --git a/devel/ci/Dockerfile-rawhide b/devel/ci/Dockerfile-rawhide
@@ -38,6 +38,7 @@ RUN dnf install --disablerepo rawhide-modular -y \
     python3-mock \
     python3-munch \
     python3-pillow \
+    python3-psycopg2 \
     python3-pydocstyle \
     python3-pylibravatar \
     python3-pyramid-fas-openid \

diff --git a/requirements.txt b/requirements.txt
@@ -16,6 +16,7 @@ markdown
 packagedb-cli; python_version <= '2.7'
 # for captchas
 Pillow
+psycopg2
 pyDNS; python_version <= '2.7'  # Should be required by pyLibravatar https://bugs.launchpad.net/pylibravatar/+bug/1661218
 py3dns; python_version >= '3.0'  # Should be required by pyLibravatar https://bugs.launchpad.net/pylibravatar/+bug/1661218
 pylibravatar