summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/mockldap/files')
-rw-r--r--dev-python/mockldap/files/mapping.patch12
-rw-r--r--dev-python/mockldap/files/python-ldap-3.patch47
2 files changed, 0 insertions, 59 deletions
diff --git a/dev-python/mockldap/files/mapping.patch b/dev-python/mockldap/files/mapping.patch
deleted file mode 100644
index b8c25eca5833..000000000000
--- a/dev-python/mockldap/files/mapping.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Disable un-needed d'loading during doc build
-diff -ur mockldap-0.1.7.orig/docs/source/conf.py mockldap-0.1.7/docs/source/conf.py
---- a/docs/source/conf.py 2014-03-08 00:51:00.000000000 +0800
-+++ b/docs/source/conf.py 2014-04-12 16:04:52.113446583 +0800
-@@ -28,7 +28,6 @@
- # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
- extensions = [
- 'sphinx.ext.autodoc',
-- 'sphinx.ext.intersphinx',
- 'sphinx.ext.viewcode',
- ]
-
diff --git a/dev-python/mockldap/files/python-ldap-3.patch b/dev-python/mockldap/files/python-ldap-3.patch
deleted file mode 100644
index e047032ed56c..000000000000
--- a/dev-python/mockldap/files/python-ldap-3.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-# HG changeset patch
-# User Jon Dufresne <jon.dufresne@gmail.com>
-# Date 1521133853 25200
-# Node ID c938f5b558833dd290bbdcbde26c97a6bbfea623
-# Parent 8784bdea1cb29b2a5b5d21045b024880ab84c05d
-Unify Python 2 and 3 dependency on python-ldap >= 3.0
-
-python-ldap now supports both Python 2 and 3. The pyldap package is
-deprecated. The project recommends switching to python-ldap instead.
-From the github page:
-
-https://github.com/pyldap/pyldap
-
-> THIS FORK IS DEPRECATED
->
-> The pyldap fork was merged back into python-ldap, and released as
-> python-ldap 3.0.0b1.
-
-diff --git a/README b/README
---- a/README
-+++ b/README
-@@ -1,6 +1,6 @@
--This project provides a mock replacement for python-ldap (pyldap on Python
--3). It's useful for any project that would like to write unit tests against
--LDAP code without relying on a running LDAP server.
-+This project provides a mock replacement for python-ldap. It's useful for any
-+project that would like to write unit tests against LDAP code without relying
-+on a running LDAP server.
-
- * Repository: https://bitbucket.org/psagers/mockldap
- * Documentation: https://mockldap.readthedocs.io/
-diff --git a/setup.py b/setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -40,11 +40,8 @@
- keywords=['mock', 'ldap'],
- install_requires=[
- 'funcparserlib == 0.3.6',
--
-- 'pyldap; python_version >= "3.0"',
-- 'python-ldap >= 2.0; python_version < "3.0"',
--
- 'mock; python_version < "3.0"',
-+ 'python-ldap >= 3.0',
- ],
- setup_requires=[
- 'setuptools >= 0.6c11',