Skip to content

Commit

Permalink
Update mockldap
Browse files Browse the repository at this point in the history
User our fork of mockldap (https://github.com/psagers/mockldap) that relaxes
its dependency on funcparserlib so we can get funcparserlib 1.x installed since
older versions are not compatible with recent versions of setuptools.

Fixes archivematica/Issues#1499.
  • Loading branch information
sevein committed Sep 27, 2021
1 parent 653b326 commit f34f66a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion requirements-dev-py3.in
Expand Up @@ -2,7 +2,7 @@

coverage==4.2
mock
mockldap==0.2.8
git+https://github.com/artefactual-labs/mockldap@v0.3.1#egg=mockldap
pytest>=4,<5
pytest-cov==2.4.0
pytest-django>=3,<4
Expand Down
8 changes: 4 additions & 4 deletions requirements-dev-py3.txt
Expand Up @@ -33,7 +33,7 @@ django-tastypie==0.13.2 # via -r requirements-py3.txt
django==1.11.29 # via -r requirements-py3.txt, django-auth-ldap, django-cas-ng, django-csp, mozilla-django-oidc
elasticsearch==6.8.2 # via -r requirements-py3.txt
filelock==3.0.12 # via tox, virtualenv
funcparserlib==0.3.6 # via mockldap
funcparserlib==1.0.0a0 # via mockldap
future==0.18.2 # via -r requirements-py3.txt, metsrw
gearman3==0.2.1 ; python_version >= "3" # via -r requirements-py3.txt
gevent==1.3.6 # via -r requirements-py3.txt
Expand All @@ -50,7 +50,7 @@ logutils==0.3.3 # via -r requirements-py3.txt
lxml==4.6.3 # via -r requirements-py3.txt, ammcpc, metsrw, python-cas
metsrw==0.3.20 # via -r requirements-py3.txt
mock==4.0.3 # via -r requirements-dev-py3.in
mockldap==0.2.8 # via -r requirements-dev-py3.in
git+https://github.com/artefactual-labs/mockldap@v0.3.1#egg=mockldap # via -r requirements-dev-py3.in
more-itertools==8.8.0 # via pytest
mozilla-django-oidc==1.2.4 # via -r requirements-py3.txt
multidict==5.1.0 # via yarl
Expand All @@ -66,7 +66,7 @@ py==1.10.0 # via pytest, tox
pyasn1-modules==0.2.8 # via -r requirements-py3.txt, python-ldap
pyasn1==0.4.8 # via -r requirements-py3.txt, ndg-httpsclient, pyasn1-modules, python-ldap
pycparser==2.20 # via -r requirements-py3.txt, cffi
pyldap==3.0.0.post1 # via -r requirements-py3.txt, django-auth-ldap, mockldap
pyldap==3.0.0.post1 # via -r requirements-py3.txt, django-auth-ldap
pyopenssl==20.0.1 # via -r requirements-py3.txt, josepy, ndg-httpsclient
pyparsing==2.4.7 # via packaging
pytest-cov==2.4.0 # via -r requirements-dev-py3.in
Expand All @@ -77,7 +77,7 @@ pytest-randomly==1.2.3 # via -r requirements-dev-py3.in
pytest==4.6.11 # via -r requirements-dev-py3.in, pytest-cov, pytest-django, pytest-mock, pytest-pythonpath, pytest-randomly
python-cas==1.5.0 # via -r requirements-py3.txt, django-cas-ng
python-dateutil==2.6.0 # via -r requirements-py3.txt, django-tastypie
python-ldap==3.2.0 # via -r requirements-py3.txt, pyldap
python-ldap==3.2.0 # via -r requirements-py3.txt, mockldap, pyldap
python-mimeparse==1.6.0 # via -r requirements-py3.txt, django-tastypie
pytz==2021.1 # via -r requirements-py3.txt, django
pyyaml==5.4.1 # via vcrpy
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.in
Expand Up @@ -2,7 +2,7 @@

coverage==4.2
mock
mockldap==0.2.8
git+https://github.com/artefactual-labs/mockldap@v0.3.1#egg=mockldap
pytest>=4,<5
pytest-cov==2.4.0
pytest-django>=3,<4
Expand Down
4 changes: 2 additions & 2 deletions requirements-dev.txt
Expand Up @@ -38,7 +38,7 @@ django==1.11.29 # via -r requirements.txt, django-auth-ldap, django-ca
elasticsearch==6.8.2 # via -r requirements.txt
enum34==1.1.6 ; python_version < "3.4" # via -r requirements.txt, cryptography
filelock==3.0.12 # via tox, virtualenv
funcparserlib==0.3.6 # via mockldap
funcparserlib==1.0.0a0 # via mockldap
funcsigs==1.0.2 # via mock, pytest
functools32==3.2.3.post2 # via -r requirements.txt, jsonschema
future==0.18.2 # via -r requirements.txt, metsrw
Expand All @@ -59,7 +59,7 @@ logutils==0.3.3 # via -r requirements.txt
lxml==4.6.3 # via -r requirements.txt, ammcpc, metsrw, python-cas
metsrw==0.3.20 # via -r requirements.txt
mock==3.0.5 # via -r requirements-dev.in, mockldap, pytest-mock, vcrpy
mockldap==0.2.8 # via -r requirements-dev.in
git+https://github.com/artefactual-labs/mockldap@v0.3.1#egg=mockldap # via -r requirements-dev.in
more-itertools==5.0.0 # via pytest
mozilla-django-oidc==1.2.4 # via -r requirements.txt
mysqlclient==1.4.6 # via -r requirements.txt, agentarchives
Expand Down

0 comments on commit f34f66a

Please sign in to comment.