Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename CVS to ConcurrentVersionsSystem #18985

Merged
merged 5 commits into from
Oct 26, 2023
Merged

rename CVS to ConcurrentVersionsSystem #18985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
225d415
Rename CVS to ConcurrentVersionsSystem
Micket Oct 11, 2023
78a0f06
Fix dep name in jhbuild
Micket Oct 11, 2023
e0b429a
Add checksums to jhbuild to make CI happy
Micket Oct 11, 2023
c571555
Drop old nonworking checks and workarounds for CVS
Micket Oct 11, 2023
396330f
Fix source filename after rename
Micket Oct 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions .github/workflows/unit_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
0 ...syconfigs/c/CVS/CVS-1.11.23-getline.patch → ...tVersionsSystem/CVS-1.11.23-getline.patch
View file
Open in desktop
File renamed without changes.
0 ...asyconfigs/c/CVS/CVS-1.11.23-zlib-1.patch → ...ntVersionsSystem/CVS-1.11.23-zlib-1.patch
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...asyconfigs/c/CVS/CVS-1.11.23-GCC-4.8.2.eb → ...urrentVersionsSystem-1.11.23-GCC-4.8.2.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

easyblock = 'ConfigureMake'

name = 'CVS'
name = 'ConcurrentVersionsSystem'
version = '1.11.23'

homepage = 'https://savannah.nongnu.org/projects/cvs'
Expand All @@ -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']

Expand Down
4 changes: 2 additions & 2 deletions ...nfigs/c/CVS/CVS-1.11.23-GCCcore-11.2.0.eb → ...tVersionsSystem-1.11.23-GCCcore-11.2.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

easyblock = 'ConfigureMake'

name = 'CVS'
name = 'ConcurrentVersionsSystem'
version = '1.11.23'

homepage = 'https://savannah.nongnu.org/projects/cvs'
Expand All @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions ...onfigs/c/CVS/CVS-1.11.23-GCCcore-4.9.3.eb → ...ntVersionsSystem-1.11.23-GCCcore-4.9.3.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

easyblock = 'ConfigureMake'

name = 'CVS'
name = 'ConcurrentVersionsSystem'
version = '1.11.23'

homepage = 'https://savannah.nongnu.org/projects/cvs'
Expand All @@ -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']

Expand Down
4 changes: 2 additions & 2 deletions ...onfigs/c/CVS/CVS-1.11.23-GCCcore-6.4.0.eb → ...ntVersionsSystem-1.11.23-GCCcore-6.4.0.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

easyblock = 'ConfigureMake'

name = 'CVS'
name = 'ConcurrentVersionsSystem'
version = '1.11.23'

homepage = 'https://savannah.nongnu.org/projects/cvs'
Expand All @@ -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',
Expand Down
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/j/jhbuild/jhbuild-3.15.92-GCCcore-4.9.3.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
4 changes: 0 additions & 4 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,3 @@ builtins =
SOURCELOWER_PY2_WHL,
SOURCE_PY3_WHL,
SOURCELOWER_PY3_WHL

[sdist]
# Don't remove CVS and RCS directories
prune = 0