Hello community,
here is the log from the commit of package python-certbot-nginx for
openSUSE:Factory checked in at 2020-01-21 21:02:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-certbot-nginx (Old)
and /work/SRC/openSUSE:Factory/.python-certbot-nginx.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-certbot-nginx"
Tue Jan 21 21:02:24 2020 rev:16 rq:766020 version:1.1.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-certbot-nginx/python-certbot-nginx.changes
2020-01-03 17:39:52.871384888 +0100
+++
/work/SRC/openSUSE:Factory/.python-certbot-nginx.new.26092/python-certbot-nginx.changes
2020-01-21 21:03:13.524928945 +0100
@@ -1,0 +2,6 @@
+Tue Jan 21 09:43:23 UTC 2020 - Marketa Calabkova <[email protected]>
+
+- update to version 1.1.0
+ * Sync with main certbot package.
+
+-------------------------------------------------------------------
Old:
----
certbot-nginx-1.0.0.tar.gz
New:
----
certbot-nginx-1.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-certbot-nginx.spec ++++++
--- /var/tmp/diff_new_pack.IlZCni/_old 2020-01-21 21:03:15.000929633 +0100
+++ /var/tmp/diff_new_pack.IlZCni/_new 2020-01-21 21:03:15.028929647 +0100
@@ -18,13 +18,13 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-certbot-nginx
-Version: 1.0.0
+Version: 1.1.0
Release: 0
Summary: Nginx plugin for Certbot
License: Apache-2.0
URL: https://github.com/letsencrypt/letsencrypt
Source:
https://files.pythonhosted.org/packages/source/c/certbot-nginx/certbot-nginx-%{version}.tar.gz
-BuildRequires: %{python_module certbot >= 1.0.0}
+BuildRequires: %{python_module certbot >= 1.1.0}
BuildRequires: %{python_module mock}
BuildRequires: %{python_module pyOpenSSL}
BuildRequires: %{python_module pyparsing >= 1.5.5}
@@ -34,8 +34,8 @@
BuildRequires: nginx
BuildRequires: python-rpm-macros
Requires: nginx
-Requires: python-acme >= 1.0.0
-Requires: python-certbot >= 1.0.0
+Requires: python-acme >= 1.1.0
+Requires: python-certbot >= 1.1.0
Requires: python-pyOpenSSL
Requires: python-pyparsing >= 1.5.5
Requires: python-zope.interface
++++++ certbot-nginx-1.0.0.tar.gz -> certbot-nginx-1.1.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.0.0/PKG-INFO
new/certbot-nginx-1.1.0/PKG-INFO
--- old/certbot-nginx-1.0.0/PKG-INFO 2019-12-03 18:20:47.000000000 +0100
+++ new/certbot-nginx-1.1.0/PKG-INFO 2020-01-14 19:41:49.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: certbot-nginx
-Version: 1.0.0
+Version: 1.1.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.0.0/certbot_nginx/_internal/configurator.py
new/certbot-nginx-1.1.0/certbot_nginx/_internal/configurator.py
--- old/certbot-nginx-1.0.0/certbot_nginx/_internal/configurator.py
2019-12-03 18:20:30.000000000 +0100
+++ new/certbot-nginx-1.1.0/certbot_nginx/_internal/configurator.py
2020-01-14 19:41:31.000000000 +0100
@@ -1,6 +1,6 @@
"""Nginx Configuration"""
# https://github.com/PyCQA/pylint/issues/73
-from distutils.version import LooseVersion # pylint:
disable=no-name-in-module,import-error
+from distutils.version import LooseVersion # pylint:
disable=no-name-in-module, import-error
import logging
import re
import socket
@@ -8,22 +8,21 @@
import tempfile
import time
-import pkg_resources
-
import OpenSSL
+import pkg_resources
import zope.interface
from acme import challenges
from acme import crypto_util as acme_crypto_util
-from acme.magic_typing import List, Dict, Set # pylint:
disable=unused-import, no-name-in-module
-
+from acme.magic_typing import Dict # pylint: disable=unused-import,
no-name-in-module
+from acme.magic_typing import List # pylint: disable=unused-import,
no-name-in-module
+from acme.magic_typing import Set # pylint: disable=unused-import,
no-name-in-module
from certbot import crypto_util
from certbot import errors
from certbot import interfaces
from certbot import util
from certbot.compat import os
from certbot.plugins import common
-
from certbot_nginx._internal import constants
from certbot_nginx._internal import display_ops
from certbot_nginx._internal import http_01
@@ -284,7 +283,7 @@
filtered_vhosts[name] = vhost
# Only unique VHost objects
- dialog_input = set([vhost for vhost in filtered_vhosts.values()])
+ dialog_input = set(filtered_vhosts.values())
# Ask the user which of names to enable, expect list of names back
return_vhosts = display_ops.select_vhost_multiple(list(dialog_input))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-nginx-1.0.0/certbot_nginx/_internal/display_ops.py
new/certbot-nginx-1.1.0/certbot_nginx/_internal/display_ops.py
--- old/certbot-nginx-1.0.0/certbot_nginx/_internal/display_ops.py
2019-12-03 18:20:30.000000000 +0100
+++ new/certbot-nginx-1.1.0/certbot_nginx/_internal/display_ops.py
2020-01-14 19:41:31.000000000 +0100
@@ -4,10 +4,8 @@
import zope.component
from certbot import interfaces
-
import certbot.display.util as display_util
-
logger = logging.getLogger(__name__)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-nginx-1.0.0/certbot_nginx/_internal/http_01.py
new/certbot-nginx-1.1.0/certbot_nginx/_internal/http_01.py
--- old/certbot-nginx-1.0.0/certbot_nginx/_internal/http_01.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-nginx-1.1.0/certbot_nginx/_internal/http_01.py 2020-01-14
19:41:31.000000000 +0100
@@ -3,15 +3,12 @@
import logging
from acme import challenges
-from acme.magic_typing import List # pylint: disable=unused-import,
no-name-in-module
-
+from acme.magic_typing import List # pylint: disable=unused-import,
no-name-in-module
from certbot import errors
from certbot.compat import os
from certbot.plugins import common
-
-from certbot_nginx._internal import obj
from certbot_nginx._internal import nginxparser
-
+from certbot_nginx._internal import obj
logger = logging.getLogger(__name__)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-nginx-1.0.0/certbot_nginx/_internal/nginxparser.py
new/certbot-nginx-1.1.0/certbot_nginx/_internal/nginxparser.py
--- old/certbot-nginx-1.0.0/certbot_nginx/_internal/nginxparser.py
2019-12-03 18:20:30.000000000 +0100
+++ new/certbot-nginx-1.1.0/certbot_nginx/_internal/nginxparser.py
2020-01-14 19:41:31.000000000 +0100
@@ -3,10 +3,18 @@
import copy
import logging
-from pyparsing import (
- Literal, White, Forward, Group, Optional, OneOrMore, QuotedString, Regex,
ZeroOrMore, Combine)
-from pyparsing import stringEnd
+from pyparsing import Combine
+from pyparsing import Forward
+from pyparsing import Group
+from pyparsing import Literal
+from pyparsing import OneOrMore
+from pyparsing import Optional
+from pyparsing import QuotedString
+from pyparsing import Regex
from pyparsing import restOfLine
+from pyparsing import stringEnd
+from pyparsing import White
+from pyparsing import ZeroOrMore
import six
logger = logging.getLogger(__name__)
@@ -178,12 +186,11 @@
"""
if not isinstance(inbound, list): # str or None
- return (inbound, inbound)
+ return inbound, inbound
else:
if not hasattr(inbound, "spaced"):
inbound = UnspacedList(inbound)
- return (inbound, inbound.spaced)
-
+ return inbound, inbound.spaced
def insert(self, i, x):
item, spaced_item = self._coerce(x)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-nginx-1.0.0/certbot_nginx/_internal/parser.py
new/certbot-nginx-1.1.0/certbot_nginx/_internal/parser.py
--- old/certbot-nginx-1.0.0/certbot_nginx/_internal/parser.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-nginx-1.1.0/certbot_nginx/_internal/parser.py 2020-01-14
19:41:31.000000000 +0100
@@ -4,16 +4,19 @@
import glob
import logging
import re
-import pyparsing
+import pyparsing
import six
+from acme.magic_typing import Dict # pylint: disable=unused-import,
no-name-in-module
+from acme.magic_typing import List # pylint: disable=unused-import,
no-name-in-module
+from acme.magic_typing import Set # pylint: disable=unused-import,
no-name-in-module
+from acme.magic_typing import Tuple # pylint: disable=unused-import,
no-name-in-module
+from acme.magic_typing import Union # pylint: disable=unused-import,
no-name-in-module
from certbot import errors
from certbot.compat import os
-
-from certbot_nginx._internal import obj
from certbot_nginx._internal import nginxparser
-from acme.magic_typing import Union, Dict, Set, Any, List, Tuple # pylint:
disable=unused-import, no-name-in-module
+from certbot_nginx._internal import obj
logger = logging.getLogger(__name__)
@@ -272,7 +275,7 @@
for directive in server:
if not directive:
continue
- elif _is_ssl_on_directive(directive):
+ if _is_ssl_on_directive(directive):
return True
return False
@@ -486,7 +489,7 @@
def _exact_match(target_name, name):
- return target_name == name or '.' + target_name == name
+ return name in (target_name, '.' + target_name)
def _wildcard_match(target_name, name, start):
@@ -504,7 +507,7 @@
# The first part must be a wildcard or blank, e.g. '.eff.org'
first = match_parts.pop(0)
- if first != '*' and first != '':
+ if first not in ('*', ''):
return False
target_name = '.'.join(parts)
@@ -582,7 +585,7 @@
if isinstance(next_entry, list) and next_entry:
if len(next_entry) >= 2 and next_entry[-2] == "#" and COMMENT in
next_entry[-1]:
return
- elif isinstance(next_entry, nginxparser.UnspacedList):
+ if isinstance(next_entry, nginxparser.UnspacedList):
next_entry = next_entry.spaced[0]
else:
next_entry = next_entry[0]
@@ -658,13 +661,12 @@
for included_directive in included_directives:
included_dir_loc = _find_location(block, included_directive[0])
included_dir_name = included_directive[0]
- if not _is_whitespace_or_comment(included_directive) \
- and not can_append(included_dir_loc, included_dir_name):
+ if (not _is_whitespace_or_comment(included_directive)
+ and not can_append(included_dir_loc, included_dir_name)):
if block[included_dir_loc] != included_directive:
raise
errors.MisconfigurationError(err_fmt.format(included_directive,
block[included_dir_loc]))
- else:
- _comment_out_directive(block, included_dir_loc,
directive[1])
+ _comment_out_directive(block, included_dir_loc, directive[1])
if can_append(location, directive_name):
if insert_at_top:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-nginx-1.0.0/certbot_nginx/_internal/parser_obj.py
new/certbot-nginx-1.1.0/certbot_nginx/_internal/parser_obj.py
--- old/certbot-nginx-1.0.0/certbot_nginx/_internal/parser_obj.py
2019-12-03 18:20:30.000000000 +0100
+++ new/certbot-nginx-1.1.0/certbot_nginx/_internal/parser_obj.py
2020-01-14 19:41:31.000000000 +0100
@@ -3,12 +3,12 @@
import abc
import logging
+
import six
+from acme.magic_typing import List # pylint: disable=unused-import,
no-name-in-module
from certbot import errors
-from acme.magic_typing import List # pylint: disable=unused-import,
no-name-in-module
-
logger = logging.getLogger(__name__)
COMMENT = " managed by Certbot"
COMMENT_BLOCK = ["#", COMMENT]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.0.0/certbot_nginx.egg-info/PKG-INFO
new/certbot-nginx-1.1.0/certbot_nginx.egg-info/PKG-INFO
--- old/certbot-nginx-1.0.0/certbot_nginx.egg-info/PKG-INFO 2019-12-03
18:20:47.000000000 +0100
+++ new/certbot-nginx-1.1.0/certbot_nginx.egg-info/PKG-INFO 2020-01-14
19:41:48.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: certbot-nginx
-Version: 1.0.0
+Version: 1.1.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.0.0/setup.py
new/certbot-nginx-1.1.0/setup.py
--- old/certbot-nginx-1.0.0/setup.py 2019-12-03 18:20:32.000000000 +0100
+++ new/certbot-nginx-1.1.0/setup.py 2020-01-14 19:41:33.000000000 +0100
@@ -1,10 +1,10 @@
-from setuptools import setup
-from setuptools import find_packages
-from setuptools.command.test import test as TestCommand
import sys
+from setuptools import find_packages
+from setuptools import setup
+from setuptools.command.test import test as TestCommand
-version = '1.0.0'
+version = '1.1.0'
# Remember to update local-oldest-requirements.txt when changing the minimum
# acme/certbot version.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.0.0/tests/configurator_test.py
new/certbot-nginx-1.1.0/tests/configurator_test.py
--- old/certbot-nginx-1.0.0/tests/configurator_test.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-nginx-1.1.0/tests/configurator_test.py 2020-01-14
19:41:31.000000000 +0100
@@ -1,22 +1,20 @@
"""Test for certbot_nginx._internal.configurator."""
import unittest
-import OpenSSL
import mock
+import OpenSSL
+
from acme import challenges
from acme import messages
-
from certbot import achallenges
from certbot import crypto_util
from certbot import errors
from certbot.compat import os
from certbot.tests import util as certbot_test_util
-
from certbot_nginx._internal import obj
from certbot_nginx._internal import parser
from certbot_nginx._internal.configurator import _redirect_block_for_domain
from certbot_nginx._internal.nginxparser import UnspacedList
-
import test_util as util
@@ -1093,7 +1091,7 @@
self.assertIn("/usr/local/etc/nginx", server_root)
self.assertIn("/etc/nginx", server_root)
else:
- self.assertTrue(server_root == "/etc/nginx" or server_root ==
"/usr/local/etc/nginx")
+ self.assertTrue(server_root in ("/etc/nginx",
"/usr/local/etc/nginx"))
if __name__ == "__main__":
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.0.0/tests/display_ops_test.py
new/certbot-nginx-1.1.0/tests/display_ops_test.py
--- old/certbot-nginx-1.0.0/tests/display_ops_test.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-nginx-1.1.0/tests/display_ops_test.py 2020-01-14
19:41:31.000000000 +0100
@@ -2,13 +2,9 @@
import unittest
from certbot.display import util as display_util
-
from certbot.tests import util as certbot_util
-
from certbot_nginx._internal import parser
-
from certbot_nginx._internal.display_ops import select_vhost_multiple
-
import test_util as util
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.0.0/tests/http_01_test.py
new/certbot-nginx-1.1.0/tests/http_01_test.py
--- old/certbot-nginx-1.0.0/tests/http_01_test.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-nginx-1.1.0/tests/http_01_test.py 2020-01-14
19:41:31.000000000 +0100
@@ -6,14 +6,10 @@
import six
from acme import challenges
-
from certbot import achallenges
-
from certbot.tests import acme_util
from certbot.tests import util as test_util
-
from certbot_nginx._internal.obj import Addr
-
import test_util as util
AUTH_KEY = jose.JWKRSA.load(test_util.load_vector("rsa512_key.pem"))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.0.0/tests/nginxparser_test.py
new/certbot-nginx-1.1.0/tests/nginxparser_test.py
--- old/certbot-nginx-1.0.0/tests/nginxparser_test.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-nginx-1.1.0/tests/nginxparser_test.py 2020-01-14
19:41:31.000000000 +0100
@@ -6,12 +6,14 @@
from pyparsing import ParseException
-from certbot_nginx._internal.nginxparser import (
- RawNginxParser, loads, load, dumps, dump, UnspacedList)
-
+from certbot_nginx._internal.nginxparser import dump
+from certbot_nginx._internal.nginxparser import dumps
+from certbot_nginx._internal.nginxparser import load
+from certbot_nginx._internal.nginxparser import loads
+from certbot_nginx._internal.nginxparser import RawNginxParser
+from certbot_nginx._internal.nginxparser import UnspacedList
import test_util as util
-
FIRST = operator.itemgetter(0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.0.0/tests/obj_test.py
new/certbot-nginx-1.1.0/tests/obj_test.py
--- old/certbot-nginx-1.0.0/tests/obj_test.py 2019-12-03 18:20:30.000000000
+0100
+++ new/certbot-nginx-1.1.0/tests/obj_test.py 2020-01-14 19:41:31.000000000
+0100
@@ -1,6 +1,6 @@
"""Test the helper objects in certbot_nginx._internal.obj."""
-import unittest
import itertools
+import unittest
class AddrTest(unittest.TestCase):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.0.0/tests/parser_obj_test.py
new/certbot-nginx-1.1.0/tests/parser_obj_test.py
--- old/certbot-nginx-1.0.0/tests/parser_obj_test.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-nginx-1.1.0/tests/parser_obj_test.py 2020-01-14
19:41:31.000000000 +0100
@@ -1,10 +1,12 @@
""" Tests for functions and classes in parser_obj.py """
import unittest
+
import mock
-from certbot_nginx._internal.parser_obj import parse_raw
from certbot_nginx._internal.parser_obj import COMMENT_BLOCK
+from certbot_nginx._internal.parser_obj import parse_raw
+
class CommentHelpersTest(unittest.TestCase):
def test_is_comment(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.0.0/tests/parser_test.py
new/certbot-nginx-1.1.0/tests/parser_test.py
--- old/certbot-nginx-1.0.0/tests/parser_test.py 2019-12-03
18:20:30.000000000 +0100
+++ new/certbot-nginx-1.1.0/tests/parser_test.py 2020-01-14
19:41:31.000000000 +0100
@@ -5,14 +5,11 @@
import unittest
from acme.magic_typing import List # pylint: disable=unused-import,
no-name-in-module
-
from certbot import errors
from certbot.compat import os
-
from certbot_nginx._internal import nginxparser
from certbot_nginx._internal import obj
from certbot_nginx._internal import parser
-
import test_util as util
@@ -52,16 +49,16 @@
"""
nparser = parser.NginxParser(self.config_path)
nparser.load()
- self.assertEqual(set([nparser.abs_path(x) for x in
- ['foo.conf', 'nginx.conf', 'server.conf',
- 'sites-enabled/default',
- 'sites-enabled/example.com',
- 'sites-enabled/headers.com',
- 'sites-enabled/migration.com',
- 'sites-enabled/sslon.com',
- 'sites-enabled/globalssl.com',
- 'sites-enabled/ipv6.com',
- 'sites-enabled/ipv6ssl.com']]),
+ self.assertEqual({nparser.abs_path(x) for x in
+ ['foo.conf', 'nginx.conf', 'server.conf',
+ 'sites-enabled/default',
+ 'sites-enabled/example.com',
+ 'sites-enabled/headers.com',
+ 'sites-enabled/migration.com',
+ 'sites-enabled/sslon.com',
+ 'sites-enabled/globalssl.com',
+ 'sites-enabled/ipv6.com',
+ 'sites-enabled/ipv6ssl.com']},
set(nparser.parsed.keys()))
self.assertEqual([['server_name', 'somename', 'alias',
'another.alias']],
nparser.parsed[nparser.abs_path('server.conf')])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.0.0/tests/test_util.py
new/certbot-nginx-1.1.0/tests/test_util.py
--- old/certbot-nginx-1.0.0/tests/test_util.py 2019-12-03 18:20:30.000000000
+0100
+++ new/certbot-nginx-1.1.0/tests/test_util.py 2020-01-14 19:41:31.000000000
+0100
@@ -12,7 +12,6 @@
from certbot.compat import os
from certbot.plugins import common
from certbot.tests import util as test_util
-
from certbot_nginx._internal import configurator
from certbot_nginx._internal import nginxparser
