Skip to content

Commit

Permalink
Merge branch 'release/1.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
mitchos committed Apr 14, 2022
2 parents 6b8027a + c32cae7 commit 77cf2ff
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 26 deletions.
14 changes: 7 additions & 7 deletions dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
sphinx==4.4.0
restfly==1.4.5
python-box==5.4.1
furo==2022.2.23
pre-commit==2.17.0
pytest==7.0.1
responses==0.18.0
sphinx==4.5.0
restfly==1.4.6
python-box==6.0.2
furo==2022.4.7
pre-commit==2.18.1
pytest==7.1.1
responses==0.20.0
requests==2.27.1
toml==0.10.2
2 changes: 1 addition & 1 deletion docsrc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# The short X.Y version
version = '1.1'
# The full version, including alpha/beta/rc tags
release = '1.1.0'
release = '1.1.1'

# -- General configuration ---------------------------------------------------

Expand Down
20 changes: 10 additions & 10 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "pyzscaler"
version = "1.1.0"
version = "1.1.1"
description = "A python SDK for the Zscaler API."
authors = ["Mitch Kelly <me@mkelly.dev>"]
license = "MIT"
Expand Down Expand Up @@ -31,19 +31,19 @@ include = [

[tool.poetry.dependencies]
python = "^3.7"
restfly = "1.4.5"
python-box = "5.4.1"
restfly = "1.4.6"
python-box = "6.0.2"

[tool.poetry.dev-dependencies]
python = "^3.7"
restfly = "1.4.5"
python-box = "5.4.1"
Sphinx = "4.4.0"
furo = "2022.2.23"
pytest = "7.0.1"
restfly = "1.4.6"
python-box = "6.0.2"
Sphinx = "4.5.0"
furo = "2022.4.7"
pytest = "7.1.1"
requests = "2.27.1"
pre-commit = "2.17.0"
responses = "0.18.0"
pre-commit = "2.18.1"
responses = "0.20.0"
toml = "0.10.2"

[build-system]
Expand Down
2 changes: 1 addition & 1 deletion pyzscaler/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Dax Mickelson",
"Jacob Gårder",
]
__version__ = "1.1.0"
__version__ = "1.1.1"

from pyzscaler.zia import ZIA # noqa
from pyzscaler.zpa import ZPA # noqa
4 changes: 0 additions & 4 deletions pyzscaler/zia/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,6 @@ def get_user(self, user_id: str = None, email: str = None) -> Box:
def update_user(
self,
user_id: str,
name: str = None,
email: str = None,
department: dict = None,
groups: list = None,
**kwargs,
) -> Box:
"""
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
restfly==1.4.5
python-box==5.4.1
restfly==1.4.6
python-box==6.0.2
4 changes: 3 additions & 1 deletion tests/zia/test_users.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import copy

import pytest
import responses
from box import Box
Expand Down Expand Up @@ -127,7 +129,7 @@ def test_users_get_user_error(zia):

@responses.activate
def test_users_update_user(zia, users):
updated_user = users[0]
updated_user = copy.deepcopy(users[0])
updated_user["name"] = "Test User C"
updated_user["comments"] = "Updated Test"

Expand Down

0 comments on commit 77cf2ff

Please sign in to comment.