Skip to content

Python3 branch? #21

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
ioncebotari wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Python3 branch? #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1e2a89
Changed the tests to make them work with Python 3 on Ubuntu 18.04
Oct 1, 2018
11efbe6
Changed CircleCI Python image to 3.6.6 and changed the get_bucket test
Oct 1, 2018
3e34ce8
Removed futures from requirements, because it's not needed in Python3
Oct 1, 2018
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
docker:
# specify the version you desire here
# use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers`
- image: circleci/python:2.7.15
- image: circleci/python:3.6.6

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
Expand Down Expand Up @@ -52,4 +52,4 @@ jobs:

- store_artifacts:
path: test-reports
destination: test-reports
destination: test-reports
1 change: 0 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ cryptography==2.3
curtsies==0.3.0
enum34==1.1.6
funcsigs==1.0.2
futures==3.2.0
greenlet==0.4.13
idna==2.7
ipaddress==1.0.22
Expand Down
7 changes: 5 additions & 2 deletions tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def test_create_file_and_retrieve_by_id(self):
:return: None
"""
bucket = self.b2.buckets.get(bucket_name=self.bucket_name)
file = bucket.files.upload(contents='Hello World!', file_name='test/hello.txt')
file = bucket.files.upload(contents='Hello World!'.encode('utf-8'), file_name='test/hello.txt')
file2 = bucket.files.get(file_id=file.file_id)

def test_create_z_binary_file(self):
Expand Down Expand Up @@ -102,7 +102,10 @@ def test_get_buckets(self):
:return: None
"""
buckets = self.b2.buckets.all()
expect(len(buckets)).should.be.greater_than(1)
expect(len(buckets)).should.be.greater_than(0)
current_bucket = None
assert any(bucket for bucket in buckets if bucket.bucket_name == self.bucket_name) == True


def test_get_files(self):
"""
Expand Down