Skip to content

Commit 86e0503

Browse files
authored
Merge pull request #80 from myii/feat/remove-PyYAML-for-salt-lint
feat(ufw): remove `PyYAML` requirement for `salt-lint` in `.travis.yml`
2 parents 8dc97bc + 6d3b391 commit 86e0503

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

ssf/defaults.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ ssf_node_anchors:
2222
# An alternative method could be to use:
2323
# `git describe --abbrev=0 --tags`
2424
# yamllint disable rule:line-length
25-
title: 'feat(semantic-release): implement for this formula'
26-
body: '* Automated using https://github.com/myii/ssf-formula/pull/78'
25+
title: 'ci(travis): remove `PyYAML` workaround since fixed in `salt-lint` v0.0.9'
26+
body: '* Automated using https://github.com/myii/ssf-formula/pull/80'
2727
# yamllint enable rule:line-length
2828
github:
2929
owner: 'saltstack-formulas'

ssf/files/default/.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,14 @@ jobs:
7777
before_install: skip
7878
script:
7979
{%- set pip_cmd = 'pip' %}
80-
{%- set pkgs_for_salt_lint = 'salt-lint' %}
8180
{%- if semrel_formula == 'ufw' %}
8281
{%- set pip_cmd = 'pip3' %}
83-
{%- set pkgs_for_salt_lint = pkgs_for_salt_lint ~ ' PyYAML==4.2b4' %}
8482
# Need to use `pip3` due to using `{{ travis.dist }}` on Travis
83+
# [Py2/InsecurePlatformWarning] Tornado requires an up-to-date SSL module.
8584
- sudo apt-get install python3-pip python3-setuptools python3-wheel -y
8685
{%- endif %}
8786
# Install and run `salt-lint`
88-
- {{ pip_cmd }} install --user {{ pkgs_for_salt_lint }}
87+
- {{ pip_cmd }} install --user salt-lint
8988
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$'
9089
| xargs -I {} salt-lint {}
9190
# Install and run `yamllint`

0 commit comments

Comments
 (0)