Hello community, here is the log from the commit of package python-python-language-server for openSUSE:Factory checked in at 2020-03-20 23:54:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-python-language-server (Old) and /work/SRC/openSUSE:Factory/.python-python-language-server.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-python-language-server" Fri Mar 20 23:54:26 2020 rev:4 rq:786447 version:0.31.8 Changes: -------- --- /work/SRC/openSUSE:Factory/python-python-language-server/python-python-language-server.changes 2020-02-28 15:21:32.429917456 +0100 +++ /work/SRC/openSUSE:Factory/.python-python-language-server.new.3160/python-python-language-server.changes 2020-03-20 23:54:28.604834751 +0100 @@ -1,0 +2,12 @@ +Thu Mar 19 11:59:41 UTC 2020 - Matej Cepl <mc...@suse.com> + +- Add use_newer_ujson.patch which removes non-sensical negative + conditions on used packages allowing using system packages + for ujson and jedi. + +------------------------------------------------------------------- +Sun Mar 15 20:35:03 UTC 2020 - Benjamin Greiner <c...@bnavigator.de> + +- make python2 conditional + +------------------------------------------------------------------- New: ---- use_newer_ujson.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-python-language-server.spec ++++++ --- /var/tmp/diff_new_pack.UmuD7q/_old 2020-03-20 23:54:30.396835887 +0100 +++ /var/tmp/diff_new_pack.UmuD7q/_new 2020-03-20 23:54:30.400835889 +0100 @@ -17,6 +17,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%bcond_without python2 Name: python-python-language-server Version: 0.31.8 Release: 0 @@ -25,6 +26,9 @@ Group: Development/Languages/Python URL: https://github.com/palantir/python-language-server Source: https://files.pythonhosted.org/packages/source/p/python-language-server/python-language-server-%{version}.tar.gz +# PATCH-FIX-OPENSUSE use_newer_ujson.patch mc...@suse.com +# Use system python3-ujson without regards which version it is +Patch0: use_newer_ujson.patch BuildRequires: %{python_module PyQt5} BuildRequires: %{python_module autopep8} BuildRequires: %{python_module flake8} @@ -61,8 +65,10 @@ BuildRequires: %{python_module pluggy} BuildRequires: %{python_module pytest} BuildRequires: %{python_module python-jsonrpc-server >= 0.3.2} +%if %{with python2} BuildRequires: python2-backports.functools_lru_cache BuildRequires: python2-configparser +%endif # /SECTION %ifpython2 Requires: python2-backports.functools_lru_cache @@ -74,7 +80,7 @@ %description Python Language Server for the Language Server Protocol. -If the respective dependencies are found, the following optional providers +If the respective recommended packages are installed, the following optional providers will be enabled: - Rope for Completions and renaming @@ -87,6 +93,7 @@ %prep %setup -q -n python-language-server-%{version} +%autopatch -p1 %build %python_build @@ -100,8 +107,10 @@ # # Remove pytest addopts # rm setup.cfg # # One test failure on Leap 15.1 due to different pylint version -# SKIP_TESTS='test_syntax_error_pylint_py3' -# %%pytest -k "not $SKIP_TESTS" +# %%if 0%{?sle_version} == 150100 && 0%{?is_opensuse} +# %%define skip_tests -k not 'test_syntax_error_pylint_py3' +# %%endif +# %%pytest %{?skip_tests} %files %{python_files} %doc README.rst ++++++ use_newer_ujson.patch ++++++ --- a/setup.py +++ b/setup.py @@ -35,10 +35,10 @@ setup( 'configparser; python_version<"3.0"', 'future>=0.14.0; python_version<"3"', 'backports.functools_lru_cache; python_version<"3.2"', - 'jedi>=0.14.1,<0.16', + 'jedi', 'python-jsonrpc-server>=0.3.2', 'pluggy', - 'ujson<=1.35; platform_system!="Windows"' + 'ujson' ], # List additional groups of dependencies here (e.g. development --- a/python_language_server.egg-info/requires.txt +++ b/python_language_server.egg-info/requires.txt @@ -3,7 +3,7 @@ python-jsonrpc-server>=0.3.2 pluggy [:platform_system != "Windows"] -ujson<=1.35 +ujson [:python_version < "3"] future>=0.14.0