From c57155500ede1cec4c542391a3159994c88d258d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20=C3=96hman?= Date: Wed, 11 Oct 2023 15:20:50 +0200 Subject: [PATCH] Drop old nonworking checks and workarounds for CVS --- .github/workflows/unit_tests.yml | 13 ------------- setup.cfg | 4 ---- 2 files changed, 17 deletions(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index d36d0a6398e..db62a78bc25 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -147,10 +147,6 @@ jobs: eb --search '^foss-2019b.eb' | tee eb_search_foss.out grep '/foss-2019b.eb$' eb_search_foss.out - # make sure CVS easyconfigs are included in installation (cfr. issue #10325) - echo "Searching for CVS easyconfigs..." - eb --search '^CVS-' | grep '/CVS-' - # try installing M4 with system toolchain (requires ConfigureMake easyblock + easyconfig) # use /tmp/sources because that has cached downloads (see cache step above) eb --prefix /tmp/$USER/$GITHUB_SHA --sourcepath /tmp/sources M4-1.4.18.eb @@ -184,12 +180,3 @@ jobs: else echo "No .git folders found in source tarball: OK" fi - - # CVS easyconfigs must be included in source tarball, - # see https://github.com/easybuilders/easybuild-easyconfigs/issues/10325 - cvs_easyconfigs=$(find . -name 'CVS-*.eb') - if [ -z "$cvs_easyconfigs" ]; then - echo "CVS easyconfigs not found" && false - else - echo "Found CVS easyconfigs: $cvs_easyconfigs" - fi diff --git a/setup.cfg b/setup.cfg index c1167840f91..3e70f500f0d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -74,7 +74,3 @@ builtins = SOURCELOWER_PY2_WHL, SOURCE_PY3_WHL, SOURCELOWER_PY3_WHL - -[sdist] -# Don't remove CVS and RCS directories -prune = 0