Fix tests by updating requirements

.travis.yml

@@ -7,4 +7,4 @@ install:
   - "pip install -r requirements.txt"
   - "pip freeze"
 script: 
-  - nosetests
+  - pytest

README.md

@@ -11,7 +11,7 @@ How to run the tests
 
 Run the tests
 
-    nosetests
+    pytest
 
 Travis runs the tests without LDAP support. If you want to enable them (as we do
 internally to check against our own LDAP server), replace the configuration in

requirements.in

@@ -4,4 +4,3 @@ devpi-ldap
 devpi-plumber[test]
 devpi-server
 devpi-web
-ldap3<2  # devpi-ldap is incompatible with ldap3>=2

requirements.txt

@@ -2,66 +2,75 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --no-index --upgrade --output-file requirements.txt requirements.in
+#    pip-compile --no-index requirements.in
 #
 apipkg==1.5               # via execnet
 appdirs==1.4.3            # via devpi-server
 argon2-cffi==19.1.0       # via passlib
-beautifulsoup4==4.7.1     # via devpi-web
+attrs==19.1.0             # via packaging
+beautifulsoup4==4.8.0     # via devpi-web
 bleach==3.1.0             # via readme-renderer
-certifi==2018.11.29       # via requests
-cffi==1.12.2              # via argon2-cffi, cmarkgfm
-chameleon==3.6            # via pyramid-chameleon
+certifi==2019.6.16        # via requests
+cffi==1.12.3              # via argon2-cffi, cmarkgfm
+chameleon==3.6.2          # via pyramid-chameleon
 chardet==3.0.4            # via requests
-check-manifest==0.37      # via devpi-client
+check-manifest==0.39      # via devpi-client
 cmarkgfm==0.4.2           # via readme-renderer
-defusedxml==0.5.0         # via devpi-web
-devpi-client==4.2.0
-devpi-common==3.3.1
+defusedxml==0.6.0         # via devpi-web
+devpi-client==5.0.0
+devpi-common==3.4.0
 devpi-ldap==1.2.2
-devpi-plumber[test]==0.5.0
-devpi-server==4.8.0
-devpi-web==3.5.0
-docutils==0.14            # via devpi-web, readme-renderer
-execnet==1.5.0            # via devpi-server
-filelock==3.0.10          # via tox
-hupper==1.5               # via pyramid
+devpi-plumber[test]==0.5.1
+devpi-server==5.1.0
+devpi-web==3.5.2
+docutils==0.15.2          # via devpi-web, readme-renderer
+execnet==1.6.1            # via devpi-server
+filelock==3.0.12          # via tox
+hupper==1.8.1             # via pyramid
 idna==2.8                 # via requests
+importlib-metadata==0.19  # via pluggy, tox
 itsdangerous==1.1.0       # via devpi-server
-ldap3==2.6
+ldap3==2.6                # via devpi-ldap
+packaging==19.1           # via tox
 passlib[argon2]==1.7.1    # via devpi-server
 pastedeploy==2.0.1        # via plaster-pastedeploy
 pkginfo==1.5.0.1          # via devpi-client
-plaster-pastedeploy==0.6  # via pyramid
+plaster-pastedeploy==0.7  # via pyramid
 plaster==1.0              # via plaster-pastedeploy, pyramid
-pluggy==0.9.0             # via devpi-client, devpi-server, tox
+pluggy==0.12.0            # via devpi-client, devpi-server, tox
 py==1.8.0                 # via devpi-client, devpi-common, devpi-server, tox
-pyasn1==0.4.5             # via ldap3
+pyasn1==0.4.6             # via ldap3
 pycparser==2.19           # via cffi
-pygments==2.3.1           # via devpi-web, readme-renderer
+pygments==2.4.2           # via devpi-web, readme-renderer
+pyparsing==2.4.2          # via packaging
 pyramid-chameleon==0.3    # via devpi-web
-pyramid==1.10.2           # via devpi-server, devpi-web, pyramid-chameleon
+pyramid==1.10.4           # via devpi-server, devpi-web, pyramid-chameleon
 python-dateutil==2.8.0    # via strictyaml
-pyyaml==3.13              # via devpi-ldap
+pyyaml==5.1.2             # via devpi-ldap
 readme-renderer[md]==24.0  # via devpi-web
 repoze.lru==0.7           # via devpi-server
-requests==2.21.0          # via devpi-common
-ruamel.yaml==0.15.89      # via strictyaml
-six==1.12.0               # via argon2-cffi, bleach, devpi-plumber, python-dateutil, readme-renderer, tox
-soupsieve==1.8            # via beautifulsoup4
-strictyaml==1.0.0         # via devpi-server
-toml==0.10.0              # via tox
-tox==3.7.0                # via devpi-client
+requests==2.22.0          # via devpi-common
+ruamel.yaml.clib==0.1.0   # via ruamel.yaml
+ruamel.yaml==0.16.0       # via strictyaml
+six==1.12.0               # via argon2-cffi, bleach, devpi-plumber, packaging, python-dateutil, readme-renderer, tox
+soupsieve==1.9.2          # via beautifulsoup4
+strictyaml==1.0.3         # via devpi-server
+toml==0.10.0              # via check-manifest, tox
+tox==3.13.2               # via devpi-client
 translationstring==1.3    # via pyramid
-twitter.common.contextutil==0.3.9  # via devpi-plumber
-twitter.common.dirutil==0.3.9  # via twitter.common.contextutil
-twitter.common.lang==0.3.9  # via twitter.common.dirutil
-urllib3==1.24.1           # via requests
+twitter.common.contextutil==0.3.11  # via devpi-plumber
+twitter.common.dirutil==0.3.11  # via twitter.common.contextutil
+twitter.common.lang==0.3.11  # via twitter.common.dirutil
+urllib3==1.25.3           # via requests
 venusian==1.2.0           # via pyramid
-virtualenv==16.4.3        # via tox
-waitress==1.2.1           # via devpi-server
+virtualenv==16.7.2        # via tox
+waitress==1.3.0           # via devpi-server
 webencodings==0.5.1       # via bleach
 webob==1.8.5              # via pyramid
 whoosh==2.7.4             # via devpi-web
+zipp==0.5.2               # via importlib-metadata
 zope.deprecation==4.4.0   # via pyramid
 zope.interface==4.6.0     # via pyramid
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools==41.0.1        # via plaster, pyramid, zope.deprecation, zope.interface

requirements_dev.txt

@@ -1,4 +1,4 @@
 pip>7.0
 pip-tools>=1.6
-nose
+pytest
 sphinx

setup.py

@@ -16,13 +16,9 @@
         'devpi-plumber',
         'devpi-ldap'
     ],
-    setup_requires=[
-        'nose'
-    ],
     tests_require=[
-        'nose'
+        'pytest'
     ],
-    test_suite='nose.collector',
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Console',

tests/fixture/valid-ldap.yaml

@@ -3,10 +3,10 @@
 devpi-ldap:
   url: ldap://ldap.forumsys.com
   user_search:
-    base: OU=scientists,DC=example,DC=com
-    filter: (&(objectClass=user)(sAMAccountName={username}))
-    attribute_name: distinguishedName
+    base: DC=example,DC=com
+    filter: (&(objectClass=inetOrgPerson)(uid={username}))
+    attribute_name: CN
   group_search:
-    base: OU=scientists,DC=example,DC=com
-    filter: (&(objectClass=group)(member={userdn}))
+    base: DC=example,DC=com
+    filter: (&(objectClass=groupOfUniqueNames)(uniqueMember={userdn}))
     attribute_name: CN