Merge pull request #223 from hadfl/pymod

package version parser fixes

Author: citrus-it

.github/workflows/unit-tests.yaml

@@ -21,9 +21,9 @@ jobs:
           # - windows-latest
 
         perl:
-          - '5.34'
           - '5.36'
           - '5.38'
+          - '5.40'
         # exclude:
           #- os: ubuntu-16.04
           #  perl: '5.26'

lib/OOCEapps/PkgUpd/GitLab.pm

@@ -17,7 +17,9 @@ sub getVersions {
 
     $name = $self->extractName($name);
 
-    return [ map { $_->{name} =~ /^v?([\d.]+)$/ } @{$res->json // []} ];
+    my $attr = $name eq 'libxslt' ? 'tag_name' : 'name';
+
+    return [ map { $_->{$attr} =~ /^v?([\d.]+)$/ } @{$res->json // []} ];
 }
 
 1;
@@ -26,7 +28,7 @@ __END__
 
 =head1 COPYRIGHT
 
-Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
+Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
 
 =head1 LICENSE
 

lib/OOCEapps/PkgUpd/OpenSSL.pm

@@ -1,35 +1,23 @@
 package OOCEapps::PkgUpd::PyMod;
 use Mojo::Base 'OOCEapps::PkgUpd::base';
-use Mojo::Util 'trim';
 
 # public methods
 sub canParse {
     my $self = shift;
     my $name = shift;
     my $url  = shift;
 
-    return $url =~ m|^https://pypi\.org/project/|;
+    return $url =~ m|^https://pypi\.org/rss/project/|;
 }
 
 sub getVersions {
     my $self = shift;
     my $name = shift;
     my $res  = shift;
 
-    # remove version suffix
-    $name =~ s/-\d{2}$//;
-
-    $name = $self->extractName($name);
-
-    # Version 0.7 is mistakenly shown as 7 on the prettytable project page
-    # we expect at least a version of the pattern x.y
-    my $FILTER = $name eq 'prettytable' ? qr/\d+\./ : qr/./;
-
     return [
-        grep { /^$FILTER/ }
         grep { !/(?:rc|a(?:lpha)?|b(?:eta)?)\d+$/ }
-        map { $_->text ? trim($_->text) : () }
-        $res->dom->find('p.release__version')->each
+        $res->dom->find('rss > channel > item > title')->map('text')->each
     ];
 }
 
@@ -39,7 +27,7 @@ __END__
 
 =head1 COPYRIGHT
 
-Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
 
 =head1 LICENSE
 

lib/OOCEapps/PkgUpd/PyMod.pm

@@ -4,7 +4,7 @@ use Mojo::Base -base;
 use Mojo::JSON qw(encode_json decode_json);
 use Mojo::Util qw(b64_encode b64_decode);
 use Crypt::Ed25519;
-use File::Spec qw(catdir splitpath);
+use File::Spec;
 use Email::MIME;
 use Email::Sender::Simple;
 use File::Temp;
@@ -269,7 +269,7 @@ __END__
 
 =head1 COPYRIGHT
 
-Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
+Copyright 2025 OmniOS Community Edition (OmniOSce) Association.
 
 =head1 LICENSE