Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions sros2/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ def package_files(directory):
'sros2.verb = sros2.verb:VerbExtension',
],
'sros2.verb': [
# These are deprecated
'create_key = sros2.verb.create_enclave:CreateKeyVerb',
'list_keys = sros2.verb.list_enclaves:ListKeysVerb',

'create_enclave = sros2.verb.create_enclave:CreateEnclaveVerb',
'create_keystore = sros2.verb.create_keystore:CreateKeystoreVerb',
'create_permission = sros2.verb.create_permission'
Expand Down
11 changes: 0 additions & 11 deletions sros2/sros2/verb/create_enclave.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

import pathlib
import sys
import warnings

from argcomplete.completers import DirectoriesCompleter

Expand All @@ -37,13 +36,3 @@ def main(self, *, args) -> int:
print(f'Unable to create enclave: {str(e)}', file=sys.stderr)
return 1
return 0


class CreateKeyVerb(CreateEnclaveVerb):
"""DEPRECATED: Create enclave. Use create_enclave instead."""

def main(self, *, args) -> int:
warnings.warn(
'create_key is deprecated and will be removed in a future release. Use create_enclave '
'instead.', FutureWarning)
return super().main(args=args)
11 changes: 0 additions & 11 deletions sros2/sros2/verb/list_enclaves.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

import pathlib
import sys
import warnings

from argcomplete.completers import DirectoriesCompleter

Expand All @@ -40,13 +39,3 @@ def main(self, *, args) -> int:
except sros2.errors.SROS2Error as e:
print(f'Unable to list enclaves: {str(e)}', file=sys.stderr)
return 1


class ListKeysVerb(ListEnclavesVerb):
"""DEPRECATED: List enclaves in keystore. Use list_enclaves instead."""

def main(self, *, args) -> int:
warnings.warn(
'list_keys is deprecated and will be removed in a future release. Use list_enclaves '
'instead.', FutureWarning)
return super().main(args=args)