Remove test against cat1 that will always fail

galaxyproject · Dec 14, 2023 · bfcea2b · bfcea2b
1 parent a5983e9
commit bfcea2b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 32 deletions.
diff --git 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
@@ -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
diff --git 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 =