From bfcea2b1a3c6f15984794f9331a124a8af3c01f9 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Thu, 14 Dec 2023 17:08:21 +0100
Subject: [PATCH] Remove test against cat1 that will always fail

---
 .github/workflows/pulsar.yaml  |  2 --
 Makefile                       |  5 +----
 install_test/test_install.bash | 23 -----------------------
 tox.ini                        |  5 ++---
 4 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100755 install_test/test_install.bash

diff --git a/.github/workflows/pulsar.yaml b/.github/workflows/pulsar.yaml
index 92e85d32..6cacaf6e 100644
--- a/.github/workflows/pulsar.yaml
+++ b/.github/workflows/pulsar.yaml
@@ -51,8 +51,6 @@ jobs:
           python: 3.11
         - tox-env: py311-test-unit
           python: 3.11
-        - tox-env: py39-install_wheel-no_conda
-          python: 3.9
         - tox-env: py37-install_wheel
           python: 3.7
     services:
diff --git a/Makefile b/Makefile
index 6bbc78b5..d75196af 100644
--- a/Makefile
+++ b/Makefile
@@ -84,14 +84,11 @@ tests:
 	$(IN_VENV) nosetests $(NOSE_TESTS)
 
 test-install-pypi:
-	bash install_test/test_install.bash
+	bash install_test/test_install_conda.bash
 
 test-install-wheel: dist
 	PULSAR_INSTALL_TARGET=$(wildcard $(shell pwd)/dist/pulsar_app*.whl)[web] bash install_test/test_install_conda.bash
 
-test-install-wheel-no-conda: dist
-	PULSAR_INSTALL_TARGET=$(wildcard $(shell pwd)/dist/pulsar_app*.whl)[web] bash install_test/test_install.bash
-
 coverage:
 	coverage run --source $(SOURCE_DIR) setup.py $(TEST_DIR)
 	coverage report -m
diff --git a/install_test/test_install.bash b/install_test/test_install.bash
deleted file mode 100755
index 73e99b26..00000000
--- a/install_test/test_install.bash
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -e
-
-SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd )"
-. "$SCRIPT_DIR/common_functions.bash"
-
-init_temp_dir
-
-init_pulsar
-
-cd pulsar
-echo "Running pulsar-config with default arguments"
-pulsar-config
-cd ..
-
-check_pulsar
-
-init_planemo "demo"
-
-run_planemo --job_config_file "$SCRIPT_DIR/galaxy_job_conf.xml" test_tools/cat.xml
-
-stop_pulsar
diff --git a/tox.ini b/tox.ini
index 50f3d1ab..a2df1fcf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = lint, docs, dist, test-unit, test, install_wheel, install_wheel-no_conda
+envlist = lint, docs, dist, test-unit, test, install_wheel
 toxworkdir={env:TOX_WORK_DIR:.tox}
 source_dir = pulsar
 test_dir = test
@@ -11,8 +11,7 @@ commands =
     lint: flake8 --ignore W504 {[tox]source_dir} {[tox]test_dir}
     dist: make lint-dist
     docs: make lint-docs
-    install_wheel-!no_conda: make test-install-wheel
-    install_wheel-no_conda: make test-install-wheel-no-conda
+    install_wheel: make test-install-wheel
     mypy: mypy {[tox]source_dir} {[tox]test_dir}
 
 deps =