Correct deprecation warning scoping for projects.register

Author: kroenlein

src/citrine/__version__.py

@@ -1 +1 @@
-__version__ = '1.36.5'
+__version__ = '1.36.6'

src/citrine/resources/project.py

@@ -671,20 +671,11 @@ def build(self, data) -> Project:
             project.team_id = self.team_id
         return project
 
-    def _register_in_team(self, name: str, *, description: Optional[str] = None):
-        if self.team_id is None:
-            raise NotImplementedError("Please use team.projects")
-        path = format_escaped_url('teams/{team_id}/projects', team_id=self.team_id)
-        project = Project(name, description=description)
-        try:
-            data = self.session.post_resource(path, project.dump(), version=self._api_version)
-            data = data[self._individual_key]
-            return self.build(data)
-        except NonRetryableException as e:
-            raise ModuleRegistrationFailedException(project.__class__.__name__, e)
+    @use_teams("team.projects.register", deprecated=False)
+    def _old_register(self, name: str, *, description: Optional[str] = None) -> Project:
+        return super().register(Project(name, description=description))
 
-    @use_teams("team.projects.register", deprecated=True)
-    def register(self, name: str, *, description: Optional[str] = None) -> Project:
+    def register(self, name: str, *, description: Optional[str] = None):
         """
         Create and upload new project.
 
@@ -696,10 +687,16 @@ def register(self, name: str, *, description: Optional[str] = None) -> Project:
             Long-form description of the project to be created.
 
         """
-        if self.session._accounts_service_v3:
-            return self._register_in_team(name, description=description)
-        else:
-            return super().register(Project(name, description=description))
+        if self.team_id is None:
+            return self._old_register(name=name, description=description)
+        path = format_escaped_url('teams/{team_id}/projects', team_id=self.team_id)
+        project = Project(name, description=description)
+        try:
+            data = self.session.post_resource(path, project.dump(), version=self._api_version)
+            data = data[self._individual_key]
+            return self.build(data)
+        except NonRetryableException as e:
+            raise ModuleRegistrationFailedException(project.__class__.__name__, e)
 
     def list(self, *,
              page: Optional[int] = None,

tests/resources/test_project.py

@@ -512,18 +512,16 @@ def test_failed_register_v3():
     session.post_resource.side_effect = NotFound(f'/teams/{team_id}/projects',
                                                  FakeRequestResponse(400))
     project_collection = ProjectCollection(session=session, team_id=team_id)
-    with pytest.warns(DeprecationWarning):
-        with pytest.raises(ModuleRegistrationFailedException) as e:
-            project_collection.register("Project")
+    with pytest.raises(ModuleRegistrationFailedException) as e:
+        project_collection.register("Project")
     assert 'The "Project" failed to register.' in str(e.value)
     assert f'/teams/{team_id}/projects' in str(e.value)
 
 
 def test_failed_register_v3_no_team(session_v3):
     project_collection = ProjectCollection(session=session_v3)
-    with pytest.warns(DeprecationWarning):
-        with pytest.raises(NotImplementedError):
-            project_collection.register("Project")
+    with pytest.raises(NotImplementedError):
+        project_collection.register("Project")
 
 
 def test_project_registration(collection: ProjectCollection, session):
@@ -568,8 +566,7 @@ def test_project_registration_v3(collection_v3: ProjectCollection, session_v3):
     team_id = collection_v3.team_id
 
     # When
-    with pytest.warns(DeprecationWarning):
-        created_project = collection_v3.register('testing')
+    created_project = collection_v3.register('testing')
 
     # Then
     assert 1 == session_v3.num_calls