chore: Unify python dependencies into requirements.in

Dockerfile

@@ -34,10 +34,6 @@ RUN pushd /coreapi && \
     python3.6 -m pip install --upgrade pip>=10.0.0 && pip3 install . &&\
     popd
 
-RUN pip3 install git+https://github.com/fabric8-analytics/fabric8-analytics-worker.git@${F8A_WORKER_VERSION}
-RUN pip3 install git+https://github.com/fabric8-analytics/fabric8-analytics-auth.git@${F8A_AUTH_VERSION}
-RUN pip3 install git+https://github.com/fabric8-analytics/fabric8-analytics-utils.git@${F8A_UTILS}
-RUN pip3 install git+https://github.com/fabric8-analytics/fabric8-analytics-version-comparator.git#egg=f8a_version_comparator
 
 # Required by the solver task in worker to resolve dependencies from package.json
 RUN npm install -g semver-ranger

Dockerfile.rhel

@@ -27,10 +27,6 @@ RUN pushd /coreapi && \
     pip3 install --upgrade pip>=10.0.0 && pip3 install . &&\
     popd
 
-RUN pip3 install git+https://github.com/fabric8-analytics/fabric8-analytics-worker.git@${F8A_WORKER_VERSION}
-RUN pip3 install git+https://github.com/fabric8-analytics/fabric8-analytics-auth.git@${F8A_AUTH_VERSION}
-RUN pip3 install git+https://github.com/fabric8-analytics/fabric8-analytics-utils.git@${F8A_UTILS}
-RUN pip3 install git+https://github.com/fabric8-analytics/fabric8-analytics-version-comparator.git#egg=f8a_version_comparator
 
 # Required by the solver task in worker to resolve dependencies from package.json
 RUN npm install -g semver-ranger

requirements.in

@@ -1,28 +1,34 @@
-flask
-flask-appconfig>=0.10
-flask-security
-flask-sqlalchemy
-flask-restful
-flask-cors
-jsl
-# there's a regression in mod_wsgi 4.5.4:
-# https://github.com/GrahamDumpleton/mod_wsgi/issues/147
-# install httpd-devel in order to have apxs command, otherwise build fails
-mod_wsgi!=4.5.4
-psycopg2-binary
-# in order for pyjwt to be able to use RS256 we need pycrypto
-cryptography
-pyjwt>=1.6.1
-requests-futures
-Flask-Cache
-semantic_version
+Werkzeug
+Flask
+requests
+botocore
+flask_appconfig
+flask_cache
+flask_cors
+flask_restful
+flask_sqlalchemy
+GitPython
 py_lru_cache
-radon==3.0.1
-pygithub
-codecov
 lxml
-gitpython
-raven[flask]
 pydantic
+PyGithub
+raven
+requests_futures
+selinon
+semantic_version
+SQLAlchemy
 tenacity
-semver
+
+#packages discovered after running the image on cluster
+psycopg2-binary
+
+# there's a regression in mod_wsgi 4.5.4:
+# https://github.com/GrahamDumpleton/mod_wsgi/issues/147
+# install httpd-devel in order to have apxs command, otherwise build fails
+mod_wsgi!=4.5.4
+
+
+f8a_worker @ git+https://github.com/fabric8-analytics/fabric8-analytics-worker.git@066c2f6#egg=f8a_worker
+f8a_auth @ git+https://github.com/fabric8-analytics/fabric8-analytics-auth.git@5ff9438#egg=fabric8a_auth
+f8a_utils @ git+https://github.com/fabric8-analytics/fabric8-analytics-utils.git@5a5ce60#egg=f8a_utils
+

requirements.txt

@@ -4,68 +4,98 @@
 #
 #    pip-compile --output-file=requirements.txt requirements.in
 #
-aniso8601==6.0.0          # via flask-restful
-asn1crypto==0.24.0        # via cryptography
-babel==2.6.0              # via flask-babelex
-blinker==1.4              # via flask-mail, flask-principal, raven
-certifi==2019.3.9         # via requests
-cffi==1.12.2              # via cryptography
+amqp==5.0.2               # via kombu
+aniso8601==8.0.0          # via flask-restful
+anymarkup-core==0.8.1     # via anymarkup
+anymarkup==0.8.1          # via f8a-worker
+attrs==20.3.0             # via jsonschema
+babel==2.9.0              # via flask-babelex
+beautifulsoup4==4.9.3     # via bs4, f8a-worker
+billiard==3.6.3.0         # via celery
+blinker==1.4              # via flask-mail, flask-principal
+boto3==1.16.25            # via f8a-worker
+botocore==1.19.25         # via -r requirements.in, boto3, f8a-worker, s3transfer
+bs4==0.0.1                # via f8a-utils
+celery==5.0.2             # via selinon
+certifi==2020.11.8        # via requests
+cffi==1.14.4              # via cryptography
 chardet==3.0.4            # via requests
-click==7.0                # via flask, flask-appconfig
-codecov==2.0.15           # via -r requirements.in
-colorama==0.4.1           # via radon
-coverage==4.5.3           # via codecov
-cryptography==2.6.1       # via -r requirements.in
-dataclasses==0.7          # via pydantic
-deprecated==1.2.5         # via pygithub
-entrypoints==0.3          # via flake8
-flake8-polyfill==1.0.2    # via radon
-flake8==3.7.7             # via flake8-polyfill
+click-didyoumean==0.0.3   # via celery
+click-repl==0.1.6         # via celery
+click==7.1.2              # via anymarkup, celery, click-didyoumean, click-repl, flask, flask-appconfig, selinon
+codegen==1.0              # via selinon
+colorama==0.4.4           # via rainbow-logging-handler
+configobj==5.0.6          # via anymarkup
+cryptography==3.2.1       # via f8a-utils, fabric8a-auth
+deprecated==1.2.10        # via pygithub
+git+https://github.com/fabric8-analytics/fabric8-analytics-utils.git@5a5ce60#egg=f8a_utils  # via -r requirements.in, f8a-worker
+git+https://github.com/fabric8-analytics/fabric8-analytics-version-comparator.git@8a57ac7#egg=f8a_version_comparator  # via f8a-utils
+git+https://github.com/fabric8-analytics/fabric8-analytics-worker.git@066c2f6#egg=f8a_worker  # via -r requirements.in
+git+https://github.com/fabric8-analytics/fabric8-analytics-auth.git@5ff9438#egg=fabric8a_auth  # via -r requirements.in
 flask-appconfig==0.11.1   # via -r requirements.in
-flask-babelex==0.9.3      # via flask-security
+flask-babelex==0.9.4      # via flask-security
 flask-cache==0.13.1       # via -r requirements.in
-flask-cors==3.0.7         # via -r requirements.in
-flask-login==0.4.1        # via flask-security
+flask-cors==3.0.9         # via -r requirements.in
+flask-login==0.5.0        # via flask-security
 flask-mail==0.9.1         # via flask-security
 flask-principal==0.4.0    # via flask-security
-flask-restful==0.3.7      # via -r requirements.in
-flask-security==3.0.0     # via -r requirements.in
-flask-sqlalchemy==2.3.2   # via -r requirements.in
-flask-wtf==0.14.2         # via flask-security
-flask==0.12.4             # via -r requirements.in, flask-appconfig, flask-babelex, flask-cache, flask-cors, flask-login, flask-mail, flask-principal, flask-restful, flask-security, flask-sqlalchemy, flask-wtf, raven
-gitdb2==2.0.5             # via gitpython
-gitpython==2.1.11         # via -r requirements.in
-idna==2.8                 # via requests
-itsdangerous==1.1.0       # via flask, flask-security
-jinja2==2.10.1            # via flask, flask-babelex
-jsl==0.2.4                # via -r requirements.in
-lxml==4.3.3               # via -r requirements.in
-mando==0.6.4              # via radon
-markupsafe==1.1.1         # via jinja2
-mccabe==0.6.1             # via flake8
-mod-wsgi==4.6.5           # via -r requirements.in
-passlib==1.7.1            # via flask-security
+flask-restful==0.3.8      # via -r requirements.in
+flask-security==3.0.0     # via fabric8a-auth
+flask-sqlalchemy==2.4.4   # via -r requirements.in
+flask-wtf==0.14.3         # via flask-security
+flask==0.12.5             # via -r requirements.in, fabric8a-auth, flask-appconfig, flask-babelex, flask-cache, flask-cors, flask-login, flask-mail, flask-principal, flask-restful, flask-security, flask-sqlalchemy, flask-wtf
+git2json==0.2.3           # via f8a-worker
+gitdb==4.0.5              # via gitpython
+gitpython==3.1.11         # via -r requirements.in, f8a-worker
+graphviz==0.15            # via selinon
+idna==2.10                # via requests
+importlib-metadata==3.1.0  # via jsonschema, kombu
+itsdangerous==1.1.0       # via flask, flask-security, flask-wtf
+jinja2==2.11.2            # via flask, flask-babelex
+jmespath==0.10.0          # via boto3, botocore
+jsl==0.2.4                # via f8a-worker
+json5==0.9.5              # via anymarkup
+jsonschema==3.2.0         # via f8a-worker, selinon
+kombu==5.0.2              # via celery
+logutils==0.3.5           # via rainbow-logging-handler
+lxml==4.6.1               # via -r requirements.in, f8a-utils, f8a-worker
+markupsafe==1.1.1         # via jinja2, wtforms
+mod-wsgi==4.7.1           # via -r requirements.in
+passlib==1.7.4            # via flask-security
+prompt-toolkit==3.0.8     # via click-repl
 psycopg2-binary==2.8.6    # via -r requirements.in
 py-lru-cache==0.1.4       # via -r requirements.in
-pycodestyle==2.5.0        # via flake8
-pycparser==2.19           # via cffi
-pydantic==1.5.1           # via -r requirements.in
-pyflakes==2.1.1           # via flake8
-pygithub==1.43.6          # via -r requirements.in
-pyjwt==1.7.1              # via -r requirements.in, pygithub
-pytz==2019.1              # via babel, flask-restful
-radon==3.0.1              # via -r requirements.in
-raven[flask]==6.10.0      # via -r requirements.in
-requests-futures==0.9.9   # via -r requirements.in
-requests==2.21.0          # via codecov, pygithub, requests-futures
-semantic-version==2.6.0   # via -r requirements.in
-semver==2.10.2            # via -r requirements.in
-six==1.12.0               # via cryptography, flask-appconfig, flask-cors, flask-restful, mando, tenacity
-smmap2==2.0.5             # via gitdb2
+pycparser==2.20           # via cffi
+pydantic==1.7.2           # via -r requirements.in
+pygithub==1.53            # via -r requirements.in
+pyjwt==1.7.1              # via fabric8a-auth, pygithub
+pyrsistent==0.17.3        # via jsonschema
+python-dateutil==2.8.1    # via botocore
+pytz==2020.4              # via babel, celery, flask-restful
+pyyaml==5.3.1             # via anymarkup, f8a-worker, selinon
+rainbow-logging-handler==2.2.2  # via selinon
+raven==6.10.0             # via -r requirements.in, f8a-worker
+requests-futures==1.0.0   # via -r requirements.in, f8a-worker
+requests==2.25.0          # via -r requirements.in, f8a-utils, f8a-worker, fabric8a-auth, pygithub, requests-futures
+s3transfer==0.3.3         # via boto3
+selinon==1.0.0            # via -r requirements.in, f8a-worker
+semantic-version==2.8.5   # via -r requirements.in, f8a-worker
+semver==2.13.0            # via f8a-utils
+six==1.15.0               # via anymarkup-core, click-repl, configobj, cryptography, flask-appconfig, flask-cors, flask-restful, jsonschema, python-dateutil, tenacity
+smmap==3.0.4              # via gitdb
+soupsieve==2.0.1          # via beautifulsoup4
 speaklater==1.3           # via flask-babelex
-sqlalchemy==1.3.2         # via flask-sqlalchemy
-tenacity==6.2.0           # via -r requirements.in
-urllib3==1.24.1           # via requests
-werkzeug==0.15.2          # via flask
-wrapt==1.11.1             # via deprecated
-wtforms==2.2.1            # via flask-wtf
+sqlalchemy==1.3.20        # via -r requirements.in, f8a-worker, flask-sqlalchemy
+tenacity==6.2.0           # via -r requirements.in, f8a-utils, f8a-worker
+toml==0.9.4               # via anymarkup, f8a-worker
+urllib3==1.26.2           # via botocore, requests
+vine==5.0.0               # via amqp, celery
+wcwidth==0.2.5            # via prompt-toolkit
+werkzeug==0.16.1          # via -r requirements.in, f8a-worker, flask
+wrapt==1.12.1             # via deprecated
+wtforms==2.3.3            # via flask-wtf
+xmltodict==0.12.0         # via anymarkup
+zipp==3.4.0               # via importlib-metadata
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools

tests/api/test_api_v2.py

@@ -259,7 +259,9 @@ def test_get_component_analyses_bad_request(self):
         response = self.client.post(
             api_route_for('/component-analyses'), data=json.dumps(payload), headers=accept_json)
         self.assertEqual(response.status_code, 400)
-        self.assertDictEqual(response.json, {'error': '400: Bad Request'})
+        self.assertDictEqual(
+            response.json,
+            {'error': '400 Bad Request: Ecosystem None is not supported for this request'})
 
 
 @pytest.mark.usefixtures('client_class')

tests/requirements.in

@@ -1,11 +1,5 @@
-flexmock
-freezegun
-pytest >= 3 # Needed for compatibility with celery 4.x fixtures
+pytest
 pytest-flask
 pytest-cov
-requests
-jsonschema
-pylint
-semantic_version
-pydantic
-tenacity
+radon
+-r ../requirements.in