Skip to content

Commit 0422220

Browse files
authored
Merge pull request #2632 from drgrice1/perltidy-update
Switch to using Perl::Tidy version 20240903 (the latest).
2 parents 4a0953f + 2349421 commit 0422220

File tree

99 files changed

+208
-214
lines changed

Some content is hidden

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

99 files changed

+208
-214
lines changed

.github/workflows/check-formats.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
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: |

.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

bin/check_modules.pl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ =head1 DESCRIPTION
165165
'LWP::Protocol::https' => 6.06,
166166
'Mojolicious' => 9.34,
167167
'Net::SSLeay' => 1.46,
168-
'Perl::Tidy' => 20220613,
169168
'SQL::Abstract' => 2.000000
170169
);
171170

bin/crypt_passwords_in_classlist.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ BEGIN
1313

1414
use lib "$ENV{WEBWORK_ROOT}/lib";
1515

16-
use WeBWorK::Utils qw(cryptPassword);
16+
use WeBWorK::Utils qw(cryptPassword);
1717
use WeBWorK::File::Classlist qw(parse_classlist write_classlist);
1818

1919
unless (@ARGV == 1) {

bin/dev_scripts/PODtoHTML.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ use Pod::Simple::Search;
2323
use Mojo::Template;
2424
use Mojo::DOM;
2525
use Mojo::Collection qw(c);
26-
use File::Path qw(make_path);
27-
use File::Basename qw(dirname);
26+
use File::Path qw(make_path);
27+
use File::Basename qw(dirname);
2828
use IO::File;
2929
use POSIX qw(strftime);
3030

bin/dev_scripts/generate-ww-pg-pod.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ =head1 DESCRIPTION
6565
use Mojo::Template;
6666
use IO::File;
6767
use File::Copy;
68-
use File::Path qw(make_path remove_tree);
68+
use File::Path qw(make_path remove_tree);
6969
use File::Basename qw(dirname);
70-
use Cwd qw(abs_path);
70+
use Cwd qw(abs_path);
7171

7272
use lib dirname(dirname(dirname(__FILE__))) . '/lib';
7373
use lib dirname(__FILE__);

bin/dev_scripts/run-perltidy.pl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,8 @@ =head1 OPTIONS
6363

6464
my $webwork_root = curfile->dirname->dirname->dirname;
6565

66-
die "Version 20220613 or newer of perltidy is required for this script.\n"
67-
. "The installed version is $Perl::Tidy::VERSION.\n"
68-
unless $Perl::Tidy::VERSION >= 20220613;
66+
die "Version 20240903 of perltidy is required for this script.\nThe installed version is $Perl::Tidy::VERSION.\n"
67+
unless $Perl::Tidy::VERSION == 20240903;
6968
die "The .perltidyrc file in the webwork root directory is not readable.\n"
7069
unless -r "$webwork_root/.perltidyrc";
7170

bin/download-OPL-metadata-release.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
BEGIN {
1717
use Mojo::File qw(curfile);
18-
use Env qw(WEBWORK_ROOT);
18+
use Env qw(WEBWORK_ROOT);
1919

2020
$WEBWORK_ROOT = curfile->dirname->dirname;
2121
}

bin/dump-OPL-tables.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
BEGIN {
2424
use Mojo::File qw(curfile);
25-
use Env qw(WEBWORK_ROOT);
25+
use Env qw(WEBWORK_ROOT);
2626

2727
$WEBWORK_ROOT = curfile->dirname->dirname;
2828
}

bin/dump-past-answers.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ =head1 DESCRIPTION
9898

9999
BEGIN {
100100
use Mojo::File qw(curfile);
101-
use Env qw(WEBWORK_ROOT);
101+
use Env qw(WEBWORK_ROOT);
102102
$WEBWORK_ROOT = curfile->dirname->dirname;
103103
}
104104

0 commit comments

Comments
 (0)