Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid a new deprecation warning from filelock dependency #2237

Merged
merged 5 commits into from
Dec 26, 2021
Merged

Avoid a new deprecation warning from filelock dependency #2237

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c4adebe
Upgrade filelock dependency to avoid a deprecation warning
ofek Nov 20, 2021
3009307
address
ofek Nov 20, 2021
66908c1
PR Feedback
gaborbernat Dec 3, 2021
a8db7dd
try reverting dependency bump
ofek Dec 25, 2021
3e58511
Merge branch 'main' into lock
ofek Dec 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
filelock>=3.4,<4
filelock>=3.2,<4

Leave it as it is. filelock >= 3.4 requires Python >= 3.6:

https://github.com/tox-dev/py-filelock/blob/a6c8fabc4192fa7a4ae19b1875ee842ec5eb4f61/setup.cfg#L34

but virtualenv supports:

virtualenv/setup.cfg

Lines 21 to 29 in 623189a

Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, but then to solve this we would want to have differing version requirements for 3.6+ and earlier; furthermore the code needs to dynamically generate the kwargs, otherwise on older pythons we'd be using kwarg that's not supported.

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"
Expand Down
4 changes: 2 additions & 2 deletions src/virtualenv/util/lock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
ofek marked this conversation as resolved.
Show resolved Hide resolved
self.count += 1

def release(self, force=False):
Expand Down