Make Anitya work with OpenShift s2i builders

A couple changes are required to make the s2i builder for OpenShift work: * Move the requirements into the repository root * Depend on psycopg and gunicorn * Add a configuration file for the builder in .s2i Additionally, this drops the EL7 test requirements since we'll be deploying on a Fedora-based image. Signed-off-by: Jeremy Cline <[email protected]>
lu4nx · Jan 25, 2018 · 2490c9a · 2490c9a
1 parent c257229
commit 2490c9a
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 40 deletions.
diff --git a/.s2i/environment b/.s2i/environment
@@ -0,0 +1,2 @@
+APP_MODULE=anitya.wsgi:application
+UPGRADE_PIP_TO_LATEST=true
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,6 @@ env:
     - TOXENV=lint
     - TOXENV=docs
     - TOXENV=py27
-    - TOXENV=el7
 matrix:
   include:
     - python: 3.5

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,8 +1,8 @@
 include LICENSE README.rst CHANGELOG.rst
 include alembic.ini
 include runtests.sh createdb.py nosetests migrate_wiki.py
+include requirements.txt readthedocs.txt test_requirements.txt
 recursive-include fedmsg.d *
 recursive-include files *
-recursive-include requirements *
 recursive-include anitya/templates *
 recursive-include anitya/static *
diff --git a/ansible/roles/anitya-dev/tasks/main.yml b/ansible/roles/anitya-dev/tasks/main.yml
@@ -43,7 +43,7 @@
 - name: Install Anitya requirements into the virtualenv
   become_user: "{{ ansible_env.SUDO_USER }}"
   pip:
-    requirements: "requirements/requirements.txt"
+    requirements: "requirements.txt"
     virtualenv: /home/{{ ansible_env.SUDO_USER }}/.virtualenvs/anitya/
     virtualenv_python: python2
   args:
@@ -61,7 +61,7 @@
 - name: Install Anitya test requirements into the virtualenv
   become_user: "{{ ansible_env.SUDO_USER }}"
   pip:
-    requirements: "requirements/test_requirements.txt"
+    requirements: "test_requirements.txt"
     virtualenv: /home/{{ ansible_env.SUDO_USER }}/.virtualenvs/anitya/
     virtualenv_python: python2
   args:

diff --git a/requirements/readthedocs.txt → readthedocs.txt b/requirements/readthedocs.txt → readthedocs.txt
diff --git a/requirements/requirements.txt → requirements.txt b/requirements/requirements.txt → requirements.txt
@@ -4,6 +4,7 @@ python-dateutil
 dateutils
 fedmsg[commands,consumers]
 flask-login
+gunicorn
 social-auth-app-flask
 social-auth-app-flask-sqlalchemy
 flask-restful
@@ -12,5 +13,6 @@ jinja2 >= 2.4
 sqlalchemy >= 0.9
 # https://github.com/ironfroggy/straight.plugin/issues/17#issuecomment-41466275
 straight.plugin==1.4.0-post-1
+psycopg2
 pytoml
 wtforms
diff --git a/requirements/el7-requirements.txt b/requirements/el7-requirements.txt
diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@ def get_project_version():
     return match.groups()[0].decode("utf-8")
 
 
-def get_requirements(requirements_file='requirements/requirements.txt'):
+def get_requirements(requirements_file='requirements.txt'):
     """Get the contents of a file listing the requirements.
 
     :arg requirements_file: path to a requirements file

diff --git a/requirements/test_requirements.txt → test_requirements.txt b/requirements/test_requirements.txt → test_requirements.txt
diff --git a/tox.ini b/tox.ini
@@ -1,25 +1,11 @@
 [tox]
-envlist = el7,py27,py35,py36,lint,docs
+envlist = py27,py35,py36,lint,docs
 
 [testenv]
 passenv = TRAVIS TRAVIS_*
 deps =
-    -rrequirements/requirements.txt
-    -rrequirements/test_requirements.txt
-whitelist_externals =
-    rm
-commands =
-    rm -rf htmlcov coverage.xml
-    py.test --cov-config .coveragerc --cov=anitya --cov-report term \
-        --cov-report xml --cov-report html
-
-
-[testenv:el7]
-passenv = TRAVIS TRAVIS_*
-basepython = python2
-deps =
-    -rrequirements/el7-requirements.txt
-    -rrequirements/test_requirements.txt
+    -rrequirements.txt
+    -rtest_requirements.txt
 whitelist_externals =
     rm
 commands =
@@ -31,8 +17,8 @@ commands =
 [testenv:docs]
 changedir = docs
 deps =
-    -rrequirements/readthedocs.txt
-    -rrequirements/requirements.txt
+    -rreadthedocs.txt
+    -rrequirements.txt
 whitelist_externals =
     mkdir
     rm
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		APP_MODULE=anitya.wsgi:application
		UPGRADE_PIP_TO_LATEST=true