diff --git a/python-coconut.changes b/python-coconut.changes index d97a8fe..80cd7c3 100644 --- a/python-coconut.changes +++ b/python-coconut.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri May 24 03:06:34 UTC 2019 - Todd R + +- Add conflicts with python2 version since we are dropping + update-alternatives. + +------------------------------------------------------------------- +Wed May 22 14:34:21 UTC 2019 - Todd R + +- Drop python2 support since some of its dependencies have also + dropped python2 support. +- Use new jupyter package names. + ------------------------------------------------------------------- Thu Mar 7 10:52:51 UTC 2019 - Tomáš Chvátal diff --git a/python-coconut.spec b/python-coconut.spec index 98c19f2..c0c1937 100644 --- a/python-coconut.spec +++ b/python-coconut.spec @@ -17,6 +17,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define skip_python2 1 Name: python-coconut Version: 1.4.0 Release: 0 @@ -26,26 +27,23 @@ Group: Development/Languages/Python URL: https://github.com/evhub/coconut Source: https://files.pythonhosted.org/packages/source/c/coconut/coconut-%{version}.tar.gz BuildRequires: %{python_module Pygments >= 2.2} +BuildRequires: %{python_module prompt_toolkit >= 2} BuildRequires: %{python_module pyparsing >= 2.2} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} -# IPython python2 version requires prompt_toolkit 1 while python3 version requires prompt_toolkit 2 BuildRequires: fdupes -BuildRequires: python-prompt_toolkit1 BuildRequires: python-rpm-macros -BuildRequires: python2-futures >= 3.1 -BuildRequires: python3-prompt_toolkit >= 2 # SECTION test requirements BuildRequires: %{python_module cPyparsing >= 2.2.0.1.1} BuildRequires: %{python_module jupyter >= 1} BuildRequires: %{python_module jupyter_console >= 5.2} -BuildRequires: %{python_module jupyter_ipykernel >= 4.6} -BuildRequires: %{python_module jupyter_ipython >= 5.4} +BuildRequires: %{python_module ipykernel >= 4.6} +BuildRequires: %{python_module ipython >= 5.4} +BuildRequires: %{python_module mypy >= 0.540} BuildRequires: %{python_module psutil >= 5} BuildRequires: %{python_module pytest >= 3} BuildRequires: %{python_module requests >= 2} BuildRequires: %{python_module watchdog >= 0.8} -BuildRequires: python3-mypy >= 0.540 # /SECTION Requires: python-Pygments >= 2.2 Requires: python-pyparsing >= 2.2 @@ -53,22 +51,16 @@ Requires: python-six Recommends: python-cPyparsing >= 2.2.0.1.1 Recommends: python-jupyter >= 1 Recommends: python-jupyter_console >= 5.2 -Recommends: python-jupyter_ipykernel >= 4.6 -Recommends: python-jupyter_ipython >= 5.4 +Recommends: python-ipykernel >= 4.6 +Recommends: python-ipython >= 5.4 Recommends: python-mypy >= 0.540 +Requires: python-prompt_toolkit >= 2 Recommends: python-psutil >= 5 Recommends: python-requests >= 2 Recommends: python-watchdog >= 0.8 -%ifpython2 -Requires: python-futures >= 3.1 -Requires: python-prompt_toolkit1 -%endif -%ifpython3 -Requires: python-prompt_toolkit >= 2 -%endif -Requires(post): update-alternatives -Requires(postun): update-alternatives +Conflicts: python2-coconut <= 1.4.0 BuildArch: noarch + %python_subpackages %description @@ -91,23 +83,15 @@ find . -name '*.py' -exec sed -i -e '/^#!\//, 1d' {} + %install %python_install %python_expand %fdupes %{buildroot}/%{$python_sitelib}/ -%python_clone -a %{buildroot}%{_bindir}/coconut - -%post -%python_install_alternative coconut - -%postun -%python_uninstall_alternative coconut %files %{python_files} %doc README.rst CONTRIBUTING.md DOCS.md FAQ.md HELP.md %license LICENSE.txt -%python2_only %{_bindir}/coconut-py2* -%python3_only %{_bindir}/coconut-py3* -%python_alternative %{_bindir}/coconut -%python3_only %{_bindir}/coconut-v1* -%python3_only %{_bindir}/coconut-release* -%python3_only %{_bindir}/coconut-run +%{_bindir}/coconut-py3* +%{_bindir}/coconut +%{_bindir}/coconut-v1* +%{_bindir}/coconut-release* +%{_bindir}/coconut-run %{python_sitelib}/coconut/ %{python_sitelib}/coconut-%{version}-py*.egg-info