Skip to content

Commit

Permalink
Merge branch 'main' into encoding
Browse files Browse the repository at this point in the history
  • Loading branch information
t1m0thyj authored Jan 3, 2024
2 parents 70ff079 + 8c9580a commit 031087f
Show file tree
Hide file tree
Showing 14 changed files with 99 additions and 996 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/sdk-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-tags: true
fetch-depth: 0
persist-credentials: false
ref: ${{ github.ref }}

Expand Down
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,8 @@
"source.organizeImports": true
}
}
},
"python.testing.pytestArgs": ["tests"],
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true
}
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ All notable changes to the Zowe Client Python SDK will be documented in this fil

### Bug Fixes

- Fixed 'create_data_set' to accept "FBA", "FBM", "VBA", "VBM" as valid recfm [#240](https://github.com/zowe/zowe-client-python-sdk/issues/240)

## `1.0.0-dev12`

### Bug Fixes

- Fixed Secrets SDK requiring LD_LIBRARY_PATH to be defined when installed from wheel on Linux [#229](https://github.com/zowe/zowe-client-python-sdk/issues/229)
- Fixed 'issue_command' Console API function to provide custom console name [#231](https://github.com/zowe/zowe-client-python-sdk/issues/231)

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ Alternatively, you can choose to install only a single subpackage for a smaller
To install all Zowe SDK packages using pip:

```
pip install zowe
pip install -U --pre zowe
```

Or, to install a subpackage using pip:

```
pip install zowe.<subpackage>_for_zowe_sdk
pip install -U --pre zowe.<subpackage>_for_zowe_sdk
```

For more information on the available sub-packages click [HERE](https://zowe-client-python-sdk.readthedocs.io/en/latest/packages/packages.html)
Expand Down Expand Up @@ -59,7 +59,7 @@ urllib3
It also has an optional dependency on the Zowe Secrets SDK for storing client secrets which can be installed with the `secrets` extra:

```
pip install zowe.core-for-zowe-sdk[secrets]
pip install -U --pre zowe.core-for-zowe-sdk[secrets]
```

### Developer setup
Expand Down
17 changes: 9 additions & 8 deletions docs/source/usage/examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,23 @@ Create a dictionary to handle communication with the plug-in:
.. code-block:: python
from zowe.zos_console_for_zowe_sdk import Console
connection = {
"host_url": "'<host address>'",
profile = {
"host": "<host address>",
"port" : 443 , # Include the port if different from the default (443)
"user": "<user>",
"password": "<password>",
}
my_console = Console(connection)
my_console = Console(profile)
Alternatively you can use an existing Zowe CLI profile instead:

.. code-block:: python
from zowe.zos_console_for_zowe_sdk import Console
from zowe.zos_console_for_zowe_sdk import Console
from zowe.core_for_zowe_sdk import ProfileManager
connection = {
"plugin_profile": "<profile name>>"
}
# Load the profile using ProfileManager
profile = ProfileManager().load(profile_name="<profile name>")
my_console = Console(connection)
my_console = Console(profile)
2 changes: 1 addition & 1 deletion src/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.0.0.dev11"
__version__ = "1.0.0.dev12"
2 changes: 1 addition & 1 deletion src/core/zowe/core_for_zowe_sdk/config_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ def validate_schema(self) -> None:

# validate the $schema property
if path_schema_json:
validate_config_json(self.jsonc, path_schema_json, cwd=self.location)
validate_config_json(self.jsonc, path_schema_json, cwd = self.location)

def schema_list(
self,
Expand Down
2 changes: 1 addition & 1 deletion src/zos_files/zowe/zos_files_for_zowe_sdk/files.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ def create_data_set(self, dataset_name, options={}):
if options.get(opt) is None:
options[opt] = "F"
else:
if options[opt] not in ("F", "FB", "V", "VB", "U"):
if options[opt] not in ("F", "FB", "V", "VB", "U", "FBA", "FBM", "VBA", "VBM"):
raise KeyError

if opt == "blksize":
Expand Down
55 changes: 0 additions & 55 deletions tests/unit/fixtures/invalid.zowe.config.json

This file was deleted.

Loading

0 comments on commit 031087f

Please sign in to comment.