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
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 4.1.0
current_version = 5.0.0
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ on:
- release

jobs:
pytest38:
name: Test ${{ matrix.package }} on ${{ matrix.os }} using pytest (Python 3.8)
pytest311:
name: Test ${{ matrix.package }} on ${{ matrix.os }} using pytest (Python 3.11)
runs-on: ${{ matrix.os }}
strategy:
max-parallel: 4
matrix:
python-version: [ 3.8 ]
python-version: [ 3.11 ]
os: [ ubuntu-latest, macos-latest, windows-latest ]
package: [ common, libs, platform, tools ]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ 3.8 ]
python-version: [ 3.11 ]
package: [ docs ]
repository: [ 'delphix/virtualization-sdk' ]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-python-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
max-parallel: 5
matrix:
python-version: [3.8]
python-version: [3.11]
package: [common, dvp, libs, platform, tools]

steps:
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ The latest user documentation can be found [here](https://developer.delphix.com)
- macOS 10.14+, Ubuntu 16.04+, or Windows 10
- Python 2.7 (vSDK 3.1.0 and earlier)
- Python 3.8 (vSDK 4.0.0 and later)
- Python 3.11 (vSDK 5.0.0 and later)
- Java 7+
- A Delphix Engine of an [appropriate version](/References/Version_Compatibility.md)

Expand Down
4 changes: 2 additions & 2 deletions common/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ long_description_content_type: text/markdown
classifiers:
Development Status :: 5 - Production/Stable
Programming Language :: Python
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.11
License :: OSI Approved :: Apache Software License
Operating System :: OS Independent

[options]
requires_python: >=3.8, <3.9
requires_python: >=3.11, <3.12
4 changes: 2 additions & 2 deletions common/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
PYTHON_SRC = 'src/main/python'

install_requires = [
"dvp-api == 1.8.0",
"dvp-api == 2.0.0.dev0",
"six >= 1.16, < 1.17",
]

Expand All @@ -16,5 +16,5 @@
install_requires=install_requires,
package_dir={'': PYTHON_SRC},
packages=setuptools.find_packages(PYTHON_SRC),
python_requires='>=3.8, <3.9',
python_requires='>=3.11, <3.12',
)
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.1.0
5.0.0
2 changes: 1 addition & 1 deletion docs/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ markdown-include = "==0.8.1"
mkdocs-awesome-pages-plugin = "==2.9.1"

[requires]
python_version = "3.8"
python_version = "3.11"

[dev-packages]
680 changes: 320 additions & 360 deletions docs/Pipfile.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dvp/.python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.8.10
3.11.9
4 changes: 2 additions & 2 deletions dvp/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ keywords: virtualization plugin
classifiers:
Development Status :: 5 - Production/Stable
Programming Language :: Python
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.11
License :: OSI Approved :: Apache Software License
Operating System :: OS Independent

[options]
requires_python: 3.8
requires_python: >=3.11, <3.12
2 changes: 1 addition & 1 deletion dvp/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
install_requires=install_requires,
package_dir={'': PYTHON_SRC},
packages=setuptools.find_packages(PYTHON_SRC),
python_requires='>=3.8, <3.9',
python_requires='>=3.11, <3.12',
)
2 changes: 1 addition & 1 deletion dvp/src/main/python/dlpx/virtualization/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.1.0
5.0.0
4 changes: 2 additions & 2 deletions libs/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ long_description_content_type: text/markdown
classifiers:
Development Status :: 5 - Production/Stable
Programming Language :: Python
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.11
License :: OSI Approved :: Apache Software License
Operating System :: OS Independent

[options]
requires_python: >=3.8, <3.9
requires_python: >=3.11, <3.12
4 changes: 2 additions & 2 deletions libs/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
version = version_file.read().strip()

install_requires = [
"dvp-api == 1.8.0",
"dvp-api == 2.0.0.dev0",
"dvp-common == {}".format(version),
"six >= 1.16, < 1.17",
]
Expand All @@ -17,5 +17,5 @@
install_requires=install_requires,
package_dir={'': PYTHON_SRC},
packages=setuptools.find_packages(PYTHON_SRC),
python_requires='>=3.8, <3.9',
python_requires='>=3.11, <3.12',
)
2 changes: 1 addition & 1 deletion libs/src/main/python/dlpx/virtualization/libs/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.1.0
5.0.0
4 changes: 2 additions & 2 deletions platform/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ long_description_content_type: text/markdown
classifiers:
Development Status :: 5 - Production/Stable
Programming Language :: Python
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.11
License :: OSI Approved :: Apache Software License
Operating System :: OS Independent

[options]
requires_python: >=3.8, <3.9
requires_python: >=3.11, <3.12
4 changes: 2 additions & 2 deletions platform/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
version = version_file.read().strip()

install_requires = [
"dvp-api == 1.8.0",
"dvp-api == 2.0.0.dev0",
"dvp-common == {}".format(version),
"six >= 1.16, < 1.17",
]
Expand All @@ -17,5 +17,5 @@
install_requires=install_requires,
package_dir={'': PYTHON_SRC},
packages=setuptools.find_packages(PYTHON_SRC),
python_requires='>=3.8, <3.9',
python_requires='>=3.11, <3.12',
)
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.1.0
5.0.0
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,10 @@ def _check_upgrade_args(upgrade_operations, expected_upgrade_args):
# that we can iterate on.
#
for migration_func in attribute.values():
actual = inspect.getargspec(migration_func).args
if six.PY2:
actual = inspect.getargspec(migration_func).args
else:
actual = inspect.getfullargspec(migration_func).args
expected = expected_upgrade_args[attribute_name]
warnings.extend(
_check_args(method_name=migration_func.__name__,
Expand Down
4 changes: 2 additions & 2 deletions tools/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ long_description_content_type: text/markdown
classifiers:
Development Status :: 5 - Production/Stable
Programming Language :: Python
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.11
License :: OSI Approved :: Apache Software License
Operating System :: OS Independent

[options]
include_package_data = True
requires_python: 3.8
requires_python: >=3.11, <3.12

[options.entry_points]
console_scripts =
Expand Down
2 changes: 1 addition & 1 deletion tools/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@
install_requires=install_requires,
package_dir={'': PYTHON_SRC},
packages=setuptools.find_packages(PYTHON_SRC),
python_requires='>=3.8, <3.9',
python_requires='>=3.11, <3.12',
)
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.1.0
5.0.0
4 changes: 2 additions & 2 deletions tools/src/main/python/dlpx/virtualization/_internal/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ def delphix_sdk(verbose, quiet):
# will be printed to the console until this is executed.
#
logging_util.add_console_handler(console_logging_level)
if sys.version_info[:2] != (3, 8):
if sys.version_info[:2] != (3, 11):
raise exceptions.UserError(
'Python version check failed.'
'Supported versions are 2.7.x and 3.8.x, found {}'
'Supported version is 3.11.x, found {}'
.format(sys.version_info))


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ def prepare_upload_artifact(plugin_config_content, src_dir, schemas, manifest):
# set default value of locale to en-us
'defaultLocale':
plugin_config_content.get('defaultLocale', LOCALE_DEFAULT),
# set default value of language to PYTHON38
# set default value of language to PYTHON311
'language':
plugin_config_content['language'],
'hostTypes':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ def _get_default_plugin_config(plugin_id, ingestion_strategy, name,
default_build_number = to_bytes(default_build_number)
config = OrderedDict([('id', plugin_id),
('name', name),
('language', 'PYTHON38'), ('hostTypes', ['UNIX']),
('language', 'PYTHON311'), ('hostTypes', ['UNIX']),
('pluginType', ingestion_strategy),
('entryPoint', entry_point),
('srcDir', src_dir_path),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def __validate_plugin_config_content(self):
schemaFile: the file containing defined schemas in the plugin
manualDiscovery whether or not manual discovery is supported
pluginType whether the plugin is DIRECT or STAGED
language language of the source code(ex: PYTHON38 for python3.8)
language language of the source code(ex: PYTHON311 for python3.11)

Args:
plugin_config_content (dict): A dictionary representing a plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"language": {
"type": "string",
"enum": ["PYTHON38"]
"enum": ["PYTHON311"]
},
"rootSquashEnabled": {
"type": "boolean"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ def test_plugin_bad_language(mock_generate_python, plugin_config_file,
build.build(plugin_config_file, artifact_file, False, False)

message = err_info.value.message
assert "'BAD_LANGUAGE' is not one of ['PYTHON38']" in message
assert "'BAD_LANGUAGE' is not one of ['PYTHON311']" in message

assert not mock_generate_python.called

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ def external_version():

@pytest.fixture
def language():
return 'PYTHON38'
return 'PYTHON311'


@pytest.fixture
Expand Down Expand Up @@ -663,7 +663,7 @@ def artifact_content(engine_api, virtual_source_definition,
'name': 'python_vfiles',
'externalVersion': '2.0.0',
'defaultLocale': 'en-us',
'language': 'PYTHON38',
'language': 'PYTHON311',
'hostTypes': ['UNIX'],
'entryPoint': 'python_vfiles:vfiles',
'buildApi': package_util.get_build_api_version(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

from dlpx.virtualization._internal import package_util

DVP_VERSION = '4.1.0'
DVP_API_VERSION = '1.8.0'
DVP_VERSION = '5.0.0'
DVP_API_VERSION = '2.0.0'


class TestPackageUtil:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def test_plugin_info_warn_mode(mock_import, mock_relative_path,
plugin_module_content):
plugin_config_content = OrderedDict([
('id', str(uuid.uuid4())), ('name', 'staged'),
('version', '0.1.0'), ('language', 'PYTHON38'),
('version', '0.1.0'), ('language', 'PYTHON311'),
('hostTypes', ['UNIX']), ('pluginType', 'STAGED'),
('manualDiscovery', True),
('entryPoint', 'staged_plugin:staged'),
Expand Down Expand Up @@ -287,7 +287,7 @@ def test_import_error(mock_file_util, plugin_config_file,
@staticmethod
@pytest.mark.parametrize(
'entry_point,expected_error',
[('bad_syntax:plugin', "SDK Error: invalid syntax")])
[('bad_syntax:plugin', "SDK Error: expected ':'")])
@mock.patch('dlpx.virtualization._internal.file_util.get_src_dir_path')
def test_bad_syntax(mock_file_util, plugin_config_file,
fake_src_dir, expected_error):
Expand Down
Loading