bugfix use v2 api compatible field names

jira/client.py

@@ -1581,13 +1581,13 @@ def createmeta(
             params["expand"] = expand
         return self._get_json("issue/createmeta", params)
 
-    def _get_user_accountid(self, user):
-        """Internal method for translating an user to an accountId."""
+    def _get_user_key(self, user):
+        """Internal method for translating an user (str) to an key."""
         try:
-            accountId = self.search_users(user, maxResults=1)[0].accountId
+            key = self.search_users(user, maxResults=1)[0].key
         except Exception as e:
             raise JIRAError(e)
-        return accountId
+        return key
 
     # non-resource
     @translate_resource_args
@@ -1607,7 +1607,7 @@ def assign_issue(self, issue, assignee):
             + str(issue)
             + "/assignee"
         )
-        payload = {"accountId": self._get_user_accountid(assignee)}
+        payload = {"name": self._get_user_key(assignee)}
         # 'key' and 'name' are deprecated in favor of accountId
         r = self._session.put(url, data=json.dumps(payload))
         raise_on_error(r)
@@ -1940,7 +1940,7 @@ def add_watcher(self, issue, watcher):
         """Add a user to an issue's watchers list.
 
         :param issue: ID or key of the issue affected
-        :param watcher: username of the user to add to the watchers list
+        :param watcher: key of the user to add to the watchers list
         """
         url = self._get_url("issue/" + str(issue) + "/watchers")
         self._session.post(url, data=json.dumps(watcher))
@@ -1950,11 +1950,12 @@ def remove_watcher(self, issue, watcher):
         """Remove a user from an issue's watch list.
 
         :param issue: ID or key of the issue affected
-        :param watcher: accountId of the user to remove from the watchers list
+        :param watcher: key of the user to remove from the watchers list
         :rtype: Response
         """
         url = self._get_url("issue/" + str(issue) + "/watchers")
-        params = {"accountId": watcher}
+        # https://docs.atlassian.com/software/jira/docs/api/REST/8.13.6/#api/2/issue-removeWatcher
+        params = {"username": watcher}
         result = self._session.delete(url, params=params)
         return result
 
@@ -3653,7 +3654,7 @@ def create_project(
         :type: str
         :param name: If not specified it will use the key value.
         :type name: Optional[str]
-        :param assignee: accountId of the lead, if not specified it will use current user.
+        :param assignee: key of the lead, if not specified it will use current user.
         :type assignee: Optional[str]
         :param type: Determines the type of project should be created.
         :type ptype: Optional[str]

jira/resources.py

@@ -1092,7 +1092,7 @@ def dict2resource(raw, top=None, options=None, session=None):
     r"securitylevel/[^/]+$": SecurityLevel,
     r"status/[^/]+$": Status,
     r"statuscategory/[^/]+$": StatusCategory,
-    r"user\?(username|accountId).+$": User,
+    r"user\?(username|key).+$": User,
     r"group\?groupname.+$": Group,
     r"version/[^/]+$": Version,
     # GreenHopper specific resources

package.json

@@ -12,7 +12,7 @@
     "url": "https://github.com/pycontribs/jira.git"
   },
   "dependencies": {
-    "cspell": "^4.0.23",
+    "cspell": "^4.2.8",
     "npm": "^6.10.0"
   }
 }

tests/test_client.py

@@ -80,6 +80,7 @@ def test_templates(cl_admin):
             """
 Agility
 Basic
+Basic software development
 Bug tracking
 Content Management
 Customer service
@@ -99,8 +100,7 @@ def test_templates(cl_admin):
         )
     )
 
-    for t in expected_templates:
-        assert t in templates
+    assert set(templates).difference(set(expected_templates)) == set()
 
 
 def test_result_list():

tests/tests.py

@@ -295,7 +295,7 @@ def __init__(self):
                     ):
                         break
                 except Exception as e:
-                    if "A project with that name already exists" not in e.text:
+                    if "A project with that name already exists" not in str(e):
                         raise e
             self.project_a_id = self.jira_admin.project(self.project_a).id
             self.jira_admin.create_project(self.project_b, self.project_b_name)
@@ -453,7 +453,7 @@ def test_application_property(self):
         clone_prefix = self.jira.application_properties(
             key="jira.lf.text.headingcolour"
         )
-        self.assertEqual(clone_prefix["value"], "#292929")
+        self.assertEqual(clone_prefix["value"], "#172b4d")
 
     def test_set_application_property(self):
         prop = "jira.lf.favicon.hires.url"
@@ -1133,12 +1133,12 @@ def test_editmeta(self):
             "comment",
             "components",
             "description",
-            "environment",
+            # "environment",
             "fixVersions",
             "issuelinks",
             "labels",
             "summary",
-            "versions",
+            # "versions",
         }
         for i in (self.issue_1, self.issue_2):
             meta = self.jira.editmeta(i)
@@ -1304,15 +1304,15 @@ def test_votes_with_issue_obj(self):
     def test_add_remove_watcher(self):
 
         # removing it in case it exists, so we know its state
-        self.jira.remove_watcher(self.issue_1, self.test_manager.user_admin.accountId)
+        self.jira.remove_watcher(self.issue_1, self.test_manager.user_admin.key)
         init_watchers = self.jira.watchers(self.issue_1).watchCount
 
         # adding a new watcher
-        self.jira.add_watcher(self.issue_1, self.test_manager.user_admin.accountId)
+        self.jira.add_watcher(self.issue_1, self.test_manager.user_admin.key)
         self.assertEqual(self.jira.watchers(self.issue_1).watchCount, init_watchers + 1)
 
         # now we verify that remove does indeed remove watchers
-        self.jira.remove_watcher(self.issue_1, self.test_manager.user_admin.accountId)
+        self.jira.remove_watcher(self.issue_1, self.test_manager.user_admin.key)
         new_watchers = self.jira.watchers(self.issue_1).watchCount
         self.assertEqual(init_watchers, new_watchers)
 
@@ -1600,7 +1600,7 @@ def test_project_versions(self):
         i = self.jira.issue(JiraTestManager().project_b_issue1)
         i.update(
             fields={
-                "versions": [{"id": version.id}],
+                # "versions": [{"id": version.id}],
                 "fixVersions": [{"id": version.id}],
             }
         )
@@ -1622,7 +1622,7 @@ def test_get_project_version_by_name(self):
         i = self.jira.issue(JiraTestManager().project_b_issue1)
         i.update(
             fields={
-                "versions": [{"id": version.id}],
+                # "versions": [{"id": version.id}],
                 "fixVersions": [{"id": version.id}],
             }
         )
@@ -1649,7 +1649,7 @@ def test_rename_version(self):
         i = self.jira.issue(JiraTestManager().project_b_issue1)
         i.update(
             fields={
-                "versions": [{"id": version.id}],
+                # "versions": [{"id": version.id}],
                 "fixVersions": [{"id": version.id}],
             }
         )

tox.ini

@@ -48,7 +48,6 @@ extras =
 sitepackages=False
 commands=
     git clean -xdf jira tests
-    ; bash -c 'find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf'
     python -m pip check
     python make_local_jira_user.py
     python -m pytest {posargs}
@@ -80,11 +79,7 @@ envars =
     PIP_USER=no
 whitelist_externals =
     bash
-    echo
-    find
-    grep
-    rm
-    xargs
+    git
 
 [testenv:pkg]
 deps =
@@ -96,7 +91,6 @@ deps =
     wheel>=0.33.6
 commands =
     git clean -xdf dist
-    ; rm -rf {toxinidir}/dist
     python setup.py check -m -s
     # disabled due to errors with older setuptools:
     # python setup.py sdist bdist_wheel