[python-behave] New upstream release

Matej Cepl mcepl at fedoraproject.org
Thu Jun 19 16:53:18 UTC 2014


commit 87540f9e3d56ede023dd1b94ec785a1596596ffa
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Thu Jun 19 18:44:04 2014 +0200

    New upstream release

 ...dding-support-link-caption-and-video-tags.patch |    4 +-
 Fix-relpath-imports.patch                          |    4 +-
 HTML-Formatter.patch                               |   61 ++++++++-----------
 python-behave.spec                                 |    7 ++-
 sources                                            |    2 +-
 5 files changed, 36 insertions(+), 42 deletions(-)
---
diff --git a/Embedding-support-link-caption-and-video-tags.patch b/Embedding-support-link-caption-and-video-tags.patch
index 9b499a9..e902a9c 100644
--- a/Embedding-support-link-caption-and-video-tags.patch
+++ b/Embedding-support-link-caption-and-video-tags.patch
@@ -87,7 +87,7 @@ Subject: [PATCH] Embedding: support link caption and video tags
          if not hasattr(self, "all_features"):
 --- a/behave/formatter/json.py
 +++ b/behave/formatter/json.py
-@@ -170,7 +170,7 @@ class JSONFormatter(Formatter):
+@@ -180,7 +180,7 @@ class JSONFormatter(Formatter):
              result_element['error_message'] = error_message
          self._step_index += 1
  
@@ -98,7 +98,7 @@ Subject: [PATCH] Embedding: support link caption and video tags
              'mime_type': mime_type,
 --- a/behave/runner.py
 +++ b/behave/runner.py
-@@ -241,10 +241,10 @@ class Context(object):
+@@ -254,10 +254,10 @@ class Context(object):
                  return True
          return False
  
diff --git a/Fix-relpath-imports.patch b/Fix-relpath-imports.patch
index 2a33bcf..b14c0f3 100644
--- a/Fix-relpath-imports.patch
+++ b/Fix-relpath-imports.patch
@@ -82,7 +82,7 @@ which is for compatibility with python <= 2.5
  import copy
  import difflib
  import itertools
-@@ -8,7 +9,10 @@ import os.path
+@@ -9,7 +10,10 @@ import sys
  import time
  import traceback
  from behave import step_registry
@@ -94,7 +94,7 @@ which is for compatibility with python <= 2.5
  
  
  class Argument(object):
-@@ -1313,7 +1317,10 @@ class Row(object):
+@@ -1472,7 +1476,10 @@ class Row(object):
          Converts the row and its cell data into a dictionary.
          :return: Row data as dictionary (without comments, line info).
          """
diff --git a/HTML-Formatter.patch b/HTML-Formatter.patch
index 23258ca..a505f01 100644
--- a/HTML-Formatter.patch
+++ b/HTML-Formatter.patch
@@ -1,6 +1,5 @@
-diff -up behave-1.2.3/behave/compat/collections.py.HTMLformatter behave-1.2.3/behave/compat/collections.py
---- behave-1.2.3/behave/compat/collections.py.HTMLformatter	2013-04-19 22:35:23.000000000 +0200
-+++ behave-1.2.3/behave/compat/collections.py	2013-10-29 18:17:28.944010009 +0100
+--- a/behave/compat/collections.py
++++ b/behave/compat/collections.py
 @@ -18,3 +18,188 @@ except ImportError:     # pragma: no cov
          warnings.warn(message)
          # -- BACKWARD-COMPATIBLE: Better than nothing (for behave use case).
@@ -190,20 +189,18 @@ diff -up behave-1.2.3/behave/compat/collections.py.HTMLformatter behave-1.2.3/be
 +                if newcount > 0:
 +                    result[elem] = newcount
 +            return result
-diff -up behave-1.2.3/behave/configuration.py.HTMLformatter behave-1.2.3/behave/configuration.py
---- behave-1.2.3/behave/configuration.py.HTMLformatter	2013-07-03 21:51:08.000000000 +0200
-+++ behave-1.2.3/behave/configuration.py	2013-10-29 18:17:28.944010009 +0100
+--- a/behave/configuration.py
++++ b/behave/configuration.py
 @@ -4,6 +4,7 @@ import os
  import re
  import sys
  import argparse
 +import codecs
  import ConfigParser
- 
- from behave.reporter.junit import JUnitReporter
-diff -up behave-1.2.3/behave/formatter/formatters.py.HTMLformatter behave-1.2.3/behave/formatter/formatters.py
---- behave-1.2.3/behave/formatter/formatters.py.HTMLformatter	2013-06-27 00:19:16.000000000 +0200
-+++ behave-1.2.3/behave/formatter/formatters.py	2013-10-29 18:17:28.945010011 +0100
+ import logging
+ import shlex
+--- a/behave/formatter/formatters.py
++++ b/behave/formatter/formatters.py
 @@ -76,6 +76,7 @@ def setup_formatters():
      register_as(_L("behave.formatter.steps:StepsUsageFormatter"), "steps.usage")
      register_as(_L("behave.formatter.sphinx_steps:SphinxStepsFormatter"),
@@ -212,9 +209,8 @@ diff -up behave-1.2.3/behave/formatter/formatters.py.HTMLformatter behave-1.2.3/
  
  
  # -----------------------------------------------------------------------------
-diff -up behave-1.2.3/behave/formatter/html.py.HTMLformatter behave-1.2.3/behave/formatter/html.py
---- behave-1.2.3/behave/formatter/html.py.HTMLformatter	2013-10-29 18:17:28.945010011 +0100
-+++ behave-1.2.3/behave/formatter/html.py	2013-10-29 18:17:28.945010011 +0100
+--- /dev/null
++++ b/behave/formatter/html.py
 @@ -0,0 +1,311 @@
 +from behave.formatter.base import Formatter
 +import lxml.etree as ET
@@ -527,9 +523,8 @@ diff -up behave-1.2.3/behave/formatter/html.py.HTMLformatter behave-1.2.3/behave
 +        # Sending the report to stream
 +        if len(self.all_features) > 0:
 +            self.stream.write(ET.tostring(self.html, pretty_print = True))
-diff -up behave-1.2.3/behave/formatter/report.css.HTMLformatter behave-1.2.3/behave/formatter/report.css
---- behave-1.2.3/behave/formatter/report.css.HTMLformatter	2013-10-29 18:17:28.945010011 +0100
-+++ behave-1.2.3/behave/formatter/report.css	2013-10-29 18:17:28.945010011 +0100
+--- /dev/null
++++ b/behave/formatter/report.css
 @@ -0,0 +1,212 @@
 +body {
 +  font-size: 0px;
@@ -743,10 +738,9 @@ diff -up behave-1.2.3/behave/formatter/report.css.HTMLformatter behave-1.2.3/beh
 +.behave #summary #totals, td #summary #totals, th #summary #totals {
 +  font-size: 1.2em;
 +}
-diff -up behave-1.2.3/behave/runner.py.HTMLformatter behave-1.2.3/behave/runner.py
---- behave-1.2.3/behave/runner.py.HTMLformatter	2013-06-26 22:21:00.000000000 +0200
-+++ behave-1.2.3/behave/runner.py	2013-10-29 18:17:28.945010011 +0100
-@@ -241,6 +241,11 @@ class Context(object):
+--- a/behave/runner.py
++++ b/behave/runner.py
+@@ -254,6 +254,11 @@ class Context(object):
                  return True
          return False
  
@@ -758,9 +752,8 @@ diff -up behave-1.2.3/behave/runner.py.HTMLformatter behave-1.2.3/behave/runner.
      def execute_steps(self, steps_text):
          '''The steps identified in the "steps" text string will be parsed and
          executed in turn just as though they were defined in a feature file.
-diff -up behave-1.2.3/features/formatter.help.feature.HTMLformatter behave-1.2.3/features/formatter.help.feature
---- behave-1.2.3/features/formatter.help.feature.HTMLformatter	2013-06-27 00:19:16.000000000 +0200
-+++ behave-1.2.3/features/formatter.help.feature	2013-10-29 18:17:28.946010012 +0100
+--- a/features/formatter.help.feature
++++ b/features/formatter.help.feature
 @@ -11,6 +11,7 @@ Feature: Help Formatter
      And the command output should contain:
        """
@@ -769,9 +762,8 @@ diff -up behave-1.2.3/features/formatter.help.feature.HTMLformatter behave-1.2.3
          json           JSON dump of test run
          json.pretty    JSON dump of test run (human readable)
          null           Provides formatter that does not output anything.
-diff -up behave-1.2.3/features/formatter.html.feature.HTMLformatter behave-1.2.3/features/formatter.html.feature
---- behave-1.2.3/features/formatter.html.feature.HTMLformatter	2013-10-29 18:17:28.946010012 +0100
-+++ behave-1.2.3/features/formatter.html.feature	2013-10-29 18:17:28.946010012 +0100
+--- /dev/null
++++ b/features/formatter.html.feature
 @@ -0,0 +1,822 @@
 + at sequential
 +Feature: HTML Formatter
@@ -1595,15 +1587,14 @@ diff -up behave-1.2.3/features/formatter.html.feature.HTMLformatter behave-1.2.3
 +              </ol>
 +            </div>
 +            """
-diff -up behave-1.2.3/setup.py.HTMLformatter behave-1.2.3/setup.py
---- behave-1.2.3/setup.py.HTMLformatter	2013-07-08 22:31:19.000000000 +0200
-+++ behave-1.2.3/setup.py	2013-10-29 18:19:01.800131040 +0100
-@@ -27,6 +27,8 @@ setup(
-     entry_points={
-         'console_scripts': ['behave = behave.__main__:main'],
+--- a/setup.py
++++ b/setup.py
+@@ -73,6 +73,8 @@ setup(
+             "behave_test = setuptools_behave:behave_test"
+         ]
      },
 +    package_data={'': ['report.css']},
 +    include_package_data=True,
      install_requires=requirements,
-     use_2to3=True,
-     license="BSD",
+     test_suite="nose.collector",
+     tests_require=["nose>=1.3", "mock>=1.0", "PyHamcrest>=1.8"],
diff --git a/python-behave.spec b/python-behave.spec
index 91b1a61..8f77d49 100644
--- a/python-behave.spec
+++ b/python-behave.spec
@@ -11,8 +11,8 @@
 %global modname behave
 
 Name:               python-%{modname}
-Version:            1.2.3
-Release:            14%{?dist}
+Version:            1.2.4
+Release:            1%{?dist}
 Summary:            Tools for the behavior-driven development, Python style
 
 License:            BSD
@@ -157,6 +157,9 @@ nosetests -v
 
 
 %changelog
+* Thu Jun 19 2014 Matěj Cepl <mcepl at redhat.com> - 1.2.4-1
+- New upstream release
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 7796fcb..a7e9917 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5191bc75c4de7051abbec73c93b399e9  behave-1.2.3.tar.gz
+13c21668c1434f67941955ffe9e12d26  behave-1.2.4.tar.gz


More information about the scm-commits mailing list