Skip to content

Commit db56880

Browse files
Backend: Remove view-level github branch related infra (Cloud-CV#4746)
* Remove github branch filter from create or update github challenge * Remove tests related to github branch * Remove remaining assert in challenge creation * Remove success test entirely * Add back github success test * Remove view-level infra * Remove success test --------- Co-authored-by: Rishabh Jain <rishabhjain2018@gmail.com>
1 parent e8a0f82 commit db56880

4 files changed

Lines changed: 0 additions & 82 deletions

File tree

apps/challenges/challenge_config_utils.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -586,9 +586,6 @@ def validate_serializer(self):
586586
"github_repository": self.request.data[
587587
"GITHUB_REPOSITORY"
588588
],
589-
"github_branch": self.request.data.get(
590-
"GITHUB_BRANCH_NAME", ""
591-
),
592589
},
593590
)
594591
if not serializer.is_valid():

apps/challenges/views.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3897,12 +3897,8 @@ def create_or_update_github_challenge(request, challenge_host_team_pk):
38973897
response_data = {"error": "ChallengeHostTeam does not exist"}
38983898
return Response(response_data, status=status.HTTP_406_NOT_ACCEPTABLE)
38993899

3900-
# Get branch name with default fallback
3901-
github_branch = request.data.get("GITHUB_BRANCH_NAME", "")
3902-
39033900
challenge_queryset = Challenge.objects.filter(
39043901
github_repository=request.data["GITHUB_REPOSITORY"],
3905-
github_branch=github_branch,
39063902
)
39073903

39083904
if challenge_queryset:
@@ -3983,7 +3979,6 @@ def create_or_update_github_challenge(request, challenge_host_team_pk):
39833979
"github_repository": request.data[
39843980
"GITHUB_REPOSITORY"
39853981
],
3986-
"github_branch": github_branch,
39873982
"worker_image_url": worker_image_url,
39883983
},
39893984
)

scripts/seed.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ def create_challenge(
256256
featured=is_featured,
257257
image=image_file,
258258
github_repository=f"evalai-examples/{slug}",
259-
github_branch="main",
260259
)
261260
challenge.save()
262261

tests/unit/challenges/test_views.py

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -5917,45 +5917,6 @@ def setUp(self):
59175917

59185918
self.client.force_authenticate(user=self.user)
59195919

5920-
def test_create_challenge_using_github_success(self):
5921-
self.url = reverse_lazy(
5922-
"challenges:create_or_update_github_challenge",
5923-
kwargs={"challenge_host_team_pk": self.challenge_host_team.pk},
5924-
)
5925-
5926-
with mock.patch("challenges.views.requests.get") as m:
5927-
resp = mock.Mock()
5928-
resp.content = self.test_zip_file.read()
5929-
resp.status_code = 200
5930-
m.return_value = resp
5931-
response = self.client.post(
5932-
self.url,
5933-
{
5934-
"GITHUB_REPOSITORY": "https://github.com/yourusername/repository",
5935-
"GITHUB_BRANCH_NAME": "refs/heads/challenge",
5936-
"zip_configuration": self.input_zip_file,
5937-
},
5938-
format="multipart",
5939-
)
5940-
expected = {
5941-
"Success": "Challenge Challenge Title has been created successfully and sent for review to EvalAI Admin."
5942-
}
5943-
5944-
self.assertEqual(response.status_code, 201)
5945-
self.assertEqual(response.json(), expected)
5946-
self.assertEqual(Challenge.objects.count(), 1)
5947-
self.assertEqual(DatasetSplit.objects.count(), 1)
5948-
self.assertEqual(Leaderboard.objects.count(), 1)
5949-
self.assertEqual(ChallengePhaseSplit.objects.count(), 1)
5950-
5951-
# Verify github_branch is properly stored
5952-
challenge = Challenge.objects.first()
5953-
self.assertEqual(
5954-
challenge.github_repository,
5955-
"https://github.com/yourusername/repository",
5956-
)
5957-
self.assertEqual(challenge.github_branch, "refs/heads/challenge")
5958-
59595920
def test_create_challenge_using_github_when_challenge_host_team_does_not_exist(
59605921
self,
59615922
):
@@ -5994,40 +5955,6 @@ def test_create_challenge_using_github_when_user_is_not_authenticated(
59945955
self.assertEqual(list(response.data.values())[0], expected["error"])
59955956
self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)
59965957

5997-
def test_create_challenge_using_github_without_branch_name(self):
5998-
self.url = reverse_lazy(
5999-
"challenges:create_or_update_github_challenge",
6000-
kwargs={"challenge_host_team_pk": self.challenge_host_team.pk},
6001-
)
6002-
6003-
with mock.patch("challenges.views.requests.get") as m:
6004-
resp = mock.Mock()
6005-
resp.content = self.test_zip_file.read()
6006-
resp.status_code = 200
6007-
m.return_value = resp
6008-
response = self.client.post(
6009-
self.url,
6010-
{
6011-
"GITHUB_REPOSITORY": "https://github.com/yourusername/repository",
6012-
"zip_configuration": self.input_zip_file,
6013-
},
6014-
format="multipart",
6015-
)
6016-
expected = {
6017-
"Success": "Challenge Challenge Title has been created successfully and sent for review to EvalAI Admin."
6018-
}
6019-
6020-
self.assertEqual(response.status_code, 201)
6021-
self.assertEqual(response.json(), expected)
6022-
6023-
# Verify github_branch defaults to empty string when not provided
6024-
challenge = Challenge.objects.first()
6025-
self.assertEqual(
6026-
challenge.github_repository,
6027-
"https://github.com/yourusername/repository",
6028-
)
6029-
self.assertEqual(challenge.github_branch, "")
6030-
60315958

60325959
class ValidateChallengeTest(APITestCase):
60335960
def setUp(self):

0 commit comments

Comments
 (0)