From 69093e9d2fc21c96da9db97bc8d49c34fca1ab26 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 10:24:57 -0500 Subject: [PATCH 01/24] empty commit From 146dc0f4672c530fcf6c0a269ea22b4ba3bff5b1 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 10:27:53 -0500 Subject: [PATCH 02/24] ram disk for windows Signed-off-by: Kenneth Reitz --- run-tests.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/run-tests.bat b/run-tests.bat index 16d370d4..d6793f50 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,8 +1,8 @@ -imdisk -a -s 2104515b -m R: -f C:\my_disk.ima -p "/FS:NTFS /C /Y" -set RAM_DISK="R:\" +rem imdisk -a -s 2104515b -m R: -f C:\my_disk.ima -p "/FS:NTFS /C /Y" +set RAM_DISK="R:" virtualenv R:\.venv R:\.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed R:\.venv\Scripts\pipenv install --dev -SET RAM_DISK="R:\" && SET PYPI_VENDOR_DIR=".\tests\pypi\" && R:\.venv\Scripts\pipenv run pytest -n auto -v tests --tap-stream +SET RAM_DISK="R:" && SET PYPI_VENDOR_DIR=".\tests\pypi\" && R:\.venv\Scripts\pipenv run pytest -n auto -v tests --tap-stream From d94336734d1ebcac1d031f57b5c2bc5f718a49c3 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 10:30:03 -0500 Subject: [PATCH 03/24] try this Signed-off-by: Kenneth Reitz --- run-tests.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run-tests.bat b/run-tests.bat index d6793f50..b78febd7 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,8 +1,8 @@ rem imdisk -a -s 2104515b -m R: -f C:\my_disk.ima -p "/FS:NTFS /C /Y" -set RAM_DISK="R:" +set RAM_DISK="R:\" virtualenv R:\.venv R:\.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed R:\.venv\Scripts\pipenv install --dev -SET RAM_DISK="R:" && SET PYPI_VENDOR_DIR=".\tests\pypi\" && R:\.venv\Scripts\pipenv run pytest -n auto -v tests --tap-stream +SET RAM_DISK="R:\" && SET PYPI_VENDOR_DIR=".\tests\pypi\" && R:\.venv\Scripts\pipenv run pytest -n auto -v tests --tap-stream From c8f942c83cde25d6b9b61881772903d2267a80d8 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 10:32:16 -0500 Subject: [PATCH 04/24] double backslash Signed-off-by: Kenneth Reitz --- run-tests.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run-tests.bat b/run-tests.bat index b78febd7..1efda357 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,8 +1,8 @@ rem imdisk -a -s 2104515b -m R: -f C:\my_disk.ima -p "/FS:NTFS /C /Y" -set RAM_DISK="R:\" +set RAM_DISK="R:\\" virtualenv R:\.venv R:\.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed R:\.venv\Scripts\pipenv install --dev -SET RAM_DISK="R:\" && SET PYPI_VENDOR_DIR=".\tests\pypi\" && R:\.venv\Scripts\pipenv run pytest -n auto -v tests --tap-stream +SET RAM_DISK="R:\\" && SET PYPI_VENDOR_DIR=".\tests\pypi\" && R:\.venv\Scripts\pipenv run pytest -n auto -v tests --tap-stream From d9182e67d3046c1577c33cf23f7266ec83a5e46a Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 10:38:34 -0500 Subject: [PATCH 05/24] try this Signed-off-by: Kenneth Reitz --- pipenv/utils.py | 2 +- run-tests.bat | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pipenv/utils.py b/pipenv/utils.py index 29437868..37ab5896 100644 --- a/pipenv/utils.py +++ b/pipenv/utils.py @@ -1129,7 +1129,7 @@ class TemporaryDirectory(object): if 'RAM_DISK' in os.environ: import uuid name = uuid.uuid4().hex - dir_name = os.path.sep.join([os.environ['RAM_DISK'], name]) + dir_name = '/'.join([os.environ['RAM_DISK'], name]) os.mkdir(dir_name) self.name = dir_name diff --git a/run-tests.bat b/run-tests.bat index 1efda357..d6793f50 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,8 +1,8 @@ rem imdisk -a -s 2104515b -m R: -f C:\my_disk.ima -p "/FS:NTFS /C /Y" -set RAM_DISK="R:\\" +set RAM_DISK="R:" virtualenv R:\.venv R:\.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed R:\.venv\Scripts\pipenv install --dev -SET RAM_DISK="R:\\" && SET PYPI_VENDOR_DIR=".\tests\pypi\" && R:\.venv\Scripts\pipenv run pytest -n auto -v tests --tap-stream +SET RAM_DISK="R:" && SET PYPI_VENDOR_DIR=".\tests\pypi\" && R:\.venv\Scripts\pipenv run pytest -n auto -v tests --tap-stream From ca391fc20ccff507a6c14fbfceabf368c22dd868 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 10:40:20 -0500 Subject: [PATCH 06/24] try like this Signed-off-by: Kenneth Reitz Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index d6793f50..a0f8f70a 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -5,4 +5,4 @@ virtualenv R:\.venv R:\.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed R:\.venv\Scripts\pipenv install --dev -SET RAM_DISK="R:" && SET PYPI_VENDOR_DIR=".\tests\pypi\" && R:\.venv\Scripts\pipenv run pytest -n auto -v tests --tap-stream +SET RAM_DISK=R: && SET PYPI_VENDOR_DIR=".\tests\pypi\" && R:\.venv\Scripts\pipenv run pytest -n auto -v tests --tap-stream From 6b4b8f07fbaa6f302a88ce5907eb62beafdd81e5 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 10:41:56 -0500 Subject: [PATCH 07/24] &&imediately Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index a0f8f70a..4fb4080f 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -5,4 +5,4 @@ virtualenv R:\.venv R:\.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed R:\.venv\Scripts\pipenv install --dev -SET RAM_DISK=R: && SET PYPI_VENDOR_DIR=".\tests\pypi\" && R:\.venv\Scripts\pipenv run pytest -n auto -v tests --tap-stream +SET RAM_DISK=R:&& SET PYPI_VENDOR_DIR=".\tests\pypi\" && R:\.venv\Scripts\pipenv run pytest -n auto -v tests --tap-stream From a51f803d9263613da2eb6fc1f1f19ec1029c361c Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 10:42:15 -0500 Subject: [PATCH 08/24] strip Signed-off-by: Kenneth Reitz --- pipenv/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipenv/utils.py b/pipenv/utils.py index 37ab5896..ad9f02a0 100644 --- a/pipenv/utils.py +++ b/pipenv/utils.py @@ -1129,7 +1129,7 @@ class TemporaryDirectory(object): if 'RAM_DISK' in os.environ: import uuid name = uuid.uuid4().hex - dir_name = '/'.join([os.environ['RAM_DISK'], name]) + dir_name = '/'.join([os.environ['RAM_DISK'].strip(), name]) os.mkdir(dir_name) self.name = dir_name From 6963b54e74a37a5e17e544c620ea29f018aba4c7 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 10:44:10 -0500 Subject: [PATCH 09/24] getting drastic Signed-off-by: Kenneth Reitz --- pipenv/utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pipenv/utils.py b/pipenv/utils.py index ad9f02a0..107bb341 100644 --- a/pipenv/utils.py +++ b/pipenv/utils.py @@ -1130,6 +1130,8 @@ class TemporaryDirectory(object): import uuid name = uuid.uuid4().hex dir_name = '/'.join([os.environ['RAM_DISK'].strip(), name]) + print(dir_name) + exit() os.mkdir(dir_name) self.name = dir_name From f2def195b8752d4afb1bbd769b695c7e97e29235 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 10:45:10 -0500 Subject: [PATCH 10/24] drasticer Signed-off-by: Kenneth Reitz --- run-tests.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index 4fb4080f..910d5f08 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -5,4 +5,5 @@ virtualenv R:\.venv R:\.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed R:\.venv\Scripts\pipenv install --dev -SET RAM_DISK=R:&& SET PYPI_VENDOR_DIR=".\tests\pypi\" && R:\.venv\Scripts\pipenv run pytest -n auto -v tests --tap-stream +SET RAM_DISK=R:&& SET PYPI_VENDOR_DIR=".\tests\pypi\" && R:\.venv\Scripts\pipenv run pytest -n auto -v tests +rem --tap-stream From 6e21217c1996076eb8ff941f3813bc654eb483bf Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 10:47:55 -0500 Subject: [PATCH 11/24] try again Signed-off-by: Kenneth Reitz --- pipenv/utils.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pipenv/utils.py b/pipenv/utils.py index 107bb341..fd760455 100644 --- a/pipenv/utils.py +++ b/pipenv/utils.py @@ -1129,9 +1129,7 @@ class TemporaryDirectory(object): if 'RAM_DISK' in os.environ: import uuid name = uuid.uuid4().hex - dir_name = '/'.join([os.environ['RAM_DISK'].strip(), name]) - print(dir_name) - exit() + dir_name = os.path.sep.join([os.environ['RAM_DISK'].strip(), name]) os.mkdir(dir_name) self.name = dir_name From 3c61a278aebfcb891586a988b0a1be087667bc2a Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 10:48:55 -0500 Subject: [PATCH 12/24] try this Signed-off-by: Kenneth Reitz --- run-tests.bat | 1 - 1 file changed, 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index 910d5f08..94edad08 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,5 +1,4 @@ rem imdisk -a -s 2104515b -m R: -f C:\my_disk.ima -p "/FS:NTFS /C /Y" -set RAM_DISK="R:" virtualenv R:\.venv R:\.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed From 5570322e7397060d899c7984158fb9dec4e56699 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 10:50:07 -0500 Subject: [PATCH 13/24] getting drastic Signed-off-by: Kenneth Reitz --- run-tests.bat | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/run-tests.bat b/run-tests.bat index 94edad08..fe27c203 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,8 +1,9 @@ rem imdisk -a -s 2104515b -m R: -f C:\my_disk.ima -p "/FS:NTFS /C /Y" -virtualenv R:\.venv -R:\.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed -R:\.venv\Scripts\pipenv install --dev + +rem virtualenv R:\.venv +rem R:\.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed +rem R:\.venv\Scripts\pipenv install --dev SET RAM_DISK=R:&& SET PYPI_VENDOR_DIR=".\tests\pypi\" && R:\.venv\Scripts\pipenv run pytest -n auto -v tests rem --tap-stream From bd1435990d6ea5e41f9e5b32c51989951497acc4 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 10:51:36 -0500 Subject: [PATCH 14/24] install Signed-off-by: Kenneth Reitz --- run-tests.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/run-tests.bat b/run-tests.bat index fe27c203..da9771d5 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,9 +1,9 @@ rem imdisk -a -s 2104515b -m R: -f C:\my_disk.ima -p "/FS:NTFS /C /Y" -rem virtualenv R:\.venv -rem R:\.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed -rem R:\.venv\Scripts\pipenv install --dev +virtualenv R:\.venv +R:\.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed +R:\.venv\Scripts\pipenv install --dev SET RAM_DISK=R:&& SET PYPI_VENDOR_DIR=".\tests\pypi\" && R:\.venv\Scripts\pipenv run pytest -n auto -v tests rem --tap-stream From 66fb3d81e9d09d5c2de768d188f2e69128e51fb1 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 10:59:10 -0500 Subject: [PATCH 15/24] persistients --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index da9771d5..8ff2cedd 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,4 +1,4 @@ -rem imdisk -a -s 2104515b -m R: -f C:\my_disk.ima -p "/FS:NTFS /C /Y" +rem imdisk -P -a -s 2104515b -m R: -f C:\my_disk.ima -p "/FS:NTFS /C /Y" virtualenv R:\.venv From 51d8d3c67bfd2adc7d4a552e3608d9e181393133 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 11:02:40 -0500 Subject: [PATCH 16/24] cleanup Signed-off-by: Kenneth Reitz --- run-tests.bat | 1 - 1 file changed, 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index 8ff2cedd..5316ce9e 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,6 +1,5 @@ rem imdisk -P -a -s 2104515b -m R: -f C:\my_disk.ima -p "/FS:NTFS /C /Y" - virtualenv R:\.venv R:\.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed R:\.venv\Scripts\pipenv install --dev From 812607c2a74df7b5ce977ea4714f12043c10ab5d Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 11:02:54 -0500 Subject: [PATCH 17/24] ignore Signed-off-by: Kenneth Reitz --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 34a968c1..8ece4a20 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ test_project /results.tap /report.tap + +/t.py From e2714d34d88fe737249ecf434bbb467b3221893c Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 11:04:10 -0500 Subject: [PATCH 18/24] persistient Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index 5316ce9e..1474a937 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,4 +1,4 @@ -rem imdisk -P -a -s 2104515b -m R: -f C:\my_disk.ima -p "/FS:NTFS /C /Y" +imdisk -P -a -s 2104515b -m R: -f C:\my_disk.ima -p "/FS:NTFS /C /Y" virtualenv R:\.venv R:\.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed From 59f9a8e6125b1eaa8a295bc6a186d549d65c797a Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 11:05:13 -0500 Subject: [PATCH 19/24] skip Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index 1474a937..5316ce9e 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,4 +1,4 @@ -imdisk -P -a -s 2104515b -m R: -f C:\my_disk.ima -p "/FS:NTFS /C /Y" +rem imdisk -P -a -s 2104515b -m R: -f C:\my_disk.ima -p "/FS:NTFS /C /Y" virtualenv R:\.venv R:\.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed From b81a6d9fda23828ac9cccc12c7b7c9839221edde Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 11:11:24 -0500 Subject: [PATCH 20/24] no file base Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index 5316ce9e..036a9da7 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,4 +1,4 @@ -rem imdisk -P -a -s 2104515b -m R: -f C:\my_disk.ima -p "/FS:NTFS /C /Y" +rem imdisk -P -a -s 2104515b -m R:-p "/FS:NTFS /C /Y" virtualenv R:\.venv R:\.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed From 378e1cb346ccdbef534ed60339207e93d4842f03 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 11:11:40 -0500 Subject: [PATCH 21/24] larger size Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index 036a9da7..3820199b 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,4 +1,4 @@ -rem imdisk -P -a -s 2104515b -m R:-p "/FS:NTFS /C /Y" +rem imdisk -P -a -s 4804515b -m R:-p "/FS:NTFS /C /Y" virtualenv R:\.venv R:\.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed From de356753e06505bf4de8870ad030a5da5a26d12a Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 11:18:54 -0500 Subject: [PATCH 22/24] report.tap Signed-off-by: Kenneth Reitz --- run-tests.bat | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/run-tests.bat b/run-tests.bat index 3820199b..7c22b36d 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,8 +1,7 @@ -rem imdisk -P -a -s 4804515b -m R:-p "/FS:NTFS /C /Y" +rem imdisk -P -a -s 9604515b -m R:-p "/FS:NTFS /Y" virtualenv R:\.venv R:\.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed R:\.venv\Scripts\pipenv install --dev -SET RAM_DISK=R:&& SET PYPI_VENDOR_DIR=".\tests\pypi\" && R:\.venv\Scripts\pipenv run pytest -n auto -v tests -rem --tap-stream +SET RAM_DISK=R:&& SET PYPI_VENDOR_DIR=".\tests\pypi\" && R:\.venv\Scripts\pipenv run pytest -n auto -v tests --tap-stream > report.tap From d1a13b5843187152dc43e4b010a5c84dd713e4d0 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 11:24:38 -0500 Subject: [PATCH 23/24] next iteration Signed-off-by: Kenneth Reitz --- run-tests.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.bat b/run-tests.bat index 7c22b36d..4ddcee2b 100644 --- a/run-tests.bat +++ b/run-tests.bat @@ -1,4 +1,4 @@ -rem imdisk -P -a -s 9604515b -m R:-p "/FS:NTFS /Y" +rem imdisk -a -s 964515b -m R: -p "/FS:NTFS /Y" virtualenv R:\.venv R:\.venv\Scripts\pip install -e . --upgrade --upgrade-strategy=only-if-needed From 8dff4df737783fd9c9d2c46977f6815d40a579b3 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 6 Mar 2018 11:29:14 -0500 Subject: [PATCH 24/24] empty commit