openwebwork · drgrice1 · Mar 13, 2025 · Mar 25, 2025 · Mar 25, 2025 · Feb 25, 2025
diff --git a/.github/workflows/check-formats.yml b/.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

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   unit-tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout PG code
         uses: actions/checkout@v4
@@ -21,20 +21,20 @@ jobs:
             dvisvgm \
             imagemagick \
             libclass-accessor-perl \
-            libclass-tiny-perl \
             libdbi-perl \
             libencode-perl \
             libgd-perl \
             libhtml-parser-perl \
-            libjson-perl \
-            libjson-xs-perl \
             liblocale-maketext-lexicon-perl \
             libmojolicious-perl \
+            libtest-mockobject-perl \
             libtest2-suite-perl \
             libtie-ixhash-perl \
             libuuid-tiny-perl \
             libyaml-libyaml-perl \
             pdf2svg \
+            r-base-core \
+            r-cran-rserve \
             texlive \
             texlive-latex-extra \
             texlive-latex-recommended \
@@ -46,4 +46,5 @@ jobs:
       - name: Run Perl unit tests
         run: |
           export PG_ROOT=`pwd`
+          R_HOME=/usr/lib/R /usr/lib/R/site-library/Rserve/libs/Rserve --no-save
           prove -r t
diff --git a/.perltidyrc b/.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
diff --git a/LICENSE b/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.
 
     This program is free software; you can redistribute it and/or modify

diff --git a/README b/README
@@ -6,6 +6,6 @@
 
 		http://webwork.maa.org/wiki/Category:Release_Notes
 
-                    Copyright 2000-2024, The WeBWorK Project
+                    Copyright 2000-2025, The WeBWorK Project
                              http://webwork.maa.org
                               All rights reserved.
diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
-$PG_VERSION  ='2.19';
-$PG_COPYRIGHT_YEARS = '1996-2024';
+$PG_VERSION  ='2.20';
+$PG_COPYRIGHT_YEARS = '1996-2025';
 
 1;
diff --git a/bin/convert-to-pgml.pl b/bin/convert-to-pgml.pl
@@ -1,18 +1,4 @@
 #!/usr/bin/env perl
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 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
 

diff --git a/bin/parse-problem-doc.pl b/bin/parse-problem-doc.pl
@@ -15,10 +15,9 @@ BEGIN
 use lib "$pg_root/lib";
 
 use Mojo::Template;
-use File::Basename qw(fileparse basename);
+use File::Basename qw(basename);
 use Getopt::Long;
 use File::Copy qw(copy);
-use YAML::XS qw(DumpFile);
 use Pod::Simple::Search;
 
 use SampleProblemParser qw(parseSampleProblem generateMetadata);
@@ -155,8 +154,7 @@ ($params, %options)
 	return;
 }
 
-# Copy the PG.js file and CSS file into the output directory.
-copy("$pg_root/tutorial/js/PG.js",               $out_dir);
+# Copy the CSS file into the output directory.
 copy("$pg_root/tutorial/css/sample-problem.css", $out_dir);
 
 1;
diff --git a/bin/perltidy-pg.pl b/bin/perltidy-pg.pl
@@ -1,18 +1,4 @@
 #!/usr/bin/env perl
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 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
 

diff --git a/bin/perltidy-pg.rc b/bin/perltidy-pg.rc
@@ -19,4 +19,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
diff --git a/bin/run-perltidy.pl b/bin/run-perltidy.pl
@@ -1,18 +1,4 @@
 #!/usr/bin/env perl
-################################################################################
-# WeBWorK Online Homework Delivery System
-# Copyright &copy; 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
 
@@ -62,9 +48,8 @@ =head1 OPTIONS
 
 my $pg_root = curfile->dirname->dirname;
 
-die "Version 20220613 or newer of perltidy is required for this script.\n"
-	. "The installed version is $Perl::Tidy::VERSION.\n"
-	unless $Perl::Tidy::VERSION >= 20220613;
+die "Version 20240903 of perltidy is required for this script.\nThe installed version is $Perl::Tidy::VERSION.\n"
+	unless $Perl::Tidy::VERSION == 20240903;
 die "The .perltidyrc file in the pg root directory is not readable.\n"
 	unless -r "$pg_root/.perltidyrc";
 

diff --git a/conf/pg_config.dist.yml b/conf/pg_config.dist.yml
@@ -139,6 +139,12 @@ specialPGEnvironmentVars:
   # Size in pixels of dynamically-generated images, i.e. graphs.
   onTheFlyImageSize: 400
 
+  # To enable Rserve (the R statistical server), uncomment the following two
+  # lines. The R server needs to be installed and running in order for this to
+  # work. See http://webwork.maa.org/wiki/R_in_WeBWorK for more info.
+  #Rserve:
+  #  host: localhost
+
   # Locations of CAPA resources. (Only necessary if you need to use converted CAPA problems.)
   CAPA_Tools: $Contrib_dir/CAPA/macros/CAPA_Tools/
   CAPA_MCTools: $Contrib_dir/Contrib/CAPA/macros/CAPA_MCTools/
@@ -230,6 +236,7 @@ modules:
   - [Multiple]
   - [PGrandom]
   - [Regression]
+  - ['Plots::Plot', 'Plots::Axes', 'Plots::Data', 'Plots::Tikz', 'Plots::JSXGraph', 'Plots::GD']
   - [Select]
   - [Units]
   - [VectorField]
@@ -248,8 +255,7 @@ modules:
   - ['Tie::IxHash']
   - ['Locale::Maketext']
   - ['WeBWorK::PG::Localize']
-  - [JSON]
-  - ['Class::Tiny']
+  - ['Mojo::JSON']
   - ['IO::Handle']
   - ['Rserve']
   - [DragNDrop]

diff --git a/cpanfile b/cpanfile
@@ -2,8 +2,7 @@
 # cpanm --installdeps .
 
 on runtime => sub {
-	requires   'perl' => '5.20.3';
-	recommends 'perl' => '5.30.0'; # Needed for Statistics::R::IO
+	requires 'perl' => '5.20.3';
 
 	requires 'DBI';
 	requires 'Digest::MD5';
@@ -14,8 +13,7 @@ on runtime => sub {
 	requires 'GD';
 	requires 'HTML::Entities';
 	requires 'HTML::Parser';
-	requires 'JSON';
-	requires 'JSON::XS';
+	requires 'Mojo::JSON';
 	requires 'Locale::Maketext';
 	requires 'Locale::Maketext::Lexicon';
 	requires 'Mojolicious';
@@ -25,13 +23,12 @@ on runtime => sub {
 	requires 'YAML::XS';
 
 	# Needed for Rserve
-	recommends 'Statistics::R::IO::Rserve';
-	recommends 'Class::Tiny';
 	recommends 'IO::Handle';
 };
 
 on test => sub {
 	requires 'Test2::V0' => '0.000139';
+	requires 'Test::MockObject::Extends';
 	requires 'HTML::TagParser';         # Used by t/macros/basicmacros.t
 
 	recommends 'Data::Dumper';          # For debugging data structures