Skip to content

Commit

Permalink
Remove Python 3.7
Browse files Browse the repository at this point in the history
End support for Python 2.x

DEPRECATION: Python 2.7 reached the end of its life on January 1st, 2020. Please upgrade your Python as Python 2.7 is no longer maintained.
pip 21.0 will drop support for Python 2.7 in January 2021.
More details about Python 2 support in pip can be found at
https://pip.pypa.io/en/latest/development/release-process/#python-2-support
  • Loading branch information
rpothier committed Nov 9, 2021
1 parent 32cf0fd commit b691182
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 8 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/ansible-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
# - devel
#
#Python versions:
# - Python 2.7
# - Python 3.7
# - Python 3.8

name: CI
Expand All @@ -36,8 +34,6 @@ jobs:
- stable-2.10
- devel
python:
- 2.7
- 3.7
- 3.8
runs-on: ubuntu-latest
steps:
Expand Down
7 changes: 6 additions & 1 deletion ci/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function run_role_test {

# Handles input to dictate wether all tests should be ran, or just one set
function handle_input {
if [[ ! -z ${target} ]]; then
if [[ -n ${target} ]]; then
for test_dir in "${test_directories[@]}"; do
if [[ ${target} == "${test_dir}" ]]; then
run_test ${target}
Expand Down Expand Up @@ -85,6 +85,11 @@ while getopts ahd: option; do
;;
h) help
;;
* )
echo "$1 is not a valid option"
help
exit 1
;;
esac
done

4 changes: 2 additions & 2 deletions roles/conjur_host_identity/tests/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ declare ansible_cid=''

function api_key_for {
local role_id=$1
if [ ! -z "$role_id" ]
if [ -n "$role_id" ]
then
docker exec ${conjur_cid} rails r "print Credentials['${role_id}'].api_key"
else
Expand Down Expand Up @@ -58,7 +58,7 @@ function run_test_cases {
function run_test_case {
echo "---- testing ${test_case} ----"
local test_case=$1
if [ ! -z "$test_case" ]
if [ -n "$test_case" ]
then
docker exec "${ansible_cid}" env HFTOKEN="$(hf_token)" bash -c "
cd tests
Expand Down
2 changes: 1 addition & 1 deletion tests/conjur_variable/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function run_test_case {
local test_case=$1
echo "---- testing ${test_case} ----"

if [ ! -n "$test_case" ]; then
if [ -z "$test_case" ]; then
echo ERROR: run_test called with no argument 1>&2
exit 1
fi
Expand Down
10 changes: 10 additions & 0 deletions tests/sanity/ignore-2.13.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Jenkinsfile shebang
tests/conjur_variable/test.sh shebang
tests/conjur_variable/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
roles/conjur_host_identity/tests/test.sh shebang
roles/conjur_host_identity/tests/policy/root.yml yamllint:unparsable-with-libyaml # File loaded by Conjur server, not via Python
ci/build_release shebang
ci/parse-changelog.sh shebang
ci/publish_to_galaxy shebang
ci/test.sh shebang
secrets.yml yamllint:unparsable-with-libyaml # File loaded by Summon utility (in Jenkinsfile), not via Python

0 comments on commit b691182

Please sign in to comment.