Skip to content

Commit

Permalink
Avocado compatility: bump minimum requirement to 82.x LTS
Browse files Browse the repository at this point in the history
Even Avocado 69.x LTS has reached EOL, so it makes sense to require at
least the older (but still active) LTS version.

With that, we don't have to guess the pre/post plugin available.

Signed-off-by: Cleber Rosa <[email protected]>
  • Loading branch information
clebergnu committed Dec 8, 2021
1 parent 0aca57e commit 791c4ee
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ centos_8_1_task:
env:
matrix:
- AVOCADO_SRC:
- AVOCADO_SRC: avocado-framework<70.0
- AVOCADO_SRC: avocado-framework<83.0
- AVOCADO_SRC: git+https://github.com/avocado-framework/avocado#egg=avocado_framework
matrix:
- SETUP: setup.py develop --user
Expand Down
12 changes: 2 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,6 @@ def run(self):
shutil.rmtree(e)


def pre_post_plugin_type():
try:
from avocado.core.plugin_interfaces import JobPreTests as Pre
return 'avocado.plugins.result_events'
except ImportError:
return 'avocado.plugins.job.prepost'


if __name__ == "__main__":
setup(name='avocado-framework-plugin-vt',
version=VERSION,
Expand All @@ -77,7 +69,7 @@ def pre_post_plugin_type():
'vt-list-guests = avocado_vt.plugins.vt_list_guests:VTListGuests',
'vt-list-archs = avocado_vt.plugins.vt_list_archs:VTListArchs',
],
pre_post_plugin_type(): [
'avocado.plugins.result_events': [
'vt-joblock = avocado_vt.plugins.vt_joblock:VTJobLock',
],
'avocado.plugins.init': [
Expand All @@ -94,6 +86,6 @@ def pre_post_plugin_type():
],
},
install_requires=["netifaces", "simplejson", "six", "netaddr",
"aexpect", "avocado-framework>=68.0"],
"aexpect", "avocado-framework>=82.1"],
cmdclass={'clean': Clean},
)

0 comments on commit 791c4ee

Please sign in to comment.