WeBWorK 2.20 Release Candidate

.github/workflows/check-formats.yml

@@ -13,14 +13,14 @@ on:
 jobs:
   perltidy:
     name: Check Perl file formatting with perltidy
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
-      image: perl:5.34
+      image: perl:5.38
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Install dependencies
-        run: cpanm -n Perl::Tidy@20220613
+        run: cpanm -n Perl::Tidy@20240903
       - name: Run perltidy
         shell: bash
         run: |
@@ -30,7 +30,7 @@ jobs:
 
   prettier:
     name: Check JavaScript, style, and HTML file formatting with prettier
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

.perltidyrc

@@ -20,4 +20,3 @@
 -nlop   # No logical padding (this causes mixed tabs and spaces)
 -wn     # Weld nested containers
 -xci    # Extended continuation indentation
--vxl='q' # No vertical alignment of qw quotes

Dockerfile

@@ -33,7 +33,7 @@ RUN echo Cloning branch $PG_BRANCH branch from $PG_GIT_URL \
 FROM ubuntu:24.04
 
 ENV WEBWORK_URL=/webwork2 \
-	WEBWORK_ROOT_URL=http://localhost::8080 \
+	WEBWORK_ROOT_URL=http://localhost:8080 \
 	WEBWORK_SMTP_SERVER=localhost \
 	[email protected] \
 	WEBWORK_TIMEZONE=America/New_York \
@@ -106,9 +106,6 @@ RUN apt-get update \
 	libhttp-async-perl \
 	libiterator-perl \
 	libiterator-util-perl \
-	libjson-maybexs-perl \
-	libjson-perl \
-	libjson-xs-perl \
 	liblocale-maketext-lexicon-perl \
 	libmariadb-dev \
 	libmath-random-secure-perl \
@@ -190,6 +187,7 @@ RUN cpanm install -n \
 	DBD::MariaDB \
 	Perl::Tidy@20220613 \
 	Archive::Zip::SimpleZip \
+	Net::SAML2 \
 	&& rm -fr ./cpanm /root/.cpanm /tmp/*
 
 # ==================================================================

DockerfileStage1

@@ -68,9 +68,6 @@ RUN apt-get update \
 	libhttp-async-perl \
 	libiterator-perl \
 	libiterator-util-perl \
-	libjson-maybexs-perl \
-	libjson-perl \
-	libjson-xs-perl \
 	liblocale-maketext-lexicon-perl \
 	libmariadb-dev \
 	libmath-random-secure-perl \
@@ -152,6 +149,7 @@ RUN cpanm install -n \
 	DBD::MariaDB \
 	Perl::Tidy@20220613 \
 	Archive::Zip::SimpleZip \
+	Net::SAML2 \
 	&& rm -fr ./cpanm /root/.cpanm /tmp/*
 
 # ==================================================================

DockerfileStage2

@@ -33,10 +33,10 @@ RUN echo Cloning branch $PG_BRANCH branch from $PG_GIT_URL \
 
 # We need to change FROM before setting the ENV variables.
 
-FROM webwork-base:forWW219
+FROM webwork-base:forWW220
 
 ENV WEBWORK_URL=/webwork2 \
-	WEBWORK_ROOT_URL=http://localhost::8080 \
+	WEBWORK_ROOT_URL=http://localhost:8080 \
 	WEBWORK_SMTP_SERVER=localhost \
 	[email protected] \
 	WEBWORK_TIMEZONE=America/New_York \

LICENSE

@@ -2,7 +2,7 @@
                          Online Homework Delivery System
                                    Version 2.*
 
-                    Copyright 2000-2024, The WeBWorK Project
+                    Copyright 2000-2025, The WeBWorK Project
 
                               All rights reserved.
 

README.md

@@ -3,8 +3,8 @@
                                    Version 2.*
                         Branch:  github.com/openwebwork
 
-             https://webwork.maa.org/wiki/Release_notes_for_WeBWorK_2.19
-                    Copyright 2000-2024, The WeBWorK Project
+             https://webwork.maa.org/wiki/Release_notes_for_WeBWorK_2.20
+                    Copyright 2000-2025, The WeBWorK Project
                              https://openwebwork.org/
                               All rights reserved.
 
@@ -26,8 +26,6 @@ New users interested in getting started with their own WeBWorK server, or instru
 
 ## Information for Downloading
 
-* The current version is WeBWorK-2.18 and its companion PG-2.18
-
 * Installation manuals can be found at https://webwork.maa.org/wiki/Category:Installation_Manuals
 
 ## Information For Developers

VERSION

@@ -1,4 +1,4 @@
-$WW_VERSION = '2.19';
-$WW_COPYRIGHT_YEARS = '1996-2024';
+$WW_VERSION = '2.20';
+$WW_COPYRIGHT_YEARS = '1996-2025';
 
 1;

assets/pg/PGMLLab/PGML-lab.pg

@@ -507,7 +507,7 @@ TEXT(tag(
 								>]{ [ style => 'border: 1px solid black; padding: 1rem;' ] }
 
 								One useful application is when using the parserMultiAnswer.pl macro with
-								singleResult answers. Wrap the answers in in a div tag with the
+								singleResult answers. Wrap the answers in a div tag with the
 								"ww-feedback-container" class to tell PG where to place the feedback
 								button. The feedback button will be placed at the end of the containing div
 								tag.

assets/pg/Student_Orientation/setStudent_Orientation.def

@@ -1,8 +1,8 @@
 assignmentType          = default
 openDate                = 01/01/2024 at 12:00am
-reducedScoringDate      = 12/31/2124 at 11:59pm
-dueDate                 = 12/31/2124 at 11:59pm
-answerDate              = 12/31/2124 at 11:59pm
+reducedScoringDate      = 12/31/2045 at 11:59pm
+dueDate                 = 12/31/2045 at 11:59pm
+answerDate              = 12/31/2045 at 11:59pm
 enableReducedScoring    = N
 paperHeaderFile         = defaultHeader
 screenHeaderFile        = defaultHeader

bin/OPL-update-legacy

@@ -28,7 +28,6 @@ use DBI;
 my $taxo={};
 #my $taxsubs = [];
 
-
 ### Data for creating the database tables
 
 my %OPLtables = (
@@ -539,8 +538,6 @@ if($canopenfile) {
 }
 #### End of taxonomy/taxonomy2
 
-use JSON;
-
 #### Save the official taxonomy in json format
 my $webwork_htdocs = $ce->{webworkDirs}{htdocs};
 my $file = "$webwork_htdocs/DATA/tagging-taxonomy.json";

bin/OPLUtils.pm

@@ -1,4 +1,3 @@
-
 package OPLUtils;
 use base qw(Exporter);
 
@@ -17,7 +16,7 @@ use warnings;
 use File::Find::Rule;
 use File::Basename;
 use open qw/:std :utf8/;
-use JSON;
+use Mojo::JSON qw(encode_json);
 
 our @EXPORT = ();
 our @EXPORT_OK =
@@ -373,7 +372,7 @@ sub build_library_textbook_tree {
 sub writeJSONtoFile {
 	my ($data, $filename) = @_;
 
-	my $json = JSON->new->utf8->encode($data);
+	my $json = encode_json($data);
 	open my $fh, ">", $filename or die "Cannot open $filename";
 	print $fh $json;
 	close $fh;

bin/addcourse

@@ -1,18 +1,4 @@
 #!/usr/bin/env perl
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2024 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
 
 =head1 NAME
 
@@ -32,11 +18,6 @@ be granted professor privileges.
 
 =over
 
-=item B<--db-layout>=I<LAYOUT>
-
-The specified database layout will be used in place of the default specified in
-F<defaults.config>.
-
 =item B<--users>=I<FILE>
 
 The users listed in the comma-separated text file I<FILE> will be added to the
@@ -77,30 +58,26 @@ BEGIN {
 use lib "$ENV{WEBWORK_ROOT}/lib";
 
 use WeBWorK::CourseEnvironment;
-
-# Grab course environment (by reading webwork2/conf/defaults.config)
-my $ce = WeBWorK::CourseEnvironment->new;
-
-use WeBWorK::DB;
 use WeBWorK::File::Classlist;
 use WeBWorK::Utils qw(runtime_use cryptPassword);
 use WeBWorK::Utils::CourseManagement qw(addCourse);
 use WeBWorK::File::Classlist qw(parse_classlist);
+use WeBWorK::DB::Record::User;
+use WeBWorK::DB::Record::Password;
+use WeBWorK::DB::Record::PermissionLevel;
 
 sub usage_error {
 	warn "@_\n";
 	warn "usage: $0 [options] COURSEID\n";
 	warn "Options:\n";
-	warn "  [--db-layout=LAYOUT]\n";
 	warn "  [--users=FILE [--professors=USERID[,USERID]...] ]\n";
 	exit;
 }
 
-my ($dbLayout, $users, $templates_from) = ('', '', '');
+my ($users, $templates_from) = ('', '');
 my @professors;
 
 GetOptions(
-	"db-layout=s"      => \$dbLayout,
 	"users=s"          => \$users,
 	"professors=s"     => \@professors,
 	"templates-from=s" => \$templates_from,
@@ -110,33 +87,16 @@ my $courseID   = shift;
 
 usage_error('The COURSEID must be provided.') unless $courseID;
 
-$ce = WeBWorK::CourseEnvironment->new({ courseName => $courseID });
+my $ce = WeBWorK::CourseEnvironment->new({ courseName => $courseID });
 
 die "Aborting addcourse: Course ID cannot exceed $ce->{maxCourseIdLength} characters."
 	if length($courseID) > $ce->{maxCourseIdLength};
 
-if ($dbLayout) {
-	die "Database layout $dbLayout does not exist in the course environment.",
-		" (It must be defined in defaults.config.)\n"
-		unless exists $ce->{dbLayouts}{$dbLayout};
-} else {
-	$dbLayout = $ce->{dbLayoutName};
-}
-
 usage_error("Can't specify --professors without also specifying --users.")
 	if @professors && !$users;
 
 my @users;
 if ($users) {
-	# This is a hack to create records without bringing up a DB object
-	my $userClass       = $ce->{dbLayouts}{$dbLayout}{user}{record};
-	my $passwordClass   = $ce->{dbLayouts}{$dbLayout}{password}{record};
-	my $permissionClass = $ce->{dbLayouts}{$dbLayout}{permission}{record};
-
-	runtime_use($userClass);
-	runtime_use($passwordClass);
-	runtime_use($permissionClass);
-
 	my @classlist = parse_classlist($users);
 	for my $record (@classlist) {
 		my %record  = %$record;
@@ -168,9 +128,9 @@ if ($users) {
 
 		push @users,
 			[
-				$userClass->new(%record),
-				$record{password} ? $passwordClass->new(user_id => $user_id, password => $record{password}) : undef,
-				$permissionClass->new(
+				WeBWorK::DB::Record::User->new(%record),
+				WeBWorK::DB::Record::Password->new(user_id => $user_id, password => $record{password}),
+				WeBWorK::DB::Record::PermissionLevel->new(
 					user_id    => $user_id,
 					permission => defined $professors{$user_id}
 					? $ce->{userRoles}{professor}
@@ -190,15 +150,7 @@ if ($templates_from) {
 	$optional_arguments{copyTemplatesHtml} = 1;
 }
 
-eval {
-	addCourse(
-		courseID      => $courseID,
-		ce            => $ce,
-		courseOptions => { dbLayoutName => $dbLayout },
-		users         => \@users,
-		%optional_arguments,
-	);
-};
+eval { addCourse(courseID => $courseID, ce => $ce, users => \@users, %optional_arguments,); };
 
 die "$@\n" if $@;
 

bin/change_user_id

@@ -47,7 +47,7 @@ my $ce = WeBWorK::CourseEnvironment->new({
 	courseName  => $courseID
 });
 
-my $db = new WeBWorK::DB($ce->{dbLayout});
+my $db = WeBWorK::DB->new($ce);
 die "Error: $old_user_id does not exist!" unless $db->existsUser($old_user_id);
 
 unless($db->existsUser($new_user_id)) {
@@ -69,7 +69,6 @@ unless($db->existsPermissionLevel($new_user_id)) {
     $db->addPermissionLevel($permission);
 }
 
-
 my @old_user_sets = $db->listUserSets($old_user_id);
 foreach(@old_user_sets) {
     my $set_id = $_;

bin/check_latex

@@ -1,18 +1,4 @@
 #!/usr/bin/env perl
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright © 2000-2024 The WeBWorK Project, https://github.com/openwebwork
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of either: (a) the GNU General Public License as published by the
-# Free Software Foundation; either version 2, or (at your option) any later
-# version, or (b) the "Artistic License" which comes with this package.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-# Artistic License for more details.
-################################################################################
 
 =head1 NAME
 

bin/check_latex_article.tex

@@ -1,18 +1,3 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% WeBWorK Online Homework Delivery System
-% Copyright © 2000-2024 The WeBWorK Project, https://github.com/openwebwork
-%
-% This program is free software; you can redistribute it and/or modify it under
-% the terms of either: (a) the GNU General Public License as published by the
-% Free Software Foundation; either version 2, or (at your option) any later
-% version, or (b) the "Artistic License" which comes with this package.
-%
-% This program is distributed in the hope that it will be useful, but WITHOUT
-% ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-% FOR A PARTICULAR PURPOSE.  See either the GNU General Public License or the
-% Artistic License for more details.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 \documentclass[10pt]{article}
 
 \usepackage{webwork2}