From da6752de22fe7a13f60d6be8f58133fd98df7b8f Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sat, 8 Aug 2020 18:58:57 +0200
Subject: [PATCH] pipenv+poetry: downgrade virtualenv to 20.0.23

https://github.com/pypa/virtualenv/issues/1873
---
 Pipfile        |  1 +
 Pipfile.lock   | 10 +++++-----
 poetry.lock    | 14 +++++++-------
 pyproject.toml |  1 +
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Pipfile b/Pipfile
index 379606f8f..ed9e35d45 100644
--- a/Pipfile
+++ b/Pipfile
@@ -11,6 +11,7 @@ protobuf = "*"
 pyblake2 = "*"
 Pyro4 = "*"
 nanopb = "==0.4.1"
+virtualenv = "==20.0.23"  # https://github.com/pypa/virtualenv/issues/1873
 
 ## test tools
 pytest = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index bafefd524..919c45ed9 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "b09be24bfd2f575e68391f29b876db4d30416eb31c515558d8c55114ee04449b"
+            "sha256": "85ac903f108b7b84fa6d3dbfd62d0ce2c0a160f58e97e8dbeb989ddbfdce11b1"
         },
         "pipfile-spec": 6,
         "requires": {},
@@ -786,11 +786,11 @@
         },
         "virtualenv": {
             "hashes": [
-                "sha256:7b54fd606a1b85f83de49ad8d80dbec08e983a2d2f96685045b262ebc7481ee5",
-                "sha256:8cd7b2a4850b003a11be2fc213e206419efab41115cc14bca20e69654f2ac08e"
+                "sha256:5102fbf1ec57e80671ef40ed98a84e980a71194cedf30c87c2b25c3a9e0b0107",
+                "sha256:ccfb8e1e05a1174f7bd4c163700277ba730496094fe1a58bea9d4ac140a207c8"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==20.0.30"
+            "index": "pypi",
+            "version": "==20.0.23"
         }
     },
     "develop": {
diff --git a/poetry.lock b/poetry.lock
index 21bb50fec..b3b00261c 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -884,11 +884,11 @@ description = "Virtual Python Environment builder"
 name = "virtualenv"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
-version = "20.0.30"
+version = "20.0.23"
 
 [package.dependencies]
 appdirs = ">=1.4.3,<2"
-distlib = ">=0.3.1,<1"
+distlib = ">=0.3.0,<1"
 filelock = ">=3.0.0,<4"
 six = ">=1.9.0,<2"
 
@@ -901,8 +901,8 @@ python = "<3.7"
 version = ">=1.0"
 
 [package.extras]
-docs = ["proselint (>=0.10.2)", "sphinx (>=3)", "sphinx-argparse (>=0.2.5)", "sphinx-rtd-theme (>=0.4.3)", "towncrier (>=19.9.0rc1)"]
-testing = ["coverage (>=5)", "coverage-enable-subprocess (>=1)", "flaky (>=3)", "pytest (>=4)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.1)", "pytest-mock (>=2)", "pytest-randomly (>=1)", "pytest-timeout (>=1)", "pytest-xdist (>=1.31.0)", "packaging (>=20.0)", "xonsh (>=0.9.16)"]
+docs = ["sphinx (>=3)", "sphinx-argparse (>=0.2.5)", "sphinx-rtd-theme (>=0.4.3)", "towncrier (>=19.9.0rc1)", "proselint (>=0.10.2)"]
+testing = ["pytest (>=4)", "coverage (>=5)", "coverage-enable-subprocess (>=1)", "pytest-xdist (>=1.31.0)", "pytest-mock (>=2)", "pytest-env (>=0.6.2)", "pytest-randomly (>=1)", "pytest-timeout (>=1)", "flaky (>=3)", "packaging (>=20.0)", "xonsh (>=0.9.16)"]
 
 [[package]]
 category = "main"
@@ -918,7 +918,7 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"]
 testing = ["jaraco.itertools", "func-timeout"]
 
 [metadata]
-content-hash = "125a799df9a42d234835f0d7f188e08590fbdb4fef854d4e5489e1c728ef8f25"
+content-hash = "9591974eb5f36198da1009eed68fcb9ded62f7590c29152cb9fd4b2da78b9d54"
 lock-version = "1.0"
 python-versions = "^3.6"
 
@@ -1441,8 +1441,8 @@ urllib3 = [
     {file = "urllib3-1.25.10.tar.gz", hash = "sha256:91056c15fa70756691db97756772bb1eb9678fa585d9184f24534b100dc60f4a"},
 ]
 virtualenv = [
-    {file = "virtualenv-20.0.30-py2.py3-none-any.whl", hash = "sha256:8cd7b2a4850b003a11be2fc213e206419efab41115cc14bca20e69654f2ac08e"},
-    {file = "virtualenv-20.0.30.tar.gz", hash = "sha256:7b54fd606a1b85f83de49ad8d80dbec08e983a2d2f96685045b262ebc7481ee5"},
+    {file = "virtualenv-20.0.23-py2.py3-none-any.whl", hash = "sha256:ccfb8e1e05a1174f7bd4c163700277ba730496094fe1a58bea9d4ac140a207c8"},
+    {file = "virtualenv-20.0.23.tar.gz", hash = "sha256:5102fbf1ec57e80671ef40ed98a84e980a71194cedf30c87c2b25c3a9e0b0107"},
 ]
 zipp = [
     {file = "zipp-3.1.0-py3-none-any.whl", hash = "sha256:aa36550ff0c0b7ef7fa639055d797116ee891440eac1a56f378e2d3179e0320b"},
diff --git a/pyproject.toml b/pyproject.toml
index 30cd90218..c8538fbcd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,6 +12,7 @@ scons = "*"
 protobuf = "*"
 Pyro4 = "*"
 nanopb = "0.4.1"
+virtualenv = "20.0.23"  # https://github.com/pypa/virtualenv/issues/1873
 
 ## test tools
 pytest = "*"