Skip to content

Maintenance for config and boto #157

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

Open
say-yawn wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Maintenance for config and boto #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
188d4cc
Use connect_s3 instead of S3Connection
say-yawn Oct 29, 2020
5a6f558
Bump refresh_lists_delay to 6 hours
say-yawn Oct 29, 2020
5cbf382
Update Circle CI configs to Py3 image
say-yawn Oct 29, 2020
38a8e1f
Update Circle to use 2.1 version
say-yawn Oct 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
---
version: 2
version: 2.1
jobs:
build:
docker:
- image: circleci/python:2.7.17-stretch
- image: circleci/python:3.7.6
auth:
username: ${DOCKER_USER}
password: ${DOCKER_PASS}
steps:
- checkout
- setup_remote_docker
Expand Down
1 change: 1 addition & 0 deletions shavar.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,4 @@ default_proto_ver = 2.0
lists_served = dir://shavar/tests/lists_served
lists_root = tests
sentry_dsn = ${SENTRY_DSN}
refresh_lists_delay=21600
2 changes: 1 addition & 1 deletion shavar.testing.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ override = True
lists_served = dir://shavar/tests/lists_served
# The amount of time to wait before refreshing the list_names_served from the
# above lists_served source.
refresh_lists_delay=600
refresh_lists_delay=21600
# The default protocol version to speak. As yet, we only speak version
# 2 of the protocol even though it has been superceded by Google.
# Default value: 2
Expand Down
6 changes: 3 additions & 3 deletions shavar/sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from urllib.parse import urlparse

from boto.exception import S3ResponseError
from boto.s3.connection import S3Connection
from boto import connect_s3

from shavar.exceptions import NoDataError, ParseError
from shavar.parse import parse_dir_source, parse_file_source
Expand Down Expand Up @@ -147,7 +147,7 @@ def __init__(self, source_url, refresh_interval):

def _get_key(self):
try:
conn = S3Connection()
conn = boto.connect_s3()
bucket = conn.get_bucket(self.url.netloc)
except S3ResponseError as e:
raise NoDataError("Could not find bucket \"%s\": %s"
Expand Down Expand Up @@ -188,7 +188,7 @@ def __init__(self, source_url, refresh_interval):

def load(self):
# for the closures to minimize the number of connections to S3
conn = S3Connection()
conn = boto.connect_s3()

try:
bucket = conn.get_bucket(self.url.netloc)
Expand Down