Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-certbot-apache for
openSUSE:Factory checked in at 2021-03-10 08:56:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-certbot-apache (Old)
and /work/SRC/openSUSE:Factory/.python-certbot-apache.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-certbot-apache"
Wed Mar 10 08:56:33 2021 rev:25 rq:877738 version:1.13.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-certbot-apache/python-certbot-apache.changes
2021-01-08 17:40:19.253028732 +0100
+++
/work/SRC/openSUSE:Factory/.python-certbot-apache.new.2378/python-certbot-apache.changes
2021-03-10 08:58:14.954950540 +0100
@@ -1,0 +2,7 @@
+Mon Mar 8 08:36:44 UTC 2021 - Mark??ta Machov?? <mmach...@suse.com>
+
+- update to version 1.13.0
+ * Support for Python 2 has been removed.
+ * Drop merged patch 0001-Change-the-SUSE-override-to-use-apachectl.patch
+
+-------------------------------------------------------------------
Old:
----
0001-Change-the-SUSE-override-to-use-apachectl.patch
certbot-apache-1.11.0.tar.gz
New:
----
certbot-apache-1.13.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-certbot-apache.spec ++++++
--- /var/tmp/diff_new_pack.85YYNC/_old 2021-03-10 08:58:15.550951155 +0100
+++ /var/tmp/diff_new_pack.85YYNC/_new 2021-03-10 08:58:15.550951155 +0100
@@ -17,15 +17,14 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define skip_python2 1
Name: python-certbot-apache
-Version: 1.11.0
+Version: 1.13.0
Release: 0
Summary: Apache plugin for Certbot
License: Apache-2.0
URL: https://github.com/letsencrypt/letsencrypt
Source:
https://files.pythonhosted.org/packages/source/c/certbot-apache/certbot-apache-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM alarr...@suse.com - gh#certbot/certbot#8592
-Patch0: 0001-Change-the-SUSE-override-to-use-apachectl.patch
BuildRequires: %{python_module augeas}
BuildRequires: %{python_module certbot >= 1.1.0}
BuildRequires: %{python_module pytest}
@@ -49,7 +48,6 @@
%prep
%setup -q -n certbot-apache-%{version}
-%patch0 -p2
%build
%python_build
++++++ certbot-apache-1.11.0.tar.gz -> certbot-apache-1.13.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.11.0/PKG-INFO
new/certbot-apache-1.13.0/PKG-INFO
--- old/certbot-apache-1.11.0/PKG-INFO 2021-01-05 18:37:15.553189300 +0100
+++ new/certbot-apache-1.13.0/PKG-INFO 2021-03-02 22:37:20.276273500 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: certbot-apache
-Version: 1.11.0
+Version: 1.13.0
Summary: Apache plugin for Certbot
Home-page: https://github.com/letsencrypt/letsencrypt
Author: Certbot Project
@@ -14,8 +14,6 @@
Classifier: License :: OSI Approved :: Apache Software License
Classifier: Operating System :: POSIX :: Linux
Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
@@ -27,5 +25,5 @@
Classifier: Topic :: System :: Networking
Classifier: Topic :: System :: Systems Administration
Classifier: Topic :: Utilities
-Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*
+Requires-Python: >=3.6
Provides-Extra: dev
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.11.0/certbot_apache/_internal/dualparser.py
new/certbot-apache-1.13.0/certbot_apache/_internal/dualparser.py
--- old/certbot-apache-1.11.0/certbot_apache/_internal/dualparser.py
2021-01-05 18:37:05.000000000 +0100
+++ new/certbot-apache-1.13.0/certbot_apache/_internal/dualparser.py
2021-03-02 22:37:04.000000000 +0100
@@ -4,7 +4,7 @@
from certbot_apache._internal import apacheparser
-class DualNodeBase(object):
+class DualNodeBase:
""" Dual parser interface for in development testing. This is used as the
base class for dual parser interface classes. This class handles runtime
attribute value assertions."""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.11.0/certbot_apache/_internal/interfaces.py
new/certbot-apache-1.13.0/certbot_apache/_internal/interfaces.py
--- old/certbot-apache-1.11.0/certbot_apache/_internal/interfaces.py
2021-01-05 18:37:05.000000000 +0100
+++ new/certbot-apache-1.13.0/certbot_apache/_internal/interfaces.py
2021-03-02 22:37:04.000000000 +0100
@@ -100,12 +100,10 @@
"""
import abc
-import six
-@six.add_metaclass(abc.ABCMeta)
-class ParserNode(object):
+class ParserNode(object, metaclass=abc.ABCMeta):
"""
ParserNode is the basic building block of the tree of such nodes,
representing the structure of the configuration. It is largely meant to
keep
@@ -204,9 +202,7 @@
"""
-# Linter rule exclusion done because of
https://github.com/PyCQA/pylint/issues/179
-@six.add_metaclass(abc.ABCMeta) # pylint: disable=abstract-method
-class CommentNode(ParserNode):
+class CommentNode(ParserNode, metaclass=abc.ABCMeta):
"""
CommentNode class is used for representation of comments within the parsed
configuration structure. Because of the nature of comments, it is not able
@@ -249,8 +245,7 @@
metadata=kwargs.get('metadata', {}))
# pragma: no cover
-@six.add_metaclass(abc.ABCMeta)
-class DirectiveNode(ParserNode):
+class DirectiveNode(ParserNode, metaclass=abc.ABCMeta):
"""
DirectiveNode class represents a configuration directive within the
configuration.
It can have zero or more parameters attached to it. Because of the nature
of
@@ -325,8 +320,7 @@
"""
-@six.add_metaclass(abc.ABCMeta)
-class BlockNode(DirectiveNode):
+class BlockNode(DirectiveNode, metaclass=abc.ABCMeta):
"""
BlockNode class represents a block of nested configuration directives,
comments
and other blocks as its children. A BlockNode can have zero or more
parameters
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.11.0/certbot_apache/_internal/obj.py
new/certbot-apache-1.13.0/certbot_apache/_internal/obj.py
--- old/certbot-apache-1.11.0/certbot_apache/_internal/obj.py 2021-01-05
18:37:05.000000000 +0100
+++ new/certbot-apache-1.13.0/certbot_apache/_internal/obj.py 2021-03-02
22:37:04.000000000 +0100
@@ -20,9 +20,6 @@
self.is_wildcard() and other.is_wildcard()))
return False
- def __ne__(self, other):
- return not self.__eq__(other)
-
def __repr__(self):
return "certbot_apache._internal.obj.Addr(" + repr(self.tup) + ")"
@@ -98,7 +95,7 @@
return self.get_addr_obj(port)
-class VirtualHost(object):
+class VirtualHost:
"""Represents an Apache Virtualhost.
:ivar str filep: file path of VH
@@ -191,9 +188,6 @@
return False
- def __ne__(self, other):
- return not self.__eq__(other)
-
def __hash__(self):
return hash((self.filep, self.path,
tuple(self.addrs), tuple(self.get_names()),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.11.0/certbot_apache/_internal/override_suse.py
new/certbot-apache-1.13.0/certbot_apache/_internal/override_suse.py
--- old/certbot-apache-1.11.0/certbot_apache/_internal/override_suse.py
2021-01-05 18:37:05.000000000 +0100
+++ new/certbot-apache-1.13.0/certbot_apache/_internal/override_suse.py
2021-03-02 22:37:04.000000000 +0100
@@ -14,10 +14,10 @@
vhost_root="/etc/apache2/vhosts.d",
vhost_files="*.conf",
logs_root="/var/log/apache2",
- ctl="apache2ctl",
- version_cmd=['apache2ctl', '-v'],
- restart_cmd=['apache2ctl', 'graceful'],
- conftest_cmd=['apache2ctl', 'configtest'],
+ ctl="apachectl",
+ version_cmd=['apachectl', '-v'],
+ restart_cmd=['apachectl', 'graceful'],
+ conftest_cmd=['apachectl', 'configtest'],
enmod="a2enmod",
dismod="a2dismod",
le_vhost_ext="-le-ssl.conf",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.11.0/certbot_apache/_internal/parser.py
new/certbot-apache-1.13.0/certbot_apache/_internal/parser.py
--- old/certbot-apache-1.11.0/certbot_apache/_internal/parser.py
2021-01-05 18:37:05.000000000 +0100
+++ new/certbot-apache-1.13.0/certbot_apache/_internal/parser.py
2021-03-02 22:37:04.000000000 +0100
@@ -5,7 +5,6 @@
import re
import sys
-import six
from acme.magic_typing import Dict
from acme.magic_typing import List
@@ -17,7 +16,7 @@
logger = logging.getLogger(__name__)
-class ApacheParser(object):
+class ApacheParser:
"""Class handles the fine details of parsing the Apache Configuration.
.. todo:: Make parsing general... remove sites-available etc...
@@ -275,7 +274,7 @@
while len(mods) != prev_size:
prev_size = len(mods)
- for match_name, match_filename in six.moves.zip(
+ for match_name, match_filename in zip(
iterator, iterator):
mod_name = self.get_arg(match_name)
mod_filename = self.get_arg(match_filename)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.11.0/certbot_apache.egg-info/PKG-INFO
new/certbot-apache-1.13.0/certbot_apache.egg-info/PKG-INFO
--- old/certbot-apache-1.11.0/certbot_apache.egg-info/PKG-INFO 2021-01-05
18:37:15.000000000 +0100
+++ new/certbot-apache-1.13.0/certbot_apache.egg-info/PKG-INFO 2021-03-02
22:37:20.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: certbot-apache
-Version: 1.11.0
+Version: 1.13.0
Summary: Apache plugin for Certbot
Home-page: https://github.com/letsencrypt/letsencrypt
Author: Certbot Project
@@ -14,8 +14,6 @@
Classifier: License :: OSI Approved :: Apache Software License
Classifier: Operating System :: POSIX :: Linux
Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
@@ -27,5 +25,5 @@
Classifier: Topic :: System :: Networking
Classifier: Topic :: System :: Systems Administration
Classifier: Topic :: Utilities
-Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*
+Requires-Python: >=3.6
Provides-Extra: dev
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.11.0/certbot_apache.egg-info/requires.txt
new/certbot-apache-1.13.0/certbot_apache.egg-info/requires.txt
--- old/certbot-apache-1.11.0/certbot_apache.egg-info/requires.txt
2021-01-05 18:37:15.000000000 +0100
+++ new/certbot-apache-1.13.0/certbot_apache.egg-info/requires.txt
2021-03-02 22:37:20.000000000 +0100
@@ -1,12 +1,9 @@
acme>=0.29.0
certbot>=1.6.0
python-augeas
-setuptools
+setuptools>=39.0.1
zope.component
zope.interface
-[:python_version < "3.3"]
-mock
-
[dev]
apacheconfig>=0.3.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.11.0/setup.py
new/certbot-apache-1.13.0/setup.py
--- old/certbot-apache-1.11.0/setup.py 2021-01-05 18:37:06.000000000 +0100
+++ new/certbot-apache-1.13.0/setup.py 2021-03-02 22:37:05.000000000 +0100
@@ -1,11 +1,7 @@
-from distutils.version import LooseVersion
-import sys
-
-from setuptools import __version__ as setuptools_version
from setuptools import find_packages
from setuptools import setup
-version = '1.11.0'
+version = '1.13.0'
# Remember to update local-oldest-requirements.txt when changing the minimum
# acme/certbot version.
@@ -13,20 +9,11 @@
'acme>=0.29.0',
'certbot>=1.6.0',
'python-augeas',
- 'setuptools',
+ 'setuptools>=39.0.1',
'zope.component',
'zope.interface',
]
-setuptools_known_environment_markers = (LooseVersion(setuptools_version) >=
LooseVersion('36.2'))
-if setuptools_known_environment_markers:
- install_requires.append('mock ; python_version < "3.3"')
-elif 'bdist_wheel' in sys.argv[1:]:
- raise RuntimeError('Error, you are trying to build certbot wheels using an
old version '
- 'of setuptools. Version 36.2+ of setuptools is
required.')
-elif sys.version_info < (3,3):
- install_requires.append('mock')
-
dev_extras = [
'apacheconfig>=0.3.2',
]
@@ -39,7 +26,7 @@
author="Certbot Project",
author_email='client-...@letsencrypt.org',
license='Apache License 2.0',
- python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*,
!=3.5.*',
+ python_requires='>=3.6',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
@@ -47,8 +34,6 @@
'License :: OSI Approved :: Apache Software License',
'Operating System :: POSIX :: Linux',
'Programming Language :: Python',
- 'Programming Language :: Python :: 2',
- 'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.11.0/tests/autohsts_test.py
new/certbot-apache-1.13.0/tests/autohsts_test.py
--- old/certbot-apache-1.11.0/tests/autohsts_test.py 2021-01-05
18:37:05.000000000 +0100
+++ new/certbot-apache-1.13.0/tests/autohsts_test.py 2021-03-02
22:37:04.000000000 +0100
@@ -7,7 +7,6 @@
import mock
except ImportError: # pragma: no cover
from unittest import mock # type: ignore
-import six # pylint: disable=unused-import # six is used in mock.patch()
from certbot import errors
from certbot_apache._internal import constants
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.11.0/tests/configurator_test.py
new/certbot-apache-1.13.0/tests/configurator_test.py
--- old/certbot-apache-1.11.0/tests/configurator_test.py 2021-01-05
18:37:05.000000000 +0100
+++ new/certbot-apache-1.13.0/tests/configurator_test.py 2021-03-02
22:37:04.000000000 +0100
@@ -10,7 +10,6 @@
import mock
except ImportError: # pragma: no cover
from unittest import mock # type: ignore
-import six # pylint: disable=unused-import # six is used in mock.patch()
from acme import challenges
from certbot import achallenges
@@ -726,7 +725,7 @@
# This calls open
self.config.reverter.register_file_creation = mock.Mock()
mock_open.side_effect = IOError
- with mock.patch("six.moves.builtins.open", mock_open):
+ with mock.patch("builtins.open", mock_open):
self.assertRaises(
errors.PluginError,
self.config.make_vhost_ssl, self.vh_truth[0])
@@ -1834,7 +1833,7 @@
def test_open_module_file(self):
mock_open = mock.mock_open(read_data="testing 12 3")
- with mock.patch("six.moves.builtins.open", mock_open):
+ with mock.patch("builtins.open", mock_open):
self.assertEqual(self.config._open_module_file("/nonsense/"),
"testing 12 3")
if __name__ == "__main__":
