Skip to content

Commit

Permalink
Add constraints for new ruamel release (#75134)
Browse files Browse the repository at this point in the history
Newer releases of ruamel.yaml and ruamel.yaml.clib require newer Python versions.
  • Loading branch information
samdoran committed Jun 28, 2021
1 parent 39cae91 commit 60c03e8
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
@@ -1 +1,3 @@
setuptools < 45 ; python_version <= '2.7' # setuptools 45 and later require python 3.5 or later
ruamel.yaml < 0.17 ; python_version <= '2.7' # ruamel.yaml 0.17 and later are not tested with Python 2.7
ruamel.yaml.clib <= 0.2.2 ; python_version < '3.5' # ruamel.yaml.clib 0.2.3 and later requires Python 3.5 or later
2 changes: 2 additions & 0 deletions test/integration/targets/k8s/files/constraints.txt
@@ -0,0 +1,2 @@
ruamel.yaml < 0.17 ; python_version <= '2.7' # ruamel.yaml 0.17 and later are not tested with Python 2.7
ruamel.yaml.clib <= 0.2.2 ; python_version < '3.5' # ruamel.yaml.clib 0.2.3 and later requires Python 3.5 or later
12 changes: 12 additions & 0 deletions test/integration/targets/k8s/tasks/main.yml
Expand Up @@ -17,6 +17,8 @@
virtualenv: "{{ virtualenv }}"
virtualenv_command: "{{ virtualenv_command }}"
virtualenv_site_packages: no
extra_args:
-c {{ role_path }}/files/constraints.txt

- include_tasks: validate_not_installed.yml
vars:
Expand All @@ -37,6 +39,8 @@
virtualenv: "{{ virtualenv }}"
virtualenv_command: "{{ virtualenv_command }}"
virtualenv_site_packages: no
extra_args:
-c {{ role_path }}/files/constraints.txt

- include_tasks: validate_installed.yml
vars:
Expand All @@ -58,6 +62,8 @@
virtualenv: "{{ virtualenv }}"
virtualenv_command: "{{ virtualenv_command }}"
virtualenv_site_packages: no
extra_args:
-c {{ role_path }}/files/constraints.txt

- include_tasks: older_openshift_fail.yml
vars:
Expand All @@ -80,6 +86,8 @@
virtualenv: "{{ virtualenv }}"
virtualenv_command: "{{ virtualenv_command }}"
virtualenv_site_packages: no
extra_args:
-c {{ role_path }}/files/constraints.txt

- include_tasks: basic_validation.yml

Expand All @@ -96,6 +104,8 @@
virtualenv: "{{ virtualenv }}"
virtualenv_command: "{{ virtualenv_command }}"
virtualenv_site_packages: no
extra_args:
-c {{ role_path }}/files/constraints.txt

- include_tasks: basic_validation.yml

Expand All @@ -113,6 +123,8 @@
virtualenv: "{{ virtualenv }}"
virtualenv_command: "{{ virtualenv_command }}"
virtualenv_site_packages: no
extra_args:
-c {{ role_path }}/files/constraints.txt

- include_tasks: full_test.yml
vars:
Expand Down

0 comments on commit 60c03e8

Please sign in to comment.