Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 3.13 to Python version matrix and fix audit workflow #338

Merged
merged 4 commits into from
Oct 15, 2024
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
3 changes: 3 additions & 0 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v5

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sdk-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
env:
OS: ${{ matrix.os }}
PYTHON: ${{ matrix.python-version }}
Expand Down
1 change: 1 addition & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"recommendations": [
"ms-python.black-formatter",
"ms-python.isort",
"ms-python.pylint",
"ms-python.vscode-pylance"
]
}
18 changes: 8 additions & 10 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,18 @@
"editor.defaultFormatter": "ms-python.black-formatter",
"editor.formatOnSave": true
},
"python.testing.pytestArgs": ["tests"],
"python.testing.pytestEnabled": true,
"python.testing.unittestEnabled": false,
"rust-analyzer.linkedProjects": [
"./src/secrets/Cargo.toml"
],
"python.analysis.extraPaths": [
"./src/core",
"./src/zos_console",
"./src/zos_files",
"./src/zos_jobs",
"./src/zosmf",
"./src/zos_tso"
"./src/zos_tso",
"./src/zosmf"
],
"python.linting.enabled": true,
"python.linting.pylintEnabled": true,
"python.testing.pytestArgs": ["tests"],
"python.testing.pytestEnabled": true,
"python.testing.unittestEnabled": false,
"rust-analyzer.linkedProjects": [
"./src/secrets/Cargo.toml"
]
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ pip install -U --pre zowe.core-for-zowe-sdk[secrets]

Ensure the following prerequisites are installed and on your PATH:

- Python >= 3.8 and `pip`
- Python >= 3.9 and `pip`
- Cargo >= 1.72 (to build Rust bindings for Secrets SDK)
- Visual Studio Build Tools >= 2015 (Windows only)

Expand Down
40 changes: 13 additions & 27 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,40 +1,26 @@
black
certifi==2024.7.4
chardet==4.0.0
colorama==0.4.5
commentjson==0.9.0
coverage==5.4
deepmerge==1.1.0
idna==3.7
importlib-metadata==3.6.0;python_version<"3.8"
isort
jsonschema==4.17.3
lxml==4.9.3
maturin
mccabe==0.7.0
nose2==0.10.0
pycodestyle==2.9.0
pydocstyle==5.1.1
pydoclint==0.5.3
pyfakefs
pylama==7.7.1
pylint==3.2.5
pytest==7.4.4
python-decouple==3.4
PyYAML==6.0.1
requests==2.32.0
six==1.15.0
snowballstemmer==2.1.0
typing-extensions==4.0.1
Unidecode==1.2.0
urllib3==1.26.19

# Dev deps
black
coverage
isort
maturin
pydoclint
pydocstyle
pyfakefs
pylint
pytest
wheel
zipp==3.19.1

# Local deps
-e ./src/core[secrets]
-e ./src/secrets
-e ./src/zos_console
-e ./src/zos_files
-e ./src/zos_jobs
-e ./src/zos_tso
-e ./src/zosmf

3 changes: 2 additions & 1 deletion src/core/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

Copyright Contributors to the Zowe Project.
"""

import sys

from setuptools import find_namespace_packages, setup
Expand All @@ -29,7 +30,7 @@
license="EPL-2.0",
classifiers=[
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"License :: OSI Approved :: Eclipse Public License 2.0 (EPL-2.0)",
],
install_requires=[
Expand Down
3 changes: 2 additions & 1 deletion src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

Copyright Contributors to the Zowe Project.
"""

import os.path
import uuid

Expand Down Expand Up @@ -43,7 +44,7 @@ def resolve_sdk_dep(sdk_name, version_spec):
license="EPL-2.0",
classifiers=[
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"License :: OSI Approved :: Eclipse Public License 2.0 (EPL-2.0)",
],
install_requires=[
Expand Down
3 changes: 2 additions & 1 deletion src/zos_console/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

Copyright Contributors to the Zowe Project.
"""

import sys

from setuptools import find_namespace_packages, setup
Expand All @@ -29,7 +30,7 @@
license="EPL-2.0",
classifiers=[
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"License :: OSI Approved :: Eclipse Public License 2.0 (EPL-2.0)",
],
install_requires=[resolve_sdk_dep("core", "~=" + __version__)],
Expand Down
3 changes: 2 additions & 1 deletion src/zos_files/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

Copyright Contributors to the Zowe Project.
"""

import sys

from setuptools import find_namespace_packages, setup
Expand All @@ -29,7 +30,7 @@
license="EPL-2.0",
classifiers=[
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"License :: OSI Approved :: Eclipse Public License 2.0 (EPL-2.0)",
],
install_requires=[resolve_sdk_dep("core", "~=" + __version__)],
Expand Down
7 changes: 4 additions & 3 deletions src/zos_files/zowe/zos_files_for_zowe_sdk/file_system.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
from typing import Optional

from zowe.core_for_zowe_sdk import SdkApi
from zowe.zos_files_for_zowe_sdk import constants, exceptions
from zowe.zos_files_for_zowe_sdk import constants

from .exceptions import InvalidPermsOption, MaxAllocationQuantityExceeded
from .response import FileSystemListResponse

_ZOWE_FILES_DEFAULT_ENCODING = constants.zos_file_constants["ZoweFilesDefaultEncoding"]
Expand Down Expand Up @@ -65,12 +66,12 @@ def create(self, file_system_name: str, options: dict = {}) -> dict:
if key == "perms":
if value < 0 or value > 777:
self.logger.error("Invalid Permissions Option.")
raise exceptions.InvalidPermsOption(value)
raise InvalidPermsOption(value)

if key == "cylsPri" or key == "cylsSec":
if value > constants.zos_file_constants["MaxAllocationQuantity"]:
self.logger.error("Maximum allocation quantity exceeded.")
raise exceptions.MaxAllocationQuantityExceeded
raise MaxAllocationQuantityExceeded()

custom_args = self._create_custom_request_arguments()
custom_args["url"] = "{}mfs/zfs/{}".format(self._request_endpoint, file_system_name)
Expand Down
3 changes: 2 additions & 1 deletion src/zos_jobs/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

Copyright Contributors to the Zowe Project.
"""

import sys

from setuptools import find_namespace_packages, setup
Expand All @@ -29,7 +30,7 @@
license="EPL-2.0",
classifiers=[
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"License :: OSI Approved :: Eclipse Public License 2.0 (EPL-2.0)",
],
install_requires=[resolve_sdk_dep("core", "~=" + __version__)],
Expand Down
3 changes: 2 additions & 1 deletion src/zos_tso/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

Copyright Contributors to the Zowe Project.
"""

import sys

from setuptools import find_namespace_packages, setup
Expand All @@ -29,7 +30,7 @@
license="EPL-2.0",
classifiers=[
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"License :: OSI Approved :: Eclipse Public License 2.0 (EPL-2.0)",
],
install_requires=[resolve_sdk_dep("core", "~=" + __version__)],
Expand Down
3 changes: 2 additions & 1 deletion src/zosmf/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

Copyright Contributors to the Zowe Project.
"""

import sys

from setuptools import find_namespace_packages, setup
Expand All @@ -29,7 +30,7 @@
license="EPL-2.0",
classifiers=[
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"License :: OSI Approved :: Eclipse Public License 2.0 (EPL-2.0)",
],
install_requires=[resolve_sdk_dep("core", "~=" + __version__)],
Expand Down
Loading