Skip to content

Moto server #35655

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.

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

Merged
merged 70 commits into from
Aug 21, 2020
Merged
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
3a54dde
Pepper storage_options
Jul 10, 2020
f0922c4
Merge branch 'master' into storage_options
Jul 10, 2020
e549f8d
Add feather test
Jul 22, 2020
e8540c4
Merge branch 'master' into storage_options
Jul 22, 2020
0034bff
Add CSV and parquet options tests; lint
Jul 22, 2020
19f041d
deeper lint
Jul 22, 2020
f9e1e69
more tests
Jul 22, 2020
7f69afe
blank line
Jul 22, 2020
cc0e4c3
attempt relint
Jul 22, 2020
e356e93
unused import
Jul 22, 2020
c7170dd
more order
Jul 22, 2020
b96778d
plumb stata and test
Jul 23, 2020
1dc41b1
Add note about storage_options in whatsnew
Jul 23, 2020
d882984
Plumb and test markdown
Jul 23, 2020
f1e455d
optional markdown
Jul 23, 2020
c88b75f
remove extraneous
Jul 23, 2020
58481a4
more extraneous
Jul 23, 2020
704770b
Add fsspec options error and docstrings
Jul 24, 2020
1b8637e
fix that
Jul 24, 2020
bbcef17
black
Jul 24, 2020
a18686c
fix it again
Jul 24, 2020
fa656cb
more lint
Jul 24, 2020
e8d5312
Merge branch 'master' into storage_options
Jul 27, 2020
a79a274
Requested changes
Jul 27, 2020
28d6d38
Make moto server process instead of monkey
Jul 28, 2020
97c7263
Merge branch 'master' into storage_options
Jul 29, 2020
e99f8ed
Update versions
Jul 29, 2020
aa2751e
Merge branch 'storage_options' into moto_server
Jul 29, 2020
0a2fc29
black and start excel
Jul 29, 2020
6ce6ecc
Plumb excel
Jul 29, 2020
23f4fc4
Merge branch 'master' into storage_options
Jul 31, 2020
3ec9342
Merge branch 'storage_options' into moto_server
Jul 31, 2020
4732729
Merge branch 'master' into moto_server
Aug 10, 2020
a1dba75
fix merge
Aug 10, 2020
e2717db
isort
Aug 10, 2020
e9ed76f
option typo
Aug 10, 2020
1fb4b40
remove moto variable
Aug 10, 2020
e646c16
Add flask where there is moto
Aug 10, 2020
f61bf0b
specific options for s3
Aug 10, 2020
d7e5b4a
skip some; fix unrelated HDF arg order
Aug 10, 2020
df6d48f
rerun generate_pip_deps
Aug 10, 2020
84a8149
try simpler
Aug 10, 2020
32cf3e1
try again
Aug 10, 2020
867c985
Check moto not py
Aug 11, 2020
ee7b156
Merge branch 'master' into moto_server
Aug 11, 2020
65ec74f
Suggestions
Aug 11, 2020
e5fa341
maybe mypy fix
Aug 11, 2020
8ab2702
Move fsspec fixture imports; add whatsnew note
Aug 12, 2020
476e96a
responses
Aug 14, 2020
8ae9189
relint
Aug 14, 2020
eab08b9
update moto deps
Aug 14, 2020
b13614b
latest on windows env
Aug 14, 2020
4c2c1a0
Add kwargs
Aug 14, 2020
9c4124d
try in win-py38 env
Aug 14, 2020
3449870
Merge branch 'master' into moto_server
Aug 17, 2020
09a8e8e
Env only
Aug 18, 2020
51bb02b
Revert - reintroduce code
Aug 18, 2020
8387ea6
Skip test on win
Aug 18, 2020
5e2a86f
not "reason" in skip
Aug 18, 2020
8711c96
typo
Aug 18, 2020
a8a34a0
Merge branch 'master' into moto_server
Aug 20, 2020
6d21fa0
Fewer moto server processes
Aug 20, 2020
1e1d3fe
Dumb
Aug 20, 2020
9f8ad5a
With exceptions
Aug 20, 2020
015512d
Skip old pyarrow; remove moto where no s3fs in env
Aug 20, 2020
989a9f1
sign error
Aug 20, 2020
7617256
Add arrow to env that was getting it anyway (but an old one)
Aug 20, 2020
4624cef
Add reasonable timeouts
Aug 21, 2020
f5c2a44
lint
Aug 21, 2020
5d50cda
small revert
Aug 21, 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
Prev Previous commit
Next Next commit
Add reasonable timeouts
  • Loading branch information
Martin Durant committed Aug 21, 2020
commit 4624cefbcfe172d95bfe9c93c7eff17f3091de3f
15 changes: 11 additions & 4 deletions pandas/tests/io/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,25 +116,28 @@ def s3_resource(s3_base, tips_file, jsonl_file, feather_file):
def add_tips_files(bucket_name):
for s3_key, file_name in test_s3_files:
with open(file_name, "rb") as f:
conn.Bucket(bucket_name).put_object(Key=s3_key, Body=f)
conn.put_object(Bucket=bucket_name, Key=s3_key, Body=f)

bucket = "pandas-test"
endpoint_uri = "http://127.0.0.1:5555/"
conn = boto3.resource("s3", endpoint_url=endpoint_uri)
conn = boto3.client("s3", endpoint_url=endpoint_uri)

try:
conn.create_bucket(Bucket=bucket)
except: # noqa
# OK is bucket already exists
pass
add_tips_files(bucket)

try:
conn.create_bucket(Bucket="cant_get_it", ACL="private")
except: # noqa
# OK is bucket already exists
pass
timeout = 2
while not conn.list_buckets()['Buckets'] and timeout > 0:
time.sleep(0.1)
timeout -= 0.1

add_tips_files(bucket)
add_tips_files("cant_get_it")
s3fs.S3FileSystem.clear_instance_cache()
yield conn
Expand All @@ -149,3 +152,7 @@ def add_tips_files(bucket_name):
s3.rm("cant_get_it", recursive=True)
except: # noqa
pass
timeout = 2
while conn.list_buckets()['Buckets'] and timeout > 0:
time.sleep(0.1)
timeout -= 0.1