[Python-modules-commits] [parsedatetime] 04/11: Drop the patch queue, no longer required

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Wed Jul 12 10:59:24 UTC 2017


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/experimental
in repository parsedatetime.

commit 24a2c127a3099347220571d275f94b760c235358
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Jul 12 11:14:22 2017 +0100

    Drop the patch queue, no longer required
---
 .../Add-upstream-pytest-configuration.patch        | 18 ----------
 .../Conditional-requirement-on-pytest-runner.patch | 41 ----------------------
 debian/patches/series                              |  2 --
 3 files changed, 61 deletions(-)

diff --git a/debian/patches/Add-upstream-pytest-configuration.patch b/debian/patches/Add-upstream-pytest-configuration.patch
deleted file mode 100644
index 9ab0fb7..0000000
--- a/debian/patches/Add-upstream-pytest-configuration.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Sat, 11 Mar 2017 10:52:02 +0000
-Subject: Add upstream pytest configuration
-
----
- setup.cfg | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/setup.cfg b/setup.cfg
-index c28269b..42ad559 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -16,3 +16,5 @@ tag_build =
- tag_date = 0
- tag_svn_revision = 0
- 
-+[tool:pytest]
-+python_files=Test*.py
diff --git a/debian/patches/Conditional-requirement-on-pytest-runner.patch b/debian/patches/Conditional-requirement-on-pytest-runner.patch
deleted file mode 100644
index a27d44c..0000000
--- a/debian/patches/Conditional-requirement-on-pytest-runner.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Sat, 11 Mar 2017 07:09:38 +0000
-Subject: Conditional requirement on pytest-runner
-
----
- setup.py | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index b6d4b29..27e43af 100644
---- a/setup.py
-+++ b/setup.py
-@@ -4,6 +4,7 @@
- import os
- import re
- import codecs
-+import sys
- 
- from setuptools import setup, find_packages
- 
-@@ -23,6 +24,11 @@ def extract_metaitem(meta):
-         return meta_match.group(1)
-     raise RuntimeError('Unable to find __{meta}__ string.'.format(meta=meta))
- 
-+# Conditional requirement for pytest-runner,
-+# see <https://github.com/pytest-dev/pytest-runner#conditional-requirement>
-+needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
-+pytest_runner = ['pytest-runner'] if needs_pytest else []
-+
- setup(
-     name='parsedatetime',
-     version=extract_metaitem('version'),
-@@ -36,7 +42,7 @@ setup(
-     platforms=['Any'],
-     long_description=read('README.rst'),
-     install_requires=['future'],
--    setup_requires=['pytest-runner'],
-+    setup_requires=pytest_runner,
-     tests_require=['pytest'],
-     test_suite='tests',
-     classifiers=[
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 14687ba..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-Conditional-requirement-on-pytest-runner.patch
-Add-upstream-pytest-configuration.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/parsedatetime.git



More information about the Python-modules-commits mailing list