Merge pull request #288 from perlpunk/add-deps

Add devel package for linters
os-autoinst · Jan 25, 2024 · e817747 · e817747
2 parents 0a33019 + bab67f6
commit e817747
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -44,7 +44,7 @@ test-yaml:
 	yamllint --strict $$(git ls-files "*.yml" "*.yaml" ":!external/")
 
 update-deps:
-	tools/update-deps --specfile dist/rpm/os-autoinst-scripts-deps.spec
+	tools/update-deps --cpanfile cpanfile --specfile dist/rpm/os-autoinst-scripts-deps.spec
 
 clean:
 	$(RM) job_post_response

diff --git a/cpanfile b/cpanfile
@@ -17,7 +17,7 @@ on 'test' => sub {
 
 };
 
-on 'devel' => sub {
+on 'develop' => sub {
 
 };
 

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -8,11 +8,12 @@
 #######################################################
 ---
 targets:
-  cpanfile: [main, test]
-  spec:     [main, test]
+  cpanfile: [main, test, devel]
+  spec:     [main, test, devel]
   cpanfile-targets:
     # target: cpanfile target type (default main)
     test: test
+    devel: develop
 main_requires:
   bash:
   coreutils:  # date, ln, tail
@@ -37,3 +38,6 @@ main_requires:
 test_requires:
   perl(Test::Warnings):
   perl(Test::Most):
+devel_requires:
+  python3-yamllint:
+  shfmt:
diff --git a/dist/rpm/os-autoinst-scripts-deps.spec b/dist/rpm/os-autoinst-scripts-deps.spec
@@ -28,6 +28,8 @@ Url:            https://github.com/os-autoinst/scripts
 %define main_requires bash coreutils curl grep html-xml-utils jq openQA-client openssh-clients osc perl >= 5.010 perl(Data::Dumper) perl(FindBin) perl(Getopt::Long) perl(Mojo::File) perl(Text::Markdown) perl(YAML::PP) sed sudo xmlstarlet yq
 # The following line is generated from dependencies.yaml
 %define test_requires perl(Test::Most) perl(Test::Warnings)
+# The following line is generated from dependencies.yaml
+%define devel_requires python3-yamllint shfmt
 Requires:       %main_requires
 Suggests:       salt
 Suggests:       postgresql
@@ -36,6 +38,15 @@ Suggests:       postgresql
 - auto-review - Automatically detect known issues in openQA jobs, label openQA jobs with ticket references and optionally retrigger
 - openqa-investigate - Automatic investigation jobs with failure analysis in openQA
 
+%package devel
+Summary:        Development package for os-autoinst-scripts-deps
+Group:          Development/Tools/Other
+Requires:       %devel_requires
+
+%description devel
+Development package pulling in all dependencies needed for developing
+in os-autoinst-scripts-deps
+
 %prep
 
 %build
@@ -46,4 +57,6 @@ Suggests:       postgresql
 
 %files
 
+%files devel
+
 %changelog
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ on 'test' => sub { @@
     };
-    on 'devel' => sub {
+    on 'develop' => sub {
     };
@@ Expand Down @@