Skip to content

Commit b803e5f

Browse files
committed
Remove 3.6.5 test and prevent install, add sleep to test upload fix.
1 parent 098e3c1 commit b803e5f

3 files changed

Lines changed: 9 additions & 34 deletions

File tree

.circleci/config.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ workflows:
1717
requires:
1818
- build
1919

20-
- linux_py_365:
21-
requires:
22-
- build
23-
2420
- linux_py_latest:
2521
requires:
2622
- build
@@ -36,7 +32,6 @@ workflows:
3632
- deploy:
3733
requires:
3834
- linux_py_27
39-
- linux_py_365
4035
- linux_py_37
4136
- linux_py_latest
4237
# - windows_py_38
@@ -101,26 +96,6 @@ jobs:
10196
command: |
10297
python /tmp/artifact/tests/integration.py
10398
104-
linux_py_365:
105-
description: Linux 3.6.5
106-
docker:
107-
- image: circleci/python:3.6.5
108-
109-
steps:
110-
- attach_workspace:
111-
at: /tmp/artifact
112-
name: Attach build artifact
113-
114-
- run:
115-
name: Install package
116-
command: |
117-
pip install '/tmp/artifact'
118-
119-
- run:
120-
name: Run integration test
121-
command: |
122-
python /tmp/artifact/tests/integration.py
123-
12499
125100
linux_py_37:
126101
description: Linux 3.7.7

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def run(self):
2525
setuptools.setup(
2626
name='frameioclient',
2727
version=version,
28-
python_requires='>=2.6, <4',
28+
python_requires='>=2.6, !=3.6.*, <4',
2929
install_requires=[
3030
'requests',
3131
'urllib3',

tests/integration.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def test_upload(client):
6464
# Upload all the files we downloaded earlier
6565
dled_files = os.listdir('downloads')
6666

67-
for count, fn in enumerate(dled_files):
67+
for count, fn in enumerate(dled_files, start=1):
6868
print("Uploading {}".format(fn))
6969
abs_path = os.path.join(os.curdir, 'downloads', fn)
7070
filesize = os.path.getsize(abs_path)
@@ -82,13 +82,13 @@ def test_upload(client):
8282
with open(abs_path, "rb") as ul_file:
8383
client.upload(asset, ul_file)
8484

85-
print("Done uploading file {} of {}".format((count+1), len(dled_files)))
85+
print("Done uploading file {} of {}".format((count), len(dled_files)))
8686

8787
print("Sleeping for 5 seconds to allow uploads to finish...")
8888
time.sleep(5)
8989

9090
print("Continuing...")
91-
91+
9292
return new_parent_id
9393

9494
# Flatten asset children and pull out important info for comparison
@@ -162,11 +162,11 @@ def clean_up(client, asset_to_delete):
162162
]
163163
}
164164

165-
try:
166-
client._api_call('delete', '/batch/assets', json.dumps(payload))
167-
print("Managed to cleanup!")
168-
except Exception as e:
169-
print(e)
165+
# try:
166+
# client._api_call('delete', '/assets/id', json.dumps(payload))
167+
# print("Managed to cleanup!")
168+
# except Exception as e:
169+
# print(e)
170170

171171
return True
172172

0 commit comments

Comments
 (0)