diff --git a/api/Pipfile b/api/Pipfile index 587776b1686..44409bd449a 100755 --- a/api/Pipfile +++ b/api/Pipfile @@ -30,6 +30,10 @@ flake8-noqa = "~=1.1.0" diff-match-patch = "==20200713" decoy = "~=1.6.7" black = "==21.7b0" +# pytest dependencies on windows, spec'd here to force lockfile inclusion +# https://github.com/pypa/pipenv/issues/4408#issuecomment-668324177 +atomicwrites = {version="==1.4.0", sys_platform="== 'win32'"} +colorama = {version="0.4.4", sys_platform="== 'win32'"} [packages] opentrons-shared-data = {editable = true, path = "../shared-data/python"} diff --git a/api/Pipfile.lock b/api/Pipfile.lock index f0d6a7bb978..827f7905697 100644 --- a/api/Pipfile.lock +++ b/api/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "90e5c6c26af2d025357f0963d8b304f0f8c048a4d2969eb4b1f0bbe7b7842164" + "sha256": "d79a2d1a6e2c0929a01d7036509a1a9fe613aa1a3016047095b0414298f634c0" }, "pipfile-spec": 6, "requires": { @@ -264,6 +264,14 @@ "markers": "python_full_version >= '3.5.3'", "version": "==3.0.1" }, + "atomicwrites": { + "hashes": [ + "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197", + "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a" + ], + "markers": "sys_platform == 'win32'", + "version": "==1.4.0" + }, "attrs": { "hashes": [ "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1", @@ -327,6 +335,14 @@ "markers": "python_version >= '3.6'", "version": "==8.0.1" }, + "colorama": { + "hashes": [ + "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b", + "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2" + ], + "markers": "sys_platform == 'win32'", + "version": "==0.4.4" + }, "coverage": { "hashes": [ "sha256:00f1d23f4336efc3b311ed0d807feb45098fc86dee1ca13b3d6768cdab187c8a", @@ -1083,7 +1099,7 @@ "sha256:39fb8672126159acb139a7718dd10806104dec1e2f0f6c88aab05d17df10c8d4", "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4.0'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_full_version < '4.0.0'", "version": "==1.26.6" }, "webencodings": { diff --git a/notify-server/Pipfile b/notify-server/Pipfile index 1cf2a07b672..1042e596e12 100644 --- a/notify-server/Pipfile +++ b/notify-server/Pipfile @@ -24,3 +24,7 @@ pytest = "==6.*,>=6.1.0" pytest-cov = "==2.*,<2.11.0" pytest-asyncio = "==0.15.1" pytest-xdist = "~=2.2.1" +# pytest dependencies on windows, spec'd here to force lockfile inclusion +# https://github.com/pypa/pipenv/issues/4408#issuecomment-668324177 +atomicwrites = {version="==1.4.0", sys_platform="== 'win32'"} +colorama = {version="0.4.4", sys_platform="== 'win32'"} diff --git a/notify-server/Pipfile.lock b/notify-server/Pipfile.lock index 939e7d62638..a2ee96360a2 100644 --- a/notify-server/Pipfile.lock +++ b/notify-server/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "2fe19cc0fbd0f767e8996d6f77fdb480a1729672b5ef530e0a983e4250c3285b" + "sha256": "960f30480108b8d56e47cf712d80ddaeaa8d4d05b86bfae03311cd0598d662f7" }, "pipfile-spec": 6, "requires": { @@ -215,6 +215,14 @@ } }, "develop": { + "atomicwrites": { + "hashes": [ + "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197", + "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a" + ], + "markers": "sys_platform == 'win32'", + "version": "==1.4.0" + }, "attrs": { "hashes": [ "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1", @@ -223,6 +231,14 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "version": "==21.2.0" }, + "colorama": { + "hashes": [ + "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b", + "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2" + ], + "markers": "sys_platform == 'win32'", + "version": "==0.4.4" + }, "coverage": { "hashes": [ "sha256:004d1880bed2d97151facef49f08e255a20ceb6f9432df75f4eef018fdd5a78c", diff --git a/robot-server/Pipfile b/robot-server/Pipfile index 303548fec9b..a9e29fa1cee 100755 --- a/robot-server/Pipfile +++ b/robot-server/Pipfile @@ -24,6 +24,10 @@ flake8-noqa = "~=1.1.0" decoy = "~=1.6.7" httpx = "==0.18.*" black = "==21.7b0" +# pytest dependencies on windows, spec'd here to force lockfile inclusion +# https://github.com/pypa/pipenv/issues/4408#issuecomment-668324177 +atomicwrites = {version="==1.4.0", sys_platform="== 'win32'"} +colorama = {version="0.4.4", sys_platform="== 'win32'"} [packages] opentrons = {editable = true, path = "../api"} diff --git a/robot-server/Pipfile.lock b/robot-server/Pipfile.lock index f13d333e8ba..a1182dae528 100644 --- a/robot-server/Pipfile.lock +++ b/robot-server/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "663bd13d523b28c8e97d3d3d9f7ab0b0ce2bcbfc0a4a1340457fbc69156eced1" + "sha256": "9f93cc277dd3fa00c16aecda3c2a35ab51b50694af644b648ea4f8b35d7f872a" }, "pipfile-spec": 6, "requires": { @@ -384,6 +384,14 @@ "markers": "python_full_version >= '3.5.3'", "version": "==3.0.1" }, + "atomicwrites": { + "hashes": [ + "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197", + "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a" + ], + "markers": "sys_platform == 'win32'", + "version": "==1.4.0" + }, "attrs": { "hashes": [ "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1", @@ -431,6 +439,14 @@ "markers": "python_version >= '3.6'", "version": "==8.0.1" }, + "colorama": { + "hashes": [ + "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b", + "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2" + ], + "markers": "sys_platform == 'win32'", + "version": "==0.4.4" + }, "coverage": { "hashes": [ "sha256:004d1880bed2d97151facef49f08e255a20ceb6f9432df75f4eef018fdd5a78c", @@ -486,7 +502,7 @@ "sha256:f0b278ce10936db1a37e6954e15a3730bea96a0997c26d7fee88e6c396c2086d", "sha256:f11642dddbb0253cc8853254301b51390ba0081750a8ac03f20ea8103f0c56b6" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4.0'", "version": "==5.5" }, "decoy": { @@ -1127,7 +1143,7 @@ "sha256:39fb8672126159acb139a7718dd10806104dec1e2f0f6c88aab05d17df10c8d4", "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4.0'", "version": "==1.26.6" }, "uvicorn": { diff --git a/shared-data/python/Pipfile b/shared-data/python/Pipfile index 93776ef3e74..724518d0b32 100644 --- a/shared-data/python/Pipfile +++ b/shared-data/python/Pipfile @@ -20,6 +20,10 @@ pytest = "==6.1.0" pytest-cov = "==2.10.1" pytest-xdist = "~=2.2.1 " typeguard = "==2.7.1" +# pytest dependencies on windows, spec'd here to force lockfile inclusion +# https://github.com/pypa/pipenv/issues/4408#issuecomment-668324177 +atomicwrites = {version="==1.4.0", sys_platform="== 'win32'"} +colorama = {version="0.4.4", sys_platform="== 'win32'"} [packages] jsonschema = "==3.0.2" diff --git a/shared-data/python/Pipfile.lock b/shared-data/python/Pipfile.lock index 064e7370690..230f903e58a 100644 --- a/shared-data/python/Pipfile.lock +++ b/shared-data/python/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "e9e7e96c32bd619c9fb9d703df76fb037635d8f883901d0306aba30e9e5d9f2a" + "sha256": "781279090e84a728c9b3043236f829811c6c3f8ddba0daa7052deb983d8bf7c3" }, "pipfile-spec": 6, "requires": { @@ -66,9 +66,26 @@ ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.16.0" + }, + "typing-extensions": { + "hashes": [ + "sha256:0ac0f89795dd19de6b97debb0c6af1c70987fd80a2d62d1958f7e56fcc31b497", + "sha256:50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342", + "sha256:779383f6086d90c99ae41cf0ff39aac8a7937a9283ce0a414e5dd782f4c94a84" + ], + "index": "pypi", + "version": "==3.10.0.0" } }, "develop": { + "atomicwrites": { + "hashes": [ + "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197", + "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a" + ], + "markers": "sys_platform == 'win32'", + "version": "==1.4.0" + }, "attrs": { "hashes": [ "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1", @@ -100,6 +117,14 @@ "markers": "python_version >= '3'", "version": "==2.0.4" }, + "colorama": { + "hashes": [ + "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b", + "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2" + ], + "markers": "sys_platform == 'win32'", + "version": "==0.4.4" + }, "coverage": { "hashes": [ "sha256:004d1880bed2d97151facef49f08e255a20ceb6f9432df75f4eef018fdd5a78c",