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.

Sign up for GitHub

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

Jump to bottom

Update awscli, botocore, boto3 and moto in Travis #2627

Closed
wants to merge 40 commits into from
Closed

Update awscli, botocore, boto3 and moto in Travis #2627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
5c4e91d
Add tests
nikochiko Jan 10, 2020
c2c1a30
Add unit tests for restart_workers
nikochiko Jan 10, 2020
09f462a
Merge branch 'master' into aws-utils-test-RestartWorker
nikochiko Jan 10, 2020
6f5c98a
Correct mock.patch syntax
nikochiko Jan 10, 2020
9036276
Merge branch 'aws-utils-test-RestartWorker' of https://github.com/col…
nikochiko Jan 10, 2020
0d0354a
Fix syntax
nikochiko Jan 10, 2020
d20446b
Reorder imports and use random client token
nikochiko Jan 11, 2020
47856f5
Use aws_utils.client_token_generator for token
nikochiko Jan 11, 2020
3edeb61
Fix linting
nikochiko Jan 11, 2020
513d706
Reorder imports, add class variables
nikochiko Jan 12, 2020
d8d5fbb
Reorder imports
nikochiko Jan 13, 2020
8adb62b
Try fix for deploymentController
nikochiko Jan 14, 2020
718ec95
Merge branch 'aws-utils-test-RestartWorker' of https://github.com/col…
nikochiko Jan 14, 2020
92e4708
Revert trial changes
nikochiko Jan 14, 2020
3451a1f
Add test changes
nikochiko Jan 14, 2020
b24e85d
Update .travis.yml
nikochiko Jan 14, 2020
bc4a515
Add --update flag
nikochiko Jan 14, 2020
94508c8
Update .travis.yml
nikochiko Jan 14, 2020
6e01ae8
Update test_aws_utils.py
nikochiko Jan 14, 2020
df24164
install latest aws deps in travis
nikochiko Jan 18, 2020
3f36692
Merge branch 'master' into UpdateAWSdeps
nikochiko Jan 18, 2020
158d171
Only install awscli without toching other deps
nikochiko Jan 18, 2020
3982354
Add sample tests for aws_utils
nikochiko Jan 18, 2020
ccd5933
Fix linting
nikochiko Jan 18, 2020
979e568
Fix typo
nikochiko Jan 18, 2020
f87dad8
Try uninstalling and reinstallilng boto3 botocore
nikochiko Jan 18, 2020
034531d
Add -y flag to pip uninstall
nikochiko Jan 18, 2020
f4b60c5
Remove versioning from requirements/dev.txt
nikochiko Jan 18, 2020
1752d5c
Try reverting changes to confirm results
nikochiko Jan 18, 2020
562186c
Revert "Try reverting changes to confirm results"
nikochiko Jan 18, 2020
b43ca45
Use moto==1.3.8
nikochiko Jan 18, 2020
e5cdf4a
Revert last change
nikochiko Jan 18, 2020
2bc8d94
Remove test_aws_utils
nikochiko Jan 18, 2020
ed10453
Remove unnecessary change
nikochiko Jan 18, 2020
15cc0ad
Make random change
nikochiko Jan 18, 2020
809458a
Revert random change
nikochiko Jan 18, 2020
74f5bcb
Merge branch 'UpdateAWSdeps' of https://github.com/coldk91ght/EvalAI …
nikochiko Jan 18, 2020
b2c4f86
Try some changes
nikochiko Jan 18, 2020
601e3e9
Remove test_aws_utils
nikochiko Jan 18, 2020
e43ae8c
Use mock_sqs on BaseTestClass for submission_worker
nikochiko Jan 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ before_install:
services:
- xvfb
install:
- pip install awscli
- pip install -r requirements/dev.txt
- pip install awscli==1.16.57 coveralls
script:
- flake8 ./
- karma start --single-run
Expand Down
8 changes: 4 additions & 4 deletions requirements/common.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
asgi-redis==1.4.3
boto3==1.9.88
botocore==1.12.88
boto3
botocore
celery[sqs]==4.3.0
commonmark==0.5.4
django==1.11.23
Expand All @@ -10,13 +10,13 @@ django-import-export==0.5.1
djangorestframework==3.9.3
djangorestframework-expiring-authtoken==0.1.4
django-cors-headers==1.3.1
django-rest-auth[with_social]==0.9.2
django-rest-auth[with_social]==0.9.2
django-ses==0.8.5
docker-compose==1.21.0
drfdocs==0.0.11
drf-yasg==1.11.0
kubernetes==10.0.1
moto==1.3.8
moto
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moto should be in dev

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nvm, since it was in common you can keep it here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay!

pika==0.10.0
pickleshare==0.7.4
Pillow==6.2.0
Expand Down
3 changes: 1 addition & 2 deletions tests/unit/worker/test_submission_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
)


@mock_sqs
class BaseAPITestClass(APITestCase):
def setUp(self):

Expand Down Expand Up @@ -213,15 +214,13 @@ def test_load_challenge_and_return_max_submissions_when_challenge_does_not_exist
load_challenge_and_return_max_submissions({"pk": non_existing_challenge_pk})
mock_logger.assert_called_with("Challenge with pk {} doesn't exist".format(non_existing_challenge_pk))

@mock_sqs()
def test_get_or_create_sqs_queue_for_existing_queue(self):
self.sqs_client.create_queue(QueueName="test_queue")
get_or_create_sqs_queue("test_queue")
queue_url = self.sqs_client.get_queue_url(QueueName='test_queue')['QueueUrl']
self.assertTrue(queue_url)
self.sqs_client.delete_queue(QueueUrl=queue_url)

@mock_sqs()
def test_get_or_create_sqs_queue_for_non_existing_queue(self):
get_or_create_sqs_queue("test_queue_2")
queue_url = self.sqs_client.get_queue_url(QueueName='test_queue_2')['QueueUrl']
Expand Down