--- a/components/python/oslo.log/Makefile Wed Sep 07 14:48:32 2016 -0700
+++ b/components/python/oslo.log/Makefile Wed Sep 07 14:48:32 2016 -0700
@@ -26,16 +26,16 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= oslo.log
-COMPONENT_VERSION= 1.0.0
+COMPONENT_VERSION= 3.3.0
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:3d66e9a70b82bc1c7c0b70114d093620e86bef679177ee1ec668c6e0a1acf52a
+ sha256:b3414b6f3b05f50571d8973543227f0d6445c297ba762262adfc28b704f8efd9
COMPONENT_ARCHIVE_URL= $(call pypi_url)
-COMPONENT_PROJECT_URL= https://launchpad.net/oslo.log
+COMPONENT_PROJECT_URL= http://docs.openstack.org/developer/oslo.log/
COMPONENT_BUGDB= python-mod/oslo.log
-TPNO= 25718
+TPNO= 31344
# Depends on oslo.serialization which is not Python 3 ready.
PYTHON_VERSIONS = $(PYTHON2_VERSIONS)
@@ -51,8 +51,8 @@
install: $(INSTALL_NO_ARCH)
-# see $(COMPONENT_SRC)/test-requirements.txt for the python modules
+# See $(COMPONENT_SRC)/test-requirements.txt for the Python modules
# required to execute unittests.
test: $(NO_TESTS)
-system-test: $(NO_TESTS)
+system-test: $(NO_TESTS)
--- a/components/python/oslo.log/oslo.log-PYVER.p5m Wed Sep 07 14:48:32 2016 -0700
+++ b/components/python/oslo.log/oslo.log-PYVER.p5m Wed Sep 07 14:48:32 2016 -0700
@@ -57,26 +57,38 @@
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_log/helpers.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_log/log.py
file path=usr/lib/python$(PYVER)/vendor-packages/oslo_log/loggers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_log/version.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_log/versionutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/oslo_log/watchers.py
#
license oslo.log.license license="Apache v2.0"
-# force a dependency on iso8601; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/iso8601-$(PYV)
+# force a dependency on the Python runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+ pkg.debug.depend.path=usr/bin
+
+# force a dependency on dateutil; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/dateutil-$(PYV)
# force a dependency on oslo.config; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/oslo.config-$(PYV)
-# force a dependency on oslo.context; pkgdepend work is needed to flush this out.
+# force a dependency on oslo.context; pkgdepend work is needed to flush this
+# out.
depend type=require fmri=library/python/oslo.context-$(PYV)
# force a dependency on oslo.i18n; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/oslo.i18n-$(PYV)
+# force a dependency on oslo.log; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.log-$(PYV)
+
# force a dependency on the oslo.log package
depend type=require \
fmri=library/python/oslo.log@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-# force a dependency on oslo.serialization; pkgdepend work is needed to flush this out.
+# force a dependency on oslo.serialization; pkgdepend work is needed to flush
+# this out.
depend type=require fmri=library/python/oslo.serialization-$(PYV)
# force a dependency on oslo.utils; pkgdepend work is needed to flush this out.
--- a/components/python/oslo.log/oslo.log.license Wed Sep 07 14:48:32 2016 -0700
+++ b/components/python/oslo.log/oslo.log.license Wed Sep 07 14:48:32 2016 -0700
@@ -8,7 +8,6 @@
See the License for the specific language governing permissions and limitations under the License.
-
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -183,30 +182,3 @@
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--- a/components/python/oslo.log/patches/01-fix-syslog.patch Wed Sep 07 14:48:32 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-In-house patch to remove the hardcoding of /dev/log as the address for
-syslog. The default logging module is smart enough to use the proper
-path in Solaris.
-
---- oslo.log-1.0.0/oslo_log/log.py.orig 2015-09-29 16:41:03.335483630 -0600
-+++ oslo.log-1.0.0/oslo_log/log.py 2015-09-29 16:41:23.112003925 -0600
-@@ -285,11 +285,9 @@ def _setup_logging_from_conf(conf, proje
- # TODO(bogdando) use the format provided by RFCSysLogHandler
- # after existing syslog format deprecation in J
- if conf.use_syslog_rfc_format:
-- syslog = handlers.RFCSysLogHandler(address='/dev/log',
-- facility=facility)
-+ syslog = handlers.RFCSysLogHandler(facility=facility)
- else:
-- syslog = logging.handlers.SysLogHandler(address='/dev/log',
-- facility=facility)
-+ syslog = logging.handlers.SysLogHandler(facility=facility)
- log_root.addHandler(syslog)
- except socket.error:
- log_root.error('Unable to add syslog handler. Verify that syslog '