Skip to content

Commit

Permalink
Stop requiring Status in package metadata (#5472)
Browse files Browse the repository at this point in the history
Likewise for `CommunicatedBy` and `AcceptDate`.

Motivation: this data logically does not belong with the package
metadata controlled by package authors. Instead it should be
stored in a central location managed by the GAP team.
  • Loading branch information
fingolfin authored Jul 18, 2023
1 parent 03ec9eb commit b73b40f
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 44 deletions.
9 changes: 0 additions & 9 deletions doc/ref/gappkg.xml
Original file line number Diff line number Diff line change
Expand Up @@ -212,14 +212,6 @@ The following components of this record are <E>mandatory</E>.
a string that lists the supported formats (among <C>.tar.gz</C>,
<C>.tar.bz2</C>, <C>-win.zip</C>), separated by whitespace or commas,
</Item>
<Mark><C>Status</C></Mark>
<Item>
one of <C>"accepted"</C>, <C>"submitted"</C>, <C>"deposited"</C>,
<C>"dev"</C>, <C>"other"</C>;
if the value is <C>"accepted"</C> then also
<C>CommunicatedBy</C> (a string of the form <C>name (place)</C>) and
<C>AcceptDate</C> (a string of the form <C>mm/yyyy</C>) are mandatory,
</Item>
<Mark><C>README_URL</C></Mark>
<Item>
a string started with <C>http://</C>, <C>https://</C>, or <C>ftp://</C>,
Expand Down Expand Up @@ -932,7 +924,6 @@ gap> ValidatePackageInfo("PackageInfo.g");
#E component `Date' must be bound to a string of the form `dd/mm/yyyy'
#E component `ArchiveURL' must be bound to a string started with http://, https:// or ftp://
#E component `ArchiveFormats' must be bound to a string
#E component `Status' must be bound to one of "accepted", "deposited", "dev", "other"
#E component `README_URL' must be bound to a string started with http://, https:// or ftp://
#E component `PackageInfoURL' must be bound to a string started with http://, https:// or ftp://
#E component `AbstractHTML' must be bound to a string
Expand Down
19 changes: 1 addition & 18 deletions lib/package.gi
Original file line number Diff line number Diff line change
Expand Up @@ -2318,19 +2318,6 @@ InstallGlobalFunction( ValidatePackageInfo, function( info )
od;
fi;

if TestMandat( record, "Status",
x -> x in [ "accepted", "submitted", "deposited", "dev", "other" ],
"one of \"accepted\", \"deposited\", \"dev\", \"other\"" )
and record.Status = "accepted" then
TestMandat( record, "CommunicatedBy",
x -> IsString(x) and PositionSublist( x, " (" ) <> fail
and x[ Length(x) ] = ')',
"a string of the form `<name> (<place>)'" );
TestMandat( record, "AcceptDate",
x -> IsString( x ) and Length( x ) = 7 and x[3] = '/'
and ForAll( x{ [1,2,4,5,6,7] }, IsDigitChar ),
"a string of the form `mm/yyyy'" );
fi;
TestMandat( record, "README_URL", IsURL, "a string started with http://, https:// or ftp://" );
TestMandat( record, "PackageInfoURL", IsURL, "a string started with http://, https:// or ftp://" );

Expand Down Expand Up @@ -2835,11 +2822,7 @@ InstallGlobalFunction( BibEntry, function( arg )
" <year>", pkginfo.Date{ [ 7 .. 10 ] }, "</year>\n" ) );
fi;
fi;
if IsBound( pkginfo.Status ) and pkginfo.Status = "accepted" then
Append( entry, " <note>Refereed " );
else
Append( entry, " <note>" );
fi;
Append( entry, " <note>" );
# Append( entry, "<Package>GAP</Package> package</note>\n" );
Append( entry, "GAP package</note>\n" );
if IsBound( pkginfo.Keywords ) then
Expand Down
10 changes: 0 additions & 10 deletions tst/mockpkg/PackageInfo.g
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,6 @@ ArchiveURL := Concatenation( ~.PackageWWWHome,

ArchiveFormats := ".tar.gz",

## Status information. Currently the following cases are recognized:
## "accepted" for successfully refereed packages
## "submitted" for packages submitted for the refereeing
## "deposited" for packages for which the GAP developers agreed
## to distribute them with the core GAP system
## "dev" for development versions of packages
## "other" for all other packages
##
Status := "dev",

AbstractHTML := "",

PackageDoc := rec(
Expand Down
7 changes: 0 additions & 7 deletions tst/testinstall/package.tst
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,6 @@ gap> ValidatePackageInfo(rec());
#E component `ArchiveURL' must be bound to a string started with http://, htt\
ps:// or ftp://
#E component `ArchiveFormats' must be bound to a string
#E component `Status' must be bound to one of "accepted", "deposited", "dev",\
"other"
#E component `README_URL' must be bound to a string started with http://, htt\
ps:// or ftp://
#E component `PackageInfoURL' must be bound to a string started with http://,\
Expand All @@ -226,7 +224,6 @@ gap> info := rec(
> Date := "01/20/2015",
> ArchiveURL := "https://",
> ArchiveFormats := "",
> Status := "other",
> README_URL := "https://",
> PackageInfoURL := "https://",
> AbstractHTML := "",
Expand Down Expand Up @@ -255,7 +252,6 @@ gap> info := rec(
> Date := "2013-05-22",
> ArchiveURL := "https://",
> ArchiveFormats := "",
> Status := "other",
> README_URL := "https://",
> PackageInfoURL := "https://",
> AbstractHTML := "",
Expand All @@ -282,7 +278,6 @@ gap> info := rec(
> Date := "2013-22-05",
> ArchiveURL := "https://",
> ArchiveFormats := "",
> Status := "other",
> README_URL := "https://",
> PackageInfoURL := "https://",
> AbstractHTML := "",
Expand Down Expand Up @@ -311,7 +306,6 @@ gap> info := rec(
> Date := "2013-05-22-",
> ArchiveURL := "https://",
> ArchiveFormats := "",
> Status := "other",
> README_URL := "https://",
> PackageInfoURL := "https://",
> AbstractHTML := "",
Expand Down Expand Up @@ -340,7 +334,6 @@ gap> info := rec(
> Date := "01/02/3000",
> ArchiveURL := "https://",
> ArchiveFormats := "",
> Status := "other",
> README_URL := "https://",
> PackageInfoURL := "https://",
> AbstractHTML := "",
Expand Down

0 comments on commit b73b40f

Please sign in to comment.