Merge pull request openwebwork#2721 from openwebwork/WeBWorK-2.20

WeBWorK 2.20 Release Candidate

Author: drgrice1

.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