Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-certbot-nginx for
openSUSE:Factory checked in at 2021-08-11 11:47:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-certbot-nginx (Old)
and /work/SRC/openSUSE:Factory/.python-certbot-nginx.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-certbot-nginx"
Wed Aug 11 11:47:40 2021 rev:30 rq:911371 version:1.18.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-certbot-nginx/python-certbot-nginx.changes
2021-07-30 23:22:44.851598783 +0200
+++
/work/SRC/openSUSE:Factory/.python-certbot-nginx.new.1899/python-certbot-nginx.changes
2021-08-11 11:49:33.841577129 +0200
@@ -1,0 +2,6 @@
+Tue Aug 10 14:42:52 UTC 2021 - Danilo Spinella <[email protected]>
+
+- update to version 1.18.0
+ * sync with the main certbot package
+
+-------------------------------------------------------------------
Old:
----
certbot-nginx-1.17.0.tar.gz
New:
----
certbot-nginx-1.18.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-certbot-nginx.spec ++++++
--- /var/tmp/diff_new_pack.p9aZ75/_old 2021-08-11 11:49:34.217576676 +0200
+++ /var/tmp/diff_new_pack.p9aZ75/_new 2021-08-11 11:49:34.217576676 +0200
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-certbot-nginx
-Version: 1.17.0
+Version: 1.18.0
Release: 0
Summary: Nginx plugin for Certbot
License: Apache-2.0
@@ -27,7 +27,7 @@
Source:
https://files.pythonhosted.org/packages/source/c/certbot-nginx/certbot-nginx-%{version}.tar.gz
BuildRequires: %{python_module certbot >= %{version}}
BuildRequires: %{python_module pyOpenSSL}
-BuildRequires: %{python_module pyparsing >= 1.5.5}
+BuildRequires: %{python_module pyparsing >= 2.2.0}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -37,7 +37,7 @@
Requires: python-acme >= %{version}
Requires: python-certbot >= %{version}
Requires: python-pyOpenSSL
-Requires: python-pyparsing >= 1.5.5
+Requires: python-pyparsing >= 2.2.0
Requires: python-zope.interface
BuildArch: noarch
%python_subpackages
++++++ certbot-nginx-1.17.0.tar.gz -> certbot-nginx-1.18.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.17.0/PKG-INFO
new/certbot-nginx-1.18.0/PKG-INFO
--- old/certbot-nginx-1.17.0/PKG-INFO 2021-07-06 17:41:29.002795500 +0200
+++ new/certbot-nginx-1.18.0/PKG-INFO 2021-08-03 22:14:35.720396500 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: certbot-nginx
-Version: 1.17.0
+Version: 1.18.0
Summary: Nginx plugin for Certbot
Home-page: https://github.com/letsencrypt/letsencrypt
Author: Certbot Project
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-nginx-1.17.0/certbot_nginx/_internal/configurator.py
new/certbot-nginx-1.18.0/certbot_nginx/_internal/configurator.py
--- old/certbot-nginx-1.17.0/certbot_nginx/_internal/configurator.py
2021-07-06 17:41:16.000000000 +0200
+++ new/certbot-nginx-1.18.0/certbot_nginx/_internal/configurator.py
2021-08-03 22:12:58.000000000 +0200
@@ -16,7 +16,6 @@
import OpenSSL
import pkg_resources
-import zope.interface
from acme import challenges
from acme import crypto_util as acme_crypto_util
@@ -44,9 +43,7 @@
logger = logging.getLogger(__name__)
[email protected](interfaces.IAuthenticator, interfaces.IInstaller)
[email protected](interfaces.IPluginFactory)
-class NginxConfigurator(common.Installer):
+class NginxConfigurator(common.Installer, interfaces.Authenticator):
"""Nginx configurator.
.. todo:: Add proper support for comments in the config. Currently,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-nginx-1.17.0/certbot_nginx/_internal/display_ops.py
new/certbot-nginx-1.18.0/certbot_nginx/_internal/display_ops.py
--- old/certbot-nginx-1.17.0/certbot_nginx/_internal/display_ops.py
2021-07-06 17:41:16.000000000 +0200
+++ new/certbot-nginx-1.18.0/certbot_nginx/_internal/display_ops.py
2021-08-03 22:12:58.000000000 +0200
@@ -1,10 +1,7 @@
"""Contains UI methods for Nginx operations."""
import logging
-import zope.component
-
-from certbot import interfaces
-import certbot.display.util as display_util
+from certbot.display import util as display_util
logger = logging.getLogger(__name__)
@@ -22,7 +19,7 @@
# Remove the extra newline from the last entry
if tags_list:
tags_list[-1] = tags_list[-1][:-1]
- code, names = zope.component.getUtility(interfaces.IDisplay).checklist(
+ code, names = display_util.checklist(
"Which server blocks would you like to modify?",
tags=tags_list, force_interactive=True)
if code == display_util.OK:
@@ -30,6 +27,7 @@
return return_vhosts
return []
+
def _reversemap_vhosts(names, vhosts):
"""Helper function for select_vhost_multiple for mapping string
representations back to actual vhost objects"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-nginx-1.17.0/certbot_nginx/_internal/parser.py
new/certbot-nginx-1.18.0/certbot_nginx/_internal/parser.py
--- old/certbot-nginx-1.17.0/certbot_nginx/_internal/parser.py 2021-07-06
17:41:16.000000000 +0200
+++ new/certbot-nginx-1.18.0/certbot_nginx/_internal/parser.py 2021-08-03
22:12:58.000000000 +0200
@@ -96,8 +96,8 @@
servers = self._get_raw_servers()
addr_to_ssl: Dict[Tuple[str, str], bool] = {}
- for filename in servers:
- for server, _ in servers[filename]:
+ for server_list in servers.values():
+ for server, _ in server_list:
# Parse the server block to save addr info
parsed_server = _parse_server_raw(server)
for addr in parsed_server['addrs']:
@@ -112,8 +112,7 @@
"""Get a map of unparsed all server blocks
"""
servers: Dict[str, Union[List, nginxparser.UnspacedList]] = {}
- for filename in self.parsed:
- tree = self.parsed[filename]
+ for filename, tree in self.parsed.items():
servers[filename] = []
srv = servers[filename] # workaround undefined loop var in lambdas
@@ -141,8 +140,8 @@
servers = self._get_raw_servers()
vhosts = []
- for filename in servers:
- for server, path in servers[filename]:
+ for filename, server_list in servers.items():
+ for server, path in server_list:
# Parse the server block into a VirtualHost object
parsed_server = _parse_server_raw(server)
@@ -240,8 +239,7 @@
"""
# Best-effort atomicity is enforced above us by reverter.py
- for filename in self.parsed:
- tree = self.parsed[filename]
+ for filename, tree in self.parsed.items():
if ext:
filename = filename + os.path.extsep + ext
if not isinstance(tree, UnspacedList):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.17.0/certbot_nginx.egg-info/PKG-INFO
new/certbot-nginx-1.18.0/certbot_nginx.egg-info/PKG-INFO
--- old/certbot-nginx-1.17.0/certbot_nginx.egg-info/PKG-INFO 2021-07-06
17:41:28.000000000 +0200
+++ new/certbot-nginx-1.18.0/certbot_nginx.egg-info/PKG-INFO 2021-08-03
22:14:35.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: certbot-nginx
-Version: 1.17.0
+Version: 1.18.0
Summary: Nginx plugin for Certbot
Home-page: https://github.com/letsencrypt/letsencrypt
Author: Certbot Project
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-nginx-1.17.0/certbot_nginx.egg-info/requires.txt
new/certbot-nginx-1.18.0/certbot_nginx.egg-info/requires.txt
--- old/certbot-nginx-1.17.0/certbot_nginx.egg-info/requires.txt
2021-07-06 17:41:28.000000000 +0200
+++ new/certbot-nginx-1.18.0/certbot_nginx.egg-info/requires.txt
2021-08-03 22:14:35.000000000 +0200
@@ -1,5 +1,5 @@
-acme>=1.17.0
-certbot>=1.17.0
+acme>=1.18.0
+certbot>=1.18.0
PyOpenSSL>=17.3.0
pyparsing>=2.2.0
setuptools>=39.0.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.17.0/setup.py
new/certbot-nginx-1.18.0/setup.py
--- old/certbot-nginx-1.17.0/setup.py 2021-07-06 17:41:17.000000000 +0200
+++ new/certbot-nginx-1.18.0/setup.py 2021-08-03 22:12:59.000000000 +0200
@@ -1,7 +1,7 @@
from setuptools import find_packages
from setuptools import setup
-version = '1.17.0'
+version = '1.18.0'
install_requires = [
# We specify the minimum acme and certbot version as the current plugin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.17.0/tests/display_ops_test.py
new/certbot-nginx-1.18.0/tests/display_ops_test.py
--- old/certbot-nginx-1.17.0/tests/display_ops_test.py 2021-07-06
17:41:16.000000000 +0200
+++ new/certbot-nginx-1.18.0/tests/display_ops_test.py 2021-08-03
22:12:59.000000000 +0200
@@ -19,7 +19,7 @@
def test_select_no_input(self):
self.assertFalse(select_vhost_multiple([]))
- @certbot_util.patch_get_utility()
+ @certbot_util.patch_display_util()
def test_select_correct(self, mock_util):
mock_util().checklist.return_value = (
display_util.OK, [self.vhosts[3].display_repr(),
@@ -31,7 +31,7 @@
self.assertTrue(self.vhosts[3] in vhs)
self.assertFalse(self.vhosts[1] in vhs)
- @certbot_util.patch_get_utility()
+ @certbot_util.patch_display_util()
def test_select_cancel(self, mock_util):
mock_util().checklist.return_value = (display_util.CANCEL, "whatever")
vhs = select_vhost_multiple([self.vhosts[2], self.vhosts[3]])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.17.0/tests/test_util.py
new/certbot-nginx-1.18.0/tests/test_util.py
--- old/certbot-nginx-1.17.0/tests/test_util.py 2021-07-06 17:41:16.000000000
+0200
+++ new/certbot-nginx-1.18.0/tests/test_util.py 2021-08-03 22:12:59.000000000
+0200
@@ -6,8 +6,8 @@
import josepy as jose
try:
import mock
-except ImportError: # pragma: no cover
- from unittest import mock # type: ignore
+except ImportError: # pragma: no cover
+ from unittest import mock # type: ignore
import pkg_resources
from certbot import util
