Testing 1 2 3

2 files changed, 32 insertions, 22 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 890a17503..08978a35c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,17 +57,6 @@ source_dist:
   - mount
   - df -h
 
-  - echo "========================================="
-  - pip3 show pep8
-  - pip3 show pytest
-  - pip3 show pylint
-  - pip3 show pytest-cov
-  - pip3 show pytest-datafiles
-  - pip3 show pytest-env
-  - pip3 show pytest-pep8
-  - pip3 show pytest-xdist
-  - echo "========================================="
-
   - useradd -Um buildstream
   - chown -R buildstream:buildstream .
 
@@ -82,6 +71,10 @@ source_dist:
   # user to test for permission issues
   - su buildstream -c 'python3 setup.py test --index-url invalid://uri --addopts --integration'
 
+  - echo "========================================="
+  - python3 setup.py show
+  - echo "========================================="
+
   # Go back to the toplevel and collect our reports
   - cd ../..
   - mkdir -p coverage-linux/
@@ -118,17 +111,6 @@ tests-unix:
 
     - export INTEGRATION_CACHE="$(pwd)/cache/integration-cache"
 
-    - echo "========================================="
-    - pip3 show pep8
-    - pip3 show pytest
-    - pip3 show pylint
-    - pip3 show pytest-cov
-    - pip3 show pytest-datafiles
-    - pip3 show pytest-env
-    - pip3 show pytest-pep8
-    - pip3 show pytest-xdist
-    - echo "========================================="
-
     # We remove the Bubblewrap and OSTree packages here so that we catch any
     # codepaths that try to use them. Removing OSTree causes fuse-libs to
     # disappear unless we mark it as user-installed.
@@ -141,6 +123,10 @@ tests-unix:
     # Since the unix platform is required to run as root, no user change required
     - python3 setup.py test --index-url invalid://uri --addopts --integration
 
+    - echo "========================================="
+    - python3 setup.py show
+    - echo "========================================="
+
     # Go back to the toplevel and collect our reports
     - cd ../..
     - mkdir -p coverage-unix/
diff --git a/setup.py b/setup.py
index cda0ebbcb..bac6997c2 100755
--- a/setup.py
+++ b/setup.py
@@ -164,6 +164,29 @@ def get_args(cls, dist, header=None):
 ScriptWriter.get_args = get_args
 
 
+class ShowVersions(Command):
+    description = 'show package versions used'
+    user_options = []
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        import io
+        out = io.StringIO()
+        out.write("Install dependencies:\n")
+        for r in self.distribution.fetch_build_eggs(self.distribution.install_requires):
+            out.write("  {}\n".format(r))
+        out.write("\n")
+        out.write("Test dependencies:\n")
+        for r in self.distribution.fetch_build_eggs(self.distribution.tests_require):
+            out.write("  {}\n".format(r))
+        print(out.getvalue())
+
+
 #####################################################
 #         gRPC command for code generation          #
 #####################################################
@@ -213,6 +236,7 @@ class BuildGRPC(Command):
 def get_cmdclass():
     cmdclass = {
         'build_grpc': BuildGRPC,
+        'show': ShowVersions,
     }
     cmdclass.update(versioneer.get_cmdclass())
     return cmdclass