Skip to content

FIX: add setuptools to rpc venv #2035

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

FIX: add setuptools to rpc venv #2035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3d2085
FIX: add setuptools to rpc venv
tacaswell Nov 24, 2023
213a26a
FIX: move away from distutils
tacaswell Nov 5, 2024
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 elpy-rpc.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ needed packages from `elpy-rpc--get-package-list'."
(let ((rpc-python-version (elpy-rpc--get-python-version)))
(if (version< rpc-python-version "3.6.0")
'("jedi" "flake8" "autopep8" "yapf")
'("jedi" "flake8" "autopep8" "yapf" "black"))))
'("jedi" "flake8" "autopep8" "yapf" "black" "setuptools"))))

(defun elpy-rpc--get-python-version ()
"Return the RPC python version."
Expand Down
4 changes: 2 additions & 2 deletions elpy.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ warnings.filterwarnings('ignore', category=FutureWarning)
warnings.filterwarnings('ignore', category=DeprecationWarning)
warnings.filterwarnings('ignore', category=PendingDeprecationWarning)

from distutils.version import LooseVersion
from packaging.version import parse

try:
import urllib2 as urllib
Expand All @@ -663,7 +663,7 @@ def latest(package, version=None):
response = urllib.urlopen('https://pypi.org/pypi/{package}/json'.format(package=package),
timeout=2).read()
latest = json.loads(response)['info']['version']
if version is None or LooseVersion(version) < LooseVersion(latest):
if version is None or parse(version) < parse(latest):
return latest
else:
return None
Expand Down