Skip to content

Commit

Permalink
Merge pull request #3189 from os-autoinst/kraih/upstream_fixes
Browse files Browse the repository at this point in the history
Increase version requirement for some dependencies
  • Loading branch information
kraih authored Jun 22, 2020
2 parents 560f446 + 782381d commit 88eb8f0
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .circleci/dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -129,16 +129,16 @@ perl-Log-Contextual-0.008001
perl-LWP-MediaTypes-6.02
perl-LWP-Protocol-https-6.06
perl-Meta-Builder-0.003
perl-Minion-10.06
perl-Minion-Backend-SQLite-4.005
perl-Minion-10.08
perl-Minion-Backend-SQLite-5.0.1
perl-Module-Build-0.422400
perl-Module-Find-0.13
perl-Module-Implementation-0.09
perl-Module-Pluggable-5.2
perl-Module-Runtime-0.016
perl-Module-Runtime-Conflicts-0.003
perl-Mojo-IOLoop-ReadWriteProcess-0.25
perl-Mojolicious-8.53
perl-Mojolicious-8.55
perl-Mojolicious-Plugin-AssetPack-2.08
perl-Mojo-Pg-4.19
perl-Mojo-RabbitMQ-Client-0.3.1
Expand Down
6 changes: 3 additions & 3 deletions cpanfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ requires 'JSON::Validator';
requires 'JavaScript::Minifier::XS', '>= 0.11';
requires 'LWP::Protocol::https';
requires 'LWP::UserAgent';
requires 'Minion', '>= 10.04';
requires 'Minion::Backend::SQLite';
requires 'Minion', '>= 10.08';
requires 'Minion::Backend::SQLite', '>= 5.0.1';
requires 'Module::Load::Conditional';
requires 'Module::Pluggable';
requires 'Mojo::Base';
Expand All @@ -61,7 +61,7 @@ requires 'Mojo::RabbitMQ::Client', '>= v0.2';
requires 'Mojo::SQLite';
requires 'Mojo::URL';
requires 'Mojo::Util';
requires 'Mojolicious', '>= 8.42';
requires 'Mojolicious', '>= 8.55';
requires 'Mojolicious::Commands';
requires 'Mojolicious::Plugin';
requires 'Mojolicious::Plugin::AssetPack', '>= 1.36';
Expand Down
6 changes: 3 additions & 3 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ common_requires:
perl(Data::Dumper):
perl(Digest::MD5):
perl(Getopt::Long):
perl(Minion): '>= 10.04'
perl(Mojolicious): '>= 8.42'
perl(Minion): '>= 10.08'
perl(Mojolicious): '>= 8.55'
perl(Regexp::Common):
perl(Storable):
perl(Try::Tiny):
Expand Down Expand Up @@ -141,7 +141,7 @@ worker_requires:
openQA-client:
optipng:
perl(Mojo::IOLoop::ReadWriteProcess): '>= 0.20'
perl(Minion::Backend::SQLite):
perl(Minion::Backend::SQLite): '>= 5.0.1'
perl(Mojo::SQLite):

test_requires:
Expand Down
4 changes: 2 additions & 2 deletions openQA.spec
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@
# The following line is generated from dependencies.yaml
%define assetpack_requires perl(CSS::Minifier::XS) >= 0.01 perl(JavaScript::Minifier::XS) >= 0.11 perl(Mojolicious::Plugin::AssetPack) >= 1.36
# The following line is generated from dependencies.yaml
%define common_requires perl(Archive::Extract) > 0.7 perl(Config::IniFiles) perl(Cpanel::JSON::XS) perl(Cwd) perl(Data::Dump) perl(Data::Dumper) perl(Digest::MD5) perl(Getopt::Long) perl(Minion) >= 10.04 perl(Mojolicious) >= 8.42 perl(Regexp::Common) perl(Storable) perl(Try::Tiny)
%define common_requires perl(Archive::Extract) > 0.7 perl(Config::IniFiles) perl(Cpanel::JSON::XS) perl(Cwd) perl(Data::Dump) perl(Data::Dumper) perl(Digest::MD5) perl(Getopt::Long) perl(Minion) >= 10.08 perl(Mojolicious) >= 8.55 perl(Regexp::Common) perl(Storable) perl(Try::Tiny)
# runtime requirements for the main package that are not required by other sub-packages
# The following line is generated from dependencies.yaml
%define main_requires %assetpack_requires git-core perl(BSD::Resource) perl(Carp) perl(Carp::Always) perl(CommonMark) perl(Config::Tiny) perl(DBD::Pg) >= 3.7.4 perl(DBI) >= 1.632 perl(DBIx::Class) >= 0.082801 perl(DBIx::Class::DeploymentHandler) perl(DBIx::Class::DynamicDefault) perl(DBIx::Class::OptimisticLocking) perl(DBIx::Class::ResultClass::HashRefInflator) perl(DBIx::Class::Schema::Config) perl(DBIx::Class::Storage::Statistics) perl(Date::Format) perl(DateTime) perl(DateTime::Duration) perl(DateTime::Format::Pg) perl(Exporter) perl(Fcntl) perl(File::Basename) perl(File::Copy) perl(File::Copy::Recursive) perl(File::Path) perl(File::Spec) perl(FindBin) perl(Getopt::Long::Descriptive) perl(IO::Handle) perl(IPC::Run) perl(JSON::Validator) perl(LWP::UserAgent) perl(Module::Load::Conditional) perl(Module::Pluggable) perl(Mojo::Base) perl(Mojo::ByteStream) perl(Mojo::IOLoop) perl(Mojo::JSON) perl(Mojo::Pg) perl(Mojo::RabbitMQ::Client) >= 0.2 perl(Mojo::URL) perl(Mojo::Util) perl(Mojolicious::Commands) perl(Mojolicious::Plugin) perl(Mojolicious::Static) perl(Net::OpenID::Consumer) perl(POSIX) perl(Pod::POM) perl(SQL::Translator) perl(Scalar::Util) perl(Sort::Versions) perl(Text::Diff) perl(Time::HiRes) perl(Time::ParseDate) perl(Time::Piece) perl(Time::Seconds) perl(URI::Escape) perl(YAML::PP) >= 0.020 perl(YAML::XS) perl(aliased) perl(base) perl(constant) perl(diagnostics) perl(strict) perl(warnings)
# The following line is generated from dependencies.yaml
%define client_requires curl git-core jq perl(Getopt::Long::Descriptive) perl(IO::Socket::SSL) >= 2.009 perl(IPC::Run) perl(JSON::Validator) perl(LWP::Protocol::https) perl(LWP::UserAgent) perl(Test::More) perl(YAML::PP) >= 0.020 perl(YAML::XS)
# The following line is generated from dependencies.yaml
%define worker_requires openQA-client optipng os-autoinst < 5 perl(Minion::Backend::SQLite) perl(Mojo::IOLoop::ReadWriteProcess) >= 0.20 perl(Mojo::SQLite)
%define worker_requires openQA-client optipng os-autoinst < 5 perl(Minion::Backend::SQLite) >= 5.0.1 perl(Mojo::IOLoop::ReadWriteProcess) >= 0.20 perl(Mojo::SQLite)
# The following line is generated from dependencies.yaml
%define build_requires %assetpack_requires rubygem(sass)

Expand Down

0 comments on commit 88eb8f0

Please sign in to comment.