From c4adebe35cca59a37483630aa026becdd0e19f64 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Sat, 20 Nov 2021 09:57:13 -0500 Subject: [PATCH 1/4] Upgrade filelock dependency to avoid a deprecation warning --- setup.cfg | 2 +- src/virtualenv/util/lock.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 2b48a54b0..f249d63fd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -42,7 +42,7 @@ packages = find: install_requires = backports.entry-points-selectable>=1.0.4 distlib>=0.3.1,<1 - filelock>=3.2,<4 + filelock>=3.4,<4 platformdirs>=2,<3 six>=1.9.0,<2 # keep it >=1.9.0 as it may cause problems on LTS platforms importlib-metadata>=0.12;python_version<"3.8" diff --git a/src/virtualenv/util/lock.py b/src/virtualenv/util/lock.py index e141aafae..555184572 100644 --- a/src/virtualenv/util/lock.py +++ b/src/virtualenv/util/lock.py @@ -25,10 +25,10 @@ def __init__(self, lock_file): self.count = 0 self.thread_safe = RLock() - def acquire(self, timeout=None, poll_intervall=0.05): + def acquire(self, timeout=None, poll_interval=0.05): with self.thread_safe: if self.count == 0: - super(_CountedFileLock, self).acquire(timeout=timeout, poll_intervall=poll_intervall) + super(_CountedFileLock, self).acquire(timeout=timeout, poll_interval=poll_interval) self.count += 1 def release(self, force=False): From 30093071802c22340d7c9261a0e665f732a5cc96 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Sat, 20 Nov 2021 10:07:37 -0500 Subject: [PATCH 2/4] address --- setup.cfg | 2 +- src/virtualenv/util/lock.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index f249d63fd..2b48a54b0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -42,7 +42,7 @@ packages = find: install_requires = backports.entry-points-selectable>=1.0.4 distlib>=0.3.1,<1 - filelock>=3.4,<4 + filelock>=3.2,<4 platformdirs>=2,<3 six>=1.9.0,<2 # keep it >=1.9.0 as it may cause problems on LTS platforms importlib-metadata>=0.12;python_version<"3.8" diff --git a/src/virtualenv/util/lock.py b/src/virtualenv/util/lock.py index 555184572..1cf968b42 100644 --- a/src/virtualenv/util/lock.py +++ b/src/virtualenv/util/lock.py @@ -28,7 +28,7 @@ def __init__(self, lock_file): def acquire(self, timeout=None, poll_interval=0.05): with self.thread_safe: if self.count == 0: - super(_CountedFileLock, self).acquire(timeout=timeout, poll_interval=poll_interval) + super(_CountedFileLock, self).acquire(timeout, poll_interval) self.count += 1 def release(self, force=False): From 66908c1f2fd7dd4522fdceaac5a6afd8134e3d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bern=C3=A1t=20G=C3=A1bor?= Date: Fri, 3 Dec 2021 18:46:42 +0000 Subject: [PATCH 3/4] PR Feedback MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bernát Gábor --- docs/changelog/2237.feature.rst | 1 + setup.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 docs/changelog/2237.feature.rst diff --git a/docs/changelog/2237.feature.rst b/docs/changelog/2237.feature.rst new file mode 100644 index 000000000..6defa64f7 --- /dev/null +++ b/docs/changelog/2237.feature.rst @@ -0,0 +1 @@ +Avoid deprecation warning from py-filelock argument - by :user:`ofek`. diff --git a/setup.cfg b/setup.cfg index 2b48a54b0..f249d63fd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -42,7 +42,7 @@ packages = find: install_requires = backports.entry-points-selectable>=1.0.4 distlib>=0.3.1,<1 - filelock>=3.2,<4 + filelock>=3.4,<4 platformdirs>=2,<3 six>=1.9.0,<2 # keep it >=1.9.0 as it may cause problems on LTS platforms importlib-metadata>=0.12;python_version<"3.8" From a8db7dd3b2f50437617149f76cf8d6da1d58dcc8 Mon Sep 17 00:00:00 2001 From: Ofek Lev Date: Sat, 25 Dec 2021 17:55:46 -0500 Subject: [PATCH 4/4] try reverting dependency bump --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index f249d63fd..2b48a54b0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -42,7 +42,7 @@ packages = find: install_requires = backports.entry-points-selectable>=1.0.4 distlib>=0.3.1,<1 - filelock>=3.4,<4 + filelock>=3.2,<4 platformdirs>=2,<3 six>=1.9.0,<2 # keep it >=1.9.0 as it may cause problems on LTS platforms importlib-metadata>=0.12;python_version<"3.8"