Merge pull request easybuilders#18985 from Micket/cvs_rename

Rename CVS to ConcurrentVersionsSystem
ItIsI-Orient · Oct 26, 2023 · 445750e · 445750e
2 parents e93e0e4 + 396330f
commit 445750e
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 26 deletions.
diff --git 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/...syconfigs/c/CVS/CVS-1.11.23-getline.patch → ...tVersionsSystem/CVS-1.11.23-getline.patch b/...syconfigs/c/CVS/CVS-1.11.23-getline.patch → ...tVersionsSystem/CVS-1.11.23-getline.patch
diff --git a/...asyconfigs/c/CVS/CVS-1.11.23-zlib-1.patch → ...ntVersionsSystem/CVS-1.11.23-zlib-1.patch b/...asyconfigs/c/CVS/CVS-1.11.23-zlib-1.patch → ...ntVersionsSystem/CVS-1.11.23-zlib-1.patch
diff --git a/...asyconfigs/c/CVS/CVS-1.11.23-GCC-4.8.2.eb → ...urrentVersionsSystem-1.11.23-GCC-4.8.2.eb b/...asyconfigs/c/CVS/CVS-1.11.23-GCC-4.8.2.eb → ...urrentVersionsSystem-1.11.23-GCC-4.8.2.eb
@@ -5,7 +5,7 @@
 
 easyblock = 'ConfigureMake'
 
-name = 'CVS'
+name = 'ConcurrentVersionsSystem'
 version = '1.11.23'
 
 homepage = 'https://savannah.nongnu.org/projects/cvs'
@@ -15,7 +15,7 @@ description = """CVS is a version control system, an important component of
 toolchain = {'name': 'GCC', 'version': '4.8.2'}
 
 source_urls = [' http://ftp.gnu.org/non-gnu/cvs/source/stable/%(version)s/']
-sources = [SOURCELOWER_TAR_BZ2]
+sources = ['cvs-%(version)s.tar.bz2']
 
 patches = ['CVS-1.11.23-zlib-1.patch', 'CVS-1.11.23-getline.patch']
 

diff --git a/...nfigs/c/CVS/CVS-1.11.23-GCCcore-11.2.0.eb → ...tVersionsSystem-1.11.23-GCCcore-11.2.0.eb b/...nfigs/c/CVS/CVS-1.11.23-GCCcore-11.2.0.eb → ...tVersionsSystem-1.11.23-GCCcore-11.2.0.eb
@@ -5,7 +5,7 @@
 
 easyblock = 'ConfigureMake'
 
-name = 'CVS'
+name = 'ConcurrentVersionsSystem'
 version = '1.11.23'
 
 homepage = 'https://savannah.nongnu.org/projects/cvs'
@@ -16,7 +16,7 @@ Source Configuration Management (SCM).
 toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
 
 source_urls = [' https://ftp.gnu.org/non-gnu/cvs/source/stable/%(version)s/']
-sources = [SOURCELOWER_TAR_BZ2]
+sources = ['cvs-%(version)s.tar.bz2']
 patches = [
     'CVS-1.11.23-zlib-1.patch',
     'CVS-1.11.23-getline.patch',

diff --git a/...onfigs/c/CVS/CVS-1.11.23-GCCcore-4.9.3.eb → ...ntVersionsSystem-1.11.23-GCCcore-4.9.3.eb b/...onfigs/c/CVS/CVS-1.11.23-GCCcore-4.9.3.eb → ...ntVersionsSystem-1.11.23-GCCcore-4.9.3.eb
@@ -5,7 +5,7 @@
 
 easyblock = 'ConfigureMake'
 
-name = 'CVS'
+name = 'ConcurrentVersionsSystem'
 version = '1.11.23'
 
 homepage = 'https://savannah.nongnu.org/projects/cvs'
@@ -15,7 +15,7 @@ description = """CVS is a version control system, an important component of
 toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
 
 source_urls = [' http://ftp.gnu.org/non-gnu/cvs/source/stable/%(version)s/']
-sources = [SOURCELOWER_TAR_BZ2]
+sources = ['cvs-%(version)s.tar.bz2']
 
 patches = ['CVS-1.11.23-zlib-1.patch', 'CVS-1.11.23-getline.patch']
 

diff --git a/...onfigs/c/CVS/CVS-1.11.23-GCCcore-6.4.0.eb → ...ntVersionsSystem-1.11.23-GCCcore-6.4.0.eb b/...onfigs/c/CVS/CVS-1.11.23-GCCcore-6.4.0.eb → ...ntVersionsSystem-1.11.23-GCCcore-6.4.0.eb
@@ -5,7 +5,7 @@
 
 easyblock = 'ConfigureMake'
 
-name = 'CVS'
+name = 'ConcurrentVersionsSystem'
 version = '1.11.23'
 
 homepage = 'https://savannah.nongnu.org/projects/cvs'
@@ -15,7 +15,7 @@ description = """CVS is a version control system, an important component of
 toolchain = {'name': 'GCCcore', 'version': '6.4.0'}
 
 source_urls = [' http://ftp.gnu.org/non-gnu/cvs/source/stable/%(version)s/']
-sources = [SOURCELOWER_TAR_BZ2]
+sources = ['cvs-%(version)s.tar.bz2']
 patches = [
     'CVS-1.11.23-zlib-1.patch',
     'CVS-1.11.23-getline.patch',

diff --git a/easybuild/easyconfigs/j/jhbuild/jhbuild-3.15.92-GCCcore-4.9.3.eb b/easybuild/easyconfigs/j/jhbuild/jhbuild-3.15.92-GCCcore-4.9.3.eb
@@ -12,6 +12,7 @@ toolchain = {'name': 'GCCcore', 'version': '4.9.3'}
 
 sources = ['%(version)s.tar.gz']
 source_urls = [('https://github.com/GNOME/jhbuild/archive/')]
+checksums = [None]
 
 # jhbuild is python so it has a python dependency, but we want to give people freedom to use whatever python they
 # chose during a build process
@@ -28,7 +29,7 @@ dependencies = [
     ('flex', '2.6.0'),
     ('Bison', '3.0.4'),
     ('M4', '1.4.17'),
-    ('CVS', '1.11.23'),
+    ('ConcurrentVersionsSystem', '1.11.23'),
 ]
 
 # We use the simple install method as per:

diff --git 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