Hello community,
here is the log from the commit of package python-certbot-apache for
openSUSE:Factory checked in at 2020-10-07 14:18:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-certbot-apache (Old)
and /work/SRC/openSUSE:Factory/.python-certbot-apache.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-certbot-apache"
Wed Oct 7 14:18:49 2020 rev:23 rq:839982 version:1.9.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-certbot-apache/python-certbot-apache.changes
2020-08-21 19:13:24.820685457 +0200
+++
/work/SRC/openSUSE:Factory/.python-certbot-apache.new.4249/python-certbot-apache.changes
2020-10-07 14:19:03.529512998 +0200
@@ -1,0 +2,7 @@
+Wed Oct 7 08:42:56 UTC 2020 - Marketa Calabkova <[email protected]>
+
+- update to version 1.9.0
+ * The problem causing the Apache plugin in the Certbot snap on ARM systems to
+ fail to load the Augeas library it depends on has been fixed.
+
+-------------------------------------------------------------------
Old:
----
certbot-apache-1.7.0.tar.gz
New:
----
certbot-apache-1.9.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-certbot-apache.spec ++++++
--- /var/tmp/diff_new_pack.ersSzz/_old 2020-10-07 14:19:04.293513605 +0200
+++ /var/tmp/diff_new_pack.ersSzz/_new 2020-10-07 14:19:04.297513608 +0200
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-certbot-apache
-Version: 1.7.0
+Version: 1.9.0
Release: 0
Summary: Apache plugin for Certbot
License: Apache-2.0
++++++ certbot-apache-1.7.0.tar.gz -> certbot-apache-1.9.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.7.0/PKG-INFO
new/certbot-apache-1.9.0/PKG-INFO
--- old/certbot-apache-1.7.0/PKG-INFO 2020-08-04 20:20:20.929907800 +0200
+++ new/certbot-apache-1.9.0/PKG-INFO 2020-10-06 20:39:56.670114000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: certbot-apache
-Version: 1.7.0
+Version: 1.9.0
Summary: Apache plugin for Certbot
Home-page: https://github.com/letsencrypt/letsencrypt
Author: Certbot Project
@@ -17,7 +17,6 @@
Classifier: Programming Language :: Python :: 2
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
Classifier: Programming Language :: Python :: 3.8
@@ -27,5 +26,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.*
+Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*
Provides-Extra: dev
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.7.0/certbot_apache/_internal/augeas_lens/httpd.aug
new/certbot-apache-1.9.0/certbot_apache/_internal/augeas_lens/httpd.aug
--- old/certbot-apache-1.7.0/certbot_apache/_internal/augeas_lens/httpd.aug
2020-08-04 20:20:15.000000000 +0200
+++ new/certbot-apache-1.9.0/certbot_apache/_internal/augeas_lens/httpd.aug
2020-10-06 20:39:49.000000000 +0200
@@ -6,7 +6,7 @@
Raphael Pinson <[email protected]>
About: Reference
- Online Apache configuration manual: http://httpd.apache.org/docs/trunk/
+ Online Apache configuration manual: https://httpd.apache.org/docs/trunk/
About: License
This file is licensed under the LGPL v2+.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.7.0/certbot_apache/_internal/configurator.py
new/certbot-apache-1.9.0/certbot_apache/_internal/configurator.py
--- old/certbot-apache-1.7.0/certbot_apache/_internal/configurator.py
2020-08-04 20:20:15.000000000 +0200
+++ new/certbot-apache-1.9.0/certbot_apache/_internal/configurator.py
2020-10-06 20:39:49.000000000 +0200
@@ -1462,7 +1462,7 @@
if not line.lower().lstrip().startswith("rewriterule"):
return False
- # According to: http://httpd.apache.org/docs/2.4/rewrite/flags.html
+ # According to: https://httpd.apache.org/docs/2.4/rewrite/flags.html
# The syntax of a RewriteRule is:
# RewriteRule pattern target [Flag1,Flag2,Flag3]
# i.e. target is required, so it must exist.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.7.0/certbot_apache/_internal/parser.py
new/certbot-apache-1.9.0/certbot_apache/_internal/parser.py
--- old/certbot-apache-1.7.0/certbot_apache/_internal/parser.py 2020-08-04
20:20:15.000000000 +0200
+++ new/certbot-apache-1.9.0/certbot_apache/_internal/parser.py 2020-10-06
20:39:49.000000000 +0200
@@ -731,7 +731,6 @@
privileged users.
https://apr.apache.org/docs/apr/2.0/apr__fnmatch_8h_source.html
-
http://apache2.sourcearchive.com/documentation/2.2.16-6/apr__fnmatch_8h_source.html
:param str clean_fn_match: Apache style filename match, like globs
@@ -799,7 +798,7 @@
def _parsed_by_parser_paths(self, filep, paths):
"""Helper function that searches through provided paths and returns
True if file path is found in the set"""
- for directory in paths.keys():
+ for directory in paths:
for filename in paths[directory]:
if fnmatch.fnmatch(filep, os.path.join(directory, filename)):
return True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.7.0/certbot_apache.egg-info/PKG-INFO
new/certbot-apache-1.9.0/certbot_apache.egg-info/PKG-INFO
--- old/certbot-apache-1.7.0/certbot_apache.egg-info/PKG-INFO 2020-08-04
20:20:20.000000000 +0200
+++ new/certbot-apache-1.9.0/certbot_apache.egg-info/PKG-INFO 2020-10-06
20:39:56.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: certbot-apache
-Version: 1.7.0
+Version: 1.9.0
Summary: Apache plugin for Certbot
Home-page: https://github.com/letsencrypt/letsencrypt
Author: Certbot Project
@@ -17,7 +17,6 @@
Classifier: Programming Language :: Python :: 2
Classifier: Programming Language :: Python :: 2.7
Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
Classifier: Programming Language :: Python :: 3.8
@@ -27,5 +26,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.*
+Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*
Provides-Extra: dev
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.7.0/setup.py
new/certbot-apache-1.9.0/setup.py
--- old/certbot-apache-1.7.0/setup.py 2020-08-04 20:20:16.000000000 +0200
+++ new/certbot-apache-1.9.0/setup.py 2020-10-06 20:39:50.000000000 +0200
@@ -4,9 +4,8 @@
from setuptools import __version__ as setuptools_version
from setuptools import find_packages
from setuptools import setup
-from setuptools.command.test import test as TestCommand
-version = '1.7.0'
+version = '1.9.0'
# Remember to update local-oldest-requirements.txt when changing the minimum
# acme/certbot version.
@@ -32,21 +31,6 @@
'apacheconfig>=0.3.2',
]
-class PyTest(TestCommand):
- user_options = []
-
- def initialize_options(self):
- TestCommand.initialize_options(self)
- self.pytest_args = ''
-
- def run_tests(self):
- import shlex
- # import here, cause outside the eggs aren't loaded
- import pytest
- errno = pytest.main(shlex.split(self.pytest_args))
- sys.exit(errno)
-
-
setup(
name='certbot-apache',
version=version,
@@ -55,7 +39,7 @@
author="Certbot Project",
author_email='[email protected]',
license='Apache License 2.0',
- python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
+ python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*,
!=3.5.*',
classifiers=[
'Development Status :: 5 - Production/Stable',
'Environment :: Plugins',
@@ -66,7 +50,6 @@
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
- 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
@@ -89,7 +72,4 @@
'apache = certbot_apache._internal.entrypoint:ENTRYPOINT',
],
},
- test_suite='certbot_apache',
- tests_require=["pytest"],
- cmdclass={"test": PyTest},
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.7.0/tests/centos_test.py
new/certbot-apache-1.9.0/tests/centos_test.py
--- old/certbot-apache-1.7.0/tests/centos_test.py 2020-08-04
20:20:15.000000000 +0200
+++ new/certbot-apache-1.9.0/tests/centos_test.py 2020-10-06
20:39:49.000000000 +0200
@@ -140,7 +140,7 @@
self.assertEqual(mock_get.call_count, 3)
self.assertEqual(len(self.config.parser.modules), 4)
self.assertEqual(len(self.config.parser.variables), 2)
- self.assertTrue("TEST2" in self.config.parser.variables.keys())
+ self.assertTrue("TEST2" in self.config.parser.variables)
self.assertTrue("mod_another.c" in self.config.parser.modules)
def test_get_virtual_hosts(self):
@@ -172,11 +172,11 @@
mock_osi.return_value = ("centos", "7")
self.config.parser.update_runtime_variables()
- self.assertTrue("mock_define" in self.config.parser.variables.keys())
- self.assertTrue("mock_define_too" in
self.config.parser.variables.keys())
- self.assertTrue("mock_value" in self.config.parser.variables.keys())
+ self.assertTrue("mock_define" in self.config.parser.variables)
+ self.assertTrue("mock_define_too" in self.config.parser.variables)
+ self.assertTrue("mock_value" in self.config.parser.variables)
self.assertEqual("TRUE", self.config.parser.variables["mock_value"])
- self.assertTrue("MOCK_NOSEP" in self.config.parser.variables.keys())
+ self.assertTrue("MOCK_NOSEP" in self.config.parser.variables)
self.assertEqual("NOSEP_VAL",
self.config.parser.variables["NOSEP_TWO"])
@mock.patch("certbot_apache._internal.configurator.util.run_script")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.7.0/tests/fedora_test.py
new/certbot-apache-1.9.0/tests/fedora_test.py
--- old/certbot-apache-1.7.0/tests/fedora_test.py 2020-08-04
20:20:15.000000000 +0200
+++ new/certbot-apache-1.9.0/tests/fedora_test.py 2020-10-06
20:39:49.000000000 +0200
@@ -134,7 +134,7 @@
self.assertEqual(mock_get.call_count, 3)
self.assertEqual(len(self.config.parser.modules), 4)
self.assertEqual(len(self.config.parser.variables), 2)
- self.assertTrue("TEST2" in self.config.parser.variables.keys())
+ self.assertTrue("TEST2" in self.config.parser.variables)
self.assertTrue("mod_another.c" in self.config.parser.modules)
@mock.patch("certbot_apache._internal.configurator.util.run_script")
@@ -172,11 +172,11 @@
mock_osi.return_value = ("fedora", "29")
self.config.parser.update_runtime_variables()
- self.assertTrue("mock_define" in self.config.parser.variables.keys())
- self.assertTrue("mock_define_too" in
self.config.parser.variables.keys())
- self.assertTrue("mock_value" in self.config.parser.variables.keys())
+ self.assertTrue("mock_define" in self.config.parser.variables)
+ self.assertTrue("mock_define_too" in self.config.parser.variables)
+ self.assertTrue("mock_value" in self.config.parser.variables)
self.assertEqual("TRUE", self.config.parser.variables["mock_value"])
- self.assertTrue("MOCK_NOSEP" in self.config.parser.variables.keys())
+ self.assertTrue("MOCK_NOSEP" in self.config.parser.variables)
self.assertEqual("NOSEP_VAL",
self.config.parser.variables["NOSEP_TWO"])
@mock.patch("certbot_apache._internal.configurator.util.run_script")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.7.0/tests/gentoo_test.py
new/certbot-apache-1.9.0/tests/gentoo_test.py
--- old/certbot-apache-1.7.0/tests/gentoo_test.py 2020-08-04
20:20:15.000000000 +0200
+++ new/certbot-apache-1.9.0/tests/gentoo_test.py 2020-10-06
20:39:49.000000000 +0200
@@ -91,7 +91,7 @@
with
mock.patch("certbot_apache._internal.override_gentoo.GentooParser.update_modules"):
self.config.parser.update_runtime_variables()
for define in defines:
- self.assertTrue(define in self.config.parser.variables.keys())
+ self.assertTrue(define in self.config.parser.variables)
@mock.patch("certbot_apache._internal.apache_util.parse_from_subprocess")
def test_no_binary_configdump(self, mock_subprocess):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.7.0/tests/util.py
new/certbot-apache-1.9.0/tests/util.py
--- old/certbot-apache-1.7.0/tests/util.py 2020-08-04 20:20:15.000000000
+0200
+++ new/certbot-apache-1.9.0/tests/util.py 2020-10-06 20:39:49.000000000
+0200
@@ -26,8 +26,6 @@
config_root="debian_apache_2_4/multiple_vhosts/apache2",
vhost_root="debian_apache_2_4/multiple_vhosts/apache2/sites-available"):
# pylint: disable=arguments-differ
- super(ApacheTest, self).setUp()
-
self.temp_dir, self.config_dir, self.work_dir = common.dir_setup(
test_dir=test_dir,
pkg=__name__)
