diff --git a/.gitignore b/.gitignore index f933456..fb4a1c0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /stem-1.5.3.tar.gz /stem-1.5.4.tar.gz /stem-1.6.0.tar.gz +/stem-1.7.0.tar.gz diff --git a/python-3.7-6c677b6a4080d14a56d2d88ab2ddd9766cc60b9a.patch b/python-3.7-6c677b6a4080d14a56d2d88ab2ddd9766cc60b9a.patch deleted file mode 100644 index a623086..0000000 --- a/python-3.7-6c677b6a4080d14a56d2d88ab2ddd9766cc60b9a.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6c677b6a4080d14a56d2d88ab2ddd9766cc60b9a Mon Sep 17 00:00:00 2001 -From: Damian Johnson -Date: Wed, 11 Jul 2018 09:05:32 -0700 -Subject: 'async' SyntaxError with python 3.6 and above - -Python 3.6 adds a couple new keywords to the language (async and await) so we -need to be careful not to use those. 99.9% of our users don't import our test -utils so this was mostly moot, but Juan ran into an issue packaging Stem for -Fedora... - - BUILDSTDERR: File "/usr/lib/python3.7/site-packages/stem/util/test_tools.py", line 151 - BUILDSTDERR: self.method.async = self - BUILDSTDERR: ^ - BUILDSTDERR: SyntaxError: invalid syntax - - https://trac.torproject.org/projects/tor/ticket/26739 - -This line aimed to provide a way for tests to reference its AsyncTest instance. -This doesn't look to actually be used in practice so think we can simply drop -it. Checked with grep and a 'run_tests.py --all --target ONLINE' run. ---- - docs/change_log.rst | 1 + - stem/util/test_tools.py | 1 - - 2 files changed, 1 insertion(+), 1 deletion(-) - -diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py -index 722398d..c757320 100644 ---- a/stem/util/test_tools.py -+++ b/stem/util/test_tools.py -@@ -148,7 +148,6 @@ class AsyncTest(object): - self._threaded = threaded - - self.method = lambda test: self.result(test) # method that can be mixed into TestCases -- self.method.async = self - - self._process = None - self._process_pipe = None --- -cgit v1.1 - diff --git a/python-stem.spec b/python-stem.spec index 73973f7..f99aa94 100644 --- a/python-stem.spec +++ b/python-stem.spec @@ -8,8 +8,8 @@ From a technical standpoint, Stem is a Python implementation of Tor's\ directory and control specifications. Name: python-stem -Version: 1.6.0 -Release: 5%{?dist} +Version: 1.7.0 +Release: 1%{?dist} Summary: Python controller library for Tor # All source code is LGPLv3 except stem/util/ordereddict.py which is MIT License: LGPLv3 and MIT @@ -17,34 +17,19 @@ URL: https://stem.torproject.org/ Source0: https://files.pythonhosted.org/packages/source/s/%{srcname}/%{srcname}-%{version}.tar.gz # https://www.torproject.org/docs/signing-keys.html.en Source1: https://files.pythonhosted.org/packages/source/s/%{srcname}/%{srcname}-%{version}.tar.gz.asc -# adapted from https://gitweb.torproject.org/stem.git/patch/?id=6c677b6a4080d14a56d2d88ab2ddd9766cc60b9a -Patch0: python-3.7-6c677b6a4080d14a56d2d88ab2ddd9766cc60b9a.patch BuildArch: noarch -BuildRequires: python2-devel BuildRequires: python3-devel # Doc building -BuildRequires: python2-sphinx -# Test disabled -#BuildRequires: python2-mock -#BuildRequires: python2-crypto -#BuildRequires: python2-pytest-flakes -#BuildRequires: python2-pytest-pep8 -#BuildRequires: python3-sphinx -#BuildRequires: python3-mock -#BuildRequires: python3-crypto -#BuildRequires: python3-pytest-flakes -#BuildRequires: python3-pytest-pep8 +BuildRequires: python3-sphinx +# Testing +BuildRequires: python3-mock +BuildRequires: python3-crypto +BuildRequires: python3-pytest-flakes +BuildRequires: python3-pytest-pep8 %description %_description -%package -n python2-%{srcname} -Summary: %{summary} -%{?python_provide:%python_provide python2-%{srcname}} -Suggests: %{name}-doc = %{version}-%{release} - -%description -n python2-%{srcname} %_description - %package -n python3-%{srcname} Summary: %{summary} %{?python_provide:%python_provide python3-%{srcname}} @@ -58,10 +43,9 @@ Summary: %{summary} %description doc %_description %prep -%autosetup -p1 -n %{srcname}-%{version} +%autosetup -n %{srcname}-%{version} %build -%py2_build %py3_build pushd docs %make_build html @@ -70,21 +54,13 @@ pushd docs popd %install -%py2_install %py3_install sed -e 's,^#!/usr/bin/python2$,#!/usr/bin/python3,' -i %{buildroot}%{_bindir}/tor-prompt find docs/_build -name .buildinfo -delete install -D -m 0644 docs/_build/man/%{srcname}.1 %{buildroot}%{_mandir}/man1/%{srcname}.1 %check -# Tests disabled for now -#%%{__python2} run_tests.py --unit -#%%{__python3} run_tests.py --unit - -%files -n python2-%{srcname} -%license LICENSE -%{python2_sitelib}/%{srcname} -%{python2_sitelib}/%{srcname}-*.egg-info +%{__python3} run_tests.py --unit %files -n python3-%{srcname} %license LICENSE @@ -93,11 +69,17 @@ install -D -m 0644 docs/_build/man/%{srcname}.1 %{buildroot}%{_mandir}/man1/%{sr %{python3_sitelib}/%{srcname}-*.egg-info %files doc -%doc docs/_build/html docs/_build/text +%doc README.md docs/_build/html docs/_build/text %license LICENSE %{_mandir}/man1/%{srcname}.1* %changelog +* Wed Oct 10 2018 Juan Orti Alcaine - 1.7.0-1 +- Version 1.7.0 +- Drop python2 subpackage +- Drop patch merged upstream +- Enable tests + * Tue Jul 17 2018 mh - 1.6.0-5 - Make it build on python 3.7 diff --git a/sources b/sources index 1a5799c..1037651 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (stem-1.6.0.tar.gz) = 499a15b1cbd12d75865c93e253e797507564d5b5f2a9a0f021107d89c85db040e050944a9ac69b629f74e265d350467bef9d36ec52f7ef2e6a97180a7b93e94c +SHA512 (stem-1.7.0.tar.gz) = 10750266860f4f90df5d4a3bf24ec68e28d12c84c136c35d2f168f767f4facae3d02cc62dc972a08666689695ea17337a7a6b80ec1c5ed8b9e5035d7417b07f5 diff --git a/stem-1.6.0.tar.gz.asc b/stem-1.6.0.tar.gz.asc deleted file mode 100644 index 4bfb3fd..0000000 --- a/stem-1.6.0.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iQEcBAABAgAGBQJZ/3n3AAoJEIiEBMGH8waQUsYH/A1V6S4gRW/OgFadA+2nWpA2 -HsEEjEpHgHtRnaO4Ont76jIFvOInOJrGH8wYiScpHf+SFfvKTqjV6/Xi1rhkolKk -L6j/bTtK+Yp+W3SOZ6fxA/5a0M9sM9ZelB4wuKJSK8/CdXuqdBkgwsxLjtQfYhcV -6/wKLpyzZXbHHq4/t611Ehj9Z39g2QWTJu9O+J9t2QItOydLhH96TwCzA7+MV0UZ -TygaynLgOwvYuEsmr8JCoeXQULeYuNywkaKggDbQsoi4rZZKw+HiH/WisWekmAlh -Tm1BkoO8pqfFk1oEDv97cSy9Fb5+bOH5dk4QSExstaZy6ywTHenSVfAEbgvq0T0= -=0IWk ------END PGP SIGNATURE----- diff --git a/stem-1.7.0.tar.gz.asc b/stem-1.7.0.tar.gz.asc new file mode 100644 index 0000000..f163442 --- /dev/null +++ b/stem-1.7.0.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABAgAGBQJbupRkAAoJEIiEBMGH8waQ4hIH/AhFtZxd0fSlKrStNviKJ1Et +7wsqMKbxA3w6xAMIQ+uE6052BjEc2jHMoc5vE1xzL7CYW5WP2+3YVyfmiAqpsfqR ++wL6yv2x2tZWXQ411pr513DZjryiSKSeEnNS+77fdHIKVV10SqC3zbDDBAYXpll7 +nU00s+jA5dCBWpPPPlurpIfQa9hjJGYtGodPD5XhSs5ArXqWFFuQPG3rC1pYa9HE +fCHmVYlyggjMyuovA00w1vh/o8esRWrHXzx1eWP8NbvMsfaQmSoL95zfiW47WGFb +ikvwBs+KEn4tBjqiEiSuFA9fLONYXKErT84MbBsIh/9FWUKuZ57453KrhMH+nzA= +=OyS1 +-----END PGP SIGNATURE-----