@@ -231,7 +231,7 @@ def test_can_get_whls_all_manylinux(self, tmpdir, pip_runner, osutils):
231
231
appdir , builder = self ._make_appdir_and_dependency_builder (reqs , tmpdir , runner )
232
232
requirements_file = os .path .join (appdir , "requirements.txt" )
233
233
pip .packages_to_download (
234
- expected_args = ["-r" , requirements_file , "--dest" , mock .ANY ],
234
+ expected_args = ["-r" , requirements_file , "--dest" , mock .ANY , "--exists-action" , "i" ],
235
235
packages = ["foo-1.2-cp36-cp36m-manylinux1_x86_64.whl" , "bar-1.2-cp36-cp36m-manylinux1_x86_64.whl" ],
236
236
)
237
237
@@ -250,7 +250,7 @@ def test_can_use_abi3_whl_for_any_python3(self, tmpdir, pip_runner, osutils):
250
250
appdir , builder = self ._make_appdir_and_dependency_builder (reqs , tmpdir , runner )
251
251
requirements_file = os .path .join (appdir , "requirements.txt" )
252
252
pip .packages_to_download (
253
- expected_args = ["-r" , requirements_file , "--dest" , mock .ANY ],
253
+ expected_args = ["-r" , requirements_file , "--dest" , mock .ANY , "--exists-action" , "i" ],
254
254
packages = [
255
255
"foo-1.2-cp33-abi3-manylinux1_x86_64.whl" ,
256
256
"bar-1.2-cp34-abi3-manylinux1_x86_64.whl" ,
@@ -274,7 +274,7 @@ def test_can_expand_purelib_whl(self, tmpdir, pip_runner, osutils):
274
274
appdir , builder = self ._make_appdir_and_dependency_builder (reqs , tmpdir , runner )
275
275
requirements_file = os .path .join (appdir , "requirements.txt" )
276
276
pip .packages_to_download (
277
- expected_args = ["-r" , requirements_file , "--dest" , mock .ANY ],
277
+ expected_args = ["-r" , requirements_file , "--dest" , mock .ANY , "--exists-action" , "i" ],
278
278
packages = ["foo-1.2-cp36-cp36m-manylinux1_x86_64.whl" ],
279
279
whl_contents = ["foo-1.2.data/purelib/foo/" ],
280
280
)
@@ -294,7 +294,7 @@ def test_can_expand_platlib_whl(self, tmpdir, pip_runner, osutils):
294
294
appdir , builder = self ._make_appdir_and_dependency_builder (reqs , tmpdir , runner )
295
295
requirements_file = os .path .join (appdir , "requirements.txt" )
296
296
pip .packages_to_download (
297
- expected_args = ["-r" , requirements_file , "--dest" , mock .ANY ],
297
+ expected_args = ["-r" , requirements_file , "--dest" , mock .ANY , "--exists-action" , "i" ],
298
298
packages = ["foo-1.2-cp36-cp36m-manylinux1_x86_64.whl" ],
299
299
whl_contents = ["foo-1.2.data/platlib/foo/" ],
300
300
)
@@ -316,7 +316,7 @@ def test_can_expand_platlib_and_purelib(self, tmpdir, pip_runner, osutils):
316
316
appdir , builder = self ._make_appdir_and_dependency_builder (reqs , tmpdir , runner )
317
317
requirements_file = os .path .join (appdir , "requirements.txt" )
318
318
pip .packages_to_download (
319
- expected_args = ["-r" , requirements_file , "--dest" , mock .ANY ],
319
+ expected_args = ["-r" , requirements_file , "--dest" , mock .ANY , "--exists-action" , "i" ],
320
320
packages = ["foo-1.2-cp36-cp36m-manylinux1_x86_64.whl" ],
321
321
whl_contents = ["foo-1.2.data/platlib/foo/" , "foo-1.2.data/purelib/bar/" ],
322
322
)
@@ -338,7 +338,7 @@ def test_does_ignore_data(self, tmpdir, pip_runner, osutils):
338
338
appdir , builder = self ._make_appdir_and_dependency_builder (reqs , tmpdir , runner )
339
339
requirements_file = os .path .join (appdir , "requirements.txt" )
340
340
pip .packages_to_download (
341
- expected_args = ["-r" , requirements_file , "--dest" , mock .ANY ],
341
+ expected_args = ["-r" , requirements_file , "--dest" , mock .ANY , "--exists-action" , "i" ],
342
342
packages = ["foo-1.2-cp36-cp36m-manylinux1_x86_64.whl" ],
343
343
whl_contents = ["foo/placeholder" , "foo-1.2.data/data/bar/" ],
344
344
)
@@ -361,7 +361,7 @@ def test_does_ignore_include(self, tmpdir, pip_runner, osutils):
361
361
appdir , builder = self ._make_appdir_and_dependency_builder (reqs , tmpdir , runner )
362
362
requirements_file = os .path .join (appdir , "requirements.txt" )
363
363
pip .packages_to_download (
364
- expected_args = ["-r" , requirements_file , "--dest" , mock .ANY ],
364
+ expected_args = ["-r" , requirements_file , "--dest" , mock .ANY , "--exists-action" , "i" ],
365
365
packages = ["foo-1.2-cp36-cp36m-manylinux1_x86_64.whl" ],
366
366
whl_contents = ["foo/placeholder" , "foo.1.2.data/includes/bar/" ],
367
367
)
@@ -384,7 +384,7 @@ def test_does_ignore_scripts(self, tmpdir, pip_runner, osutils):
384
384
appdir , builder = self ._make_appdir_and_dependency_builder (reqs , tmpdir , runner )
385
385
requirements_file = os .path .join (appdir , "requirements.txt" )
386
386
pip .packages_to_download (
387
- expected_args = ["-r" , requirements_file , "--dest" , mock .ANY ],
387
+ expected_args = ["-r" , requirements_file , "--dest" , mock .ANY , "--exists-action" , "i" ],
388
388
packages = ["foo-1.2-cp36-cp36m-manylinux1_x86_64.whl" ],
389
389
whl_contents = ["{package_name}/placeholder" , "{data_dir}/scripts/bar/placeholder" ],
390
390
)
@@ -408,7 +408,7 @@ def test_can_expand_platlib_and_platlib_and_root(self, tmpdir, pip_runner, osuti
408
408
appdir , builder = self ._make_appdir_and_dependency_builder (reqs , tmpdir , runner )
409
409
requirements_file = os .path .join (appdir , "requirements.txt" )
410
410
pip .packages_to_download (
411
- expected_args = ["-r" , requirements_file , "--dest" , mock .ANY ],
411
+ expected_args = ["-r" , requirements_file , "--dest" , mock .ANY , "--exists-action" , "i" ],
412
412
packages = ["foo-1.2-cp36-cp36m-manylinux1_x86_64.whl" ],
413
413
whl_contents = [
414
414
"{package_name}/placeholder" ,
@@ -432,7 +432,7 @@ def test_can_get_whls_mixed_compat(self, tmpdir, osutils, pip_runner):
432
432
appdir , builder = self ._make_appdir_and_dependency_builder (reqs , tmpdir , runner )
433
433
requirements_file = os .path .join (appdir , "requirements.txt" )
434
434
pip .packages_to_download (
435
- expected_args = ["-r" , requirements_file , "--dest" , mock .ANY ],
435
+ expected_args = ["-r" , requirements_file , "--dest" , mock .ANY , "--exists-action" , "i" ],
436
436
packages = [
437
437
"foo-1.0-cp36-none-any.whl" ,
438
438
"bar-1.2-cp36-cp36m-manylinux1_x86_64.whl" ,
@@ -455,7 +455,7 @@ def test_can_get_py27_whls(self, tmpdir, osutils, pip_runner):
455
455
appdir , builder = self ._make_appdir_and_dependency_builder (reqs , tmpdir , runner )
456
456
requirements_file = os .path .join (appdir , "requirements.txt" )
457
457
pip .packages_to_download (
458
- expected_args = ["-r" , requirements_file , "--dest" , mock .ANY ],
458
+ expected_args = ["-r" , requirements_file , "--dest" , mock .ANY , "--exists-action" , "i" ],
459
459
packages = [
460
460
"foo-1.0-cp27-none-any.whl" ,
461
461
"bar-1.2-cp27-none-manylinux1_x86_64.whl" ,
@@ -501,7 +501,7 @@ def test_does_fail_on_narrow_py27_unicode(self, tmpdir, osutils, pip_runner):
501
501
appdir , builder = self ._make_appdir_and_dependency_builder (reqs , tmpdir , runner )
502
502
requirements_file = os .path .join (appdir , "requirements.txt" )
503
503
pip .packages_to_download (
504
- expected_args = ["-r" , requirements_file , "--dest" , mock .ANY ],
504
+ expected_args = ["-r" , requirements_file , "--dest" , mock .ANY , "--exists-action" , "i" ],
505
505
packages = ["baz-1.5-cp27-cp27m-linux_x86_64.whl" ],
506
506
)
507
507
@@ -523,7 +523,7 @@ def test_does_fail_on_python_1_whl(self, tmpdir, osutils, pip_runner):
523
523
appdir , builder = self ._make_appdir_and_dependency_builder (reqs , tmpdir , runner )
524
524
requirements_file = os .path .join (appdir , "requirements.txt" )
525
525
pip .packages_to_download (
526
- expected_args = ["-r" , requirements_file , "--dest" , mock .ANY ],
526
+ expected_args = ["-r" , requirements_file , "--dest" , mock .ANY , "--exists-action" , "i" ],
527
527
packages = ["baz-1.5-cp14-cp14m-linux_x86_64.whl" ],
528
528
)
529
529
@@ -545,7 +545,7 @@ def test_can_replace_incompat_whl(self, tmpdir, osutils, pip_runner):
545
545
appdir , builder = self ._make_appdir_and_dependency_builder (reqs , tmpdir , runner )
546
546
requirements_file = os .path .join (appdir , "requirements.txt" )
547
547
pip .packages_to_download (
548
- expected_args = ["-r" , requirements_file , "--dest" , mock .ANY ],
548
+ expected_args = ["-r" , requirements_file , "--dest" , mock .ANY , "--exists-action" , "i" ],
549
549
packages = ["foo-1.0-cp36-none-any.whl" , "bar-1.2-cp36-cp36m-macosx_10_6_intel.whl" ],
550
550
)
551
551
# Once the initial download has 1 incompatible whl file. The second,
@@ -581,7 +581,7 @@ def test_allowlist_sqlalchemy(self, tmpdir, osutils, pip_runner):
581
581
appdir , builder = self ._make_appdir_and_dependency_builder (reqs , tmpdir , runner )
582
582
requirements_file = os .path .join (appdir , "requirements.txt" )
583
583
pip .packages_to_download (
584
- expected_args = ["-r" , requirements_file , "--dest" , mock .ANY ],
584
+ expected_args = ["-r" , requirements_file , "--dest" , mock .ANY , "--exists-action" , "i" ],
585
585
packages = ["SQLAlchemy-1.1.18-cp36-cp36m-macosx_10_11_x86_64.whl" ],
586
586
)
587
587
pip .packages_to_download (
@@ -614,7 +614,7 @@ def test_can_build_sdist(self, tmpdir, osutils, pip_runner):
614
614
appdir , builder = self ._make_appdir_and_dependency_builder (reqs , tmpdir , runner )
615
615
requirements_file = os .path .join (appdir , "requirements.txt" )
616
616
pip .packages_to_download (
617
- expected_args = ["-r" , requirements_file , "--dest" , mock .ANY ],
617
+ expected_args = ["-r" , requirements_file , "--dest" , mock .ANY , "--exists-action" , "i" ],
618
618
packages = ["foo-1.2.zip" , "bar-1.2-cp36-cp36m-manylinux1_x86_64.whl" ],
619
619
)
620
620
# Foo is built from and is pure python so it yields a compatible
@@ -638,7 +638,7 @@ def test_build_sdist_makes_incompatible_whl(self, tmpdir, osutils, pip_runner):
638
638
appdir , builder = self ._make_appdir_and_dependency_builder (reqs , tmpdir , runner )
639
639
requirements_file = os .path .join (appdir , "requirements.txt" )
640
640
pip .packages_to_download (
641
- expected_args = ["-r" , requirements_file , "--dest" , mock .ANY ],
641
+ expected_args = ["-r" , requirements_file , "--dest" , mock .ANY , "--exists-action" , "i" ],
642
642
packages = ["foo-1.2.zip" , "bar-1.2-cp36-cp36m-manylinux1_x86_64.whl" ],
643
643
)
644
644
# foo is compiled since downloading it failed to get any wheels. And
@@ -671,7 +671,10 @@ def test_can_build_package_with_optional_c_speedups_and_no_wheel(self, tmpdir, o
671
671
# In this scenario we are downloading a package that has no wheel files
672
672
# at all, and optional c speedups. The initial download will yield an
673
673
# sdist since there were no wheels.
674
- pip .packages_to_download (expected_args = ["-r" , requirements_file , "--dest" , mock .ANY ], packages = ["foo-1.2.zip" ])
674
+ pip .packages_to_download (
675
+ expected_args = ["-r" , requirements_file , "--dest" , mock .ANY , "--exists-action" , "i" ],
676
+ packages = ["foo-1.2.zip" ],
677
+ )
675
678
676
679
# Chalice should now try and build this into a wheel file. Since it has
677
680
# optional c speedups it will build a platform dependent wheel file
@@ -713,7 +716,7 @@ def test_build_into_existing_dir_with_preinstalled_packages(self, tmpdir, osutil
713
716
appdir , builder = self ._make_appdir_and_dependency_builder (reqs , tmpdir , runner )
714
717
requirements_file = os .path .join (appdir , "requirements.txt" )
715
718
pip .packages_to_download (
716
- expected_args = ["-r" , requirements_file , "--dest" , mock .ANY ],
719
+ expected_args = ["-r" , requirements_file , "--dest" , mock .ANY , "--exists-action" , "i" ],
717
720
packages = ["foo-1.2.zip" , "bar-1.2-cp36-cp36m-manylinux1_x86_64.whl" ],
718
721
)
719
722
pip .packages_to_download (
0 commit comments