Skip to content

Commit 0c7f42d

Browse files
authored
Merge pull request #1231 from openwebwork/PG-2.20
PG 2.20 Release Candidate
2 parents afae348 + ae64876 commit 0c7f42d

File tree

670 files changed

+36629
-21535
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

670 files changed

+36629
-21535
lines changed

.github/workflows/check-formats.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ on:
1313
jobs:
1414
perltidy:
1515
name: Check Perl file formatting with perltidy
16-
runs-on: ubuntu-22.04
16+
runs-on: ubuntu-24.04
1717
container:
18-
image: perl:5.34
18+
image: perl:5.38
1919
steps:
2020
- name: Checkout code
2121
uses: actions/checkout@v4
2222
- name: Install dependencies
23-
run: cpanm -n Perl::Tidy@20220613
23+
run: cpanm -n Perl::Tidy@20240903
2424
- name: Run perltidy
2525
shell: bash
2626
run: |
@@ -30,7 +30,7 @@ jobs:
3030
3131
prettier:
3232
name: Check JavaScript, style, and HTML file formatting with prettier
33-
runs-on: ubuntu-22.04
33+
runs-on: ubuntu-24.04
3434
steps:
3535
- name: Checkout code
3636
uses: actions/checkout@v4

.github/workflows/unit-tests.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
unit-tests:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
steps:
1212
- name: Checkout PG code
1313
uses: actions/checkout@v4
@@ -21,20 +21,20 @@ jobs:
2121
dvisvgm \
2222
imagemagick \
2323
libclass-accessor-perl \
24-
libclass-tiny-perl \
2524
libdbi-perl \
2625
libencode-perl \
2726
libgd-perl \
2827
libhtml-parser-perl \
29-
libjson-perl \
30-
libjson-xs-perl \
3128
liblocale-maketext-lexicon-perl \
3229
libmojolicious-perl \
30+
libtest-mockobject-perl \
3331
libtest2-suite-perl \
3432
libtie-ixhash-perl \
3533
libuuid-tiny-perl \
3634
libyaml-libyaml-perl \
3735
pdf2svg \
36+
r-base-core \
37+
r-cran-rserve \
3838
texlive \
3939
texlive-latex-extra \
4040
texlive-latex-recommended \
@@ -46,4 +46,5 @@ jobs:
4646
- name: Run Perl unit tests
4747
run: |
4848
export PG_ROOT=`pwd`
49+
R_HOME=/usr/lib/R /usr/lib/R/site-library/Rserve/libs/Rserve --no-save
4950
prove -r t

.perltidyrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@
2020
-nlop # No logical padding (this causes mixed tabs and spaces)
2121
-wn # Weld nested containers
2222
-xci # Extended continuation indentation
23-
-vxl='q' # No vertical alignment of qw quotes

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Online Homework Delivery System
33
Version 2.*
44

5-
Copyright 2000-2024, The WeBWorK Project
5+
Copyright 2000-2025, The WeBWorK Project
66
All rights reserved.
77

88
This program is free software; you can redistribute it and/or modify

README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66

77
http://webwork.maa.org/wiki/Category:Release_Notes
88

9-
Copyright 2000-2024, The WeBWorK Project
9+
Copyright 2000-2025, The WeBWorK Project
1010
http://webwork.maa.org
1111
All rights reserved.

VERSION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$PG_VERSION ='2.19';
2-
$PG_COPYRIGHT_YEARS = '1996-2024';
1+
$PG_VERSION ='2.20';
2+
$PG_COPYRIGHT_YEARS = '1996-2025';
33

44
1;

bin/convert-to-pgml.pl

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,4 @@
11
#!/usr/bin/env perl
2-
################################################################################
3-
# WeBWorK Online Homework Delivery System
4-
# Copyright © 2000-2024 The WeBWorK Project, https://github.com/openwebwork
5-
#
6-
# This program is free software; you can redistribute it and/or modify it under
7-
# the terms of either: (a) the GNU General Public License as published by the
8-
# Free Software Foundation; either version 2, or (at your option) any later
9-
# version, or (b) the "Artistic License" which comes with this package.
10-
#
11-
# This program is distributed in the hope that it will be useful, but WITHOUT
12-
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
13-
# FOR A PARTICULAR PURPOSE. See either the GNU General Public License or the
14-
# Artistic License for more details.
15-
################################################################################
162

173
=head1 NAME
184

bin/parse-problem-doc.pl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ BEGIN
1515
use lib "$pg_root/lib";
1616

1717
use Mojo::Template;
18-
use File::Basename qw(fileparse basename);
18+
use File::Basename qw(basename);
1919
use Getopt::Long;
2020
use File::Copy qw(copy);
21-
use YAML::XS qw(DumpFile);
2221
use Pod::Simple::Search;
2322

2423
use SampleProblemParser qw(parseSampleProblem generateMetadata);
@@ -155,8 +154,7 @@ ($params, %options)
155154
return;
156155
}
157156

158-
# Copy the PG.js file and CSS file into the output directory.
159-
copy("$pg_root/tutorial/js/PG.js", $out_dir);
157+
# Copy the CSS file into the output directory.
160158
copy("$pg_root/tutorial/css/sample-problem.css", $out_dir);
161159

162160
1;

bin/perltidy-pg.pl

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,4 @@
11
#!/usr/bin/env perl
2-
################################################################################
3-
# WeBWorK Online Homework Delivery System
4-
# Copyright © 2000-2024 The WeBWorK Project, https://github.com/openwebwork
5-
#
6-
# This program is free software; you can redistribute it and/or modify it under
7-
# the terms of either: (a) the GNU General Public License as published by the
8-
# Free Software Foundation; either version 2, or (at your option) any later
9-
# version, or (b) the "Artistic License" which comes with this package.
10-
#
11-
# This program is distributed in the hope that it will be useful, but WITHOUT
12-
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
13-
# FOR A PARTICULAR PURPOSE. See either the GNU General Public License or the
14-
# Artistic License for more details.
15-
################################################################################
162

173
=head1 NAME
184

bin/perltidy-pg.rc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@
1919
-nlop # No logical padding (this causes mixed tabs and spaces)
2020
-wn # Weld nested containers
2121
-xci # Extended continuation indentation
22-
-vxl='q' # No vertical alignment of qw quotes

0 commit comments

Comments
 (0)