Remove outdated requirements, and fix another test

Author: jonbannister

pytest-devpi-server/setup.py

@@ -23,12 +23,9 @@
                     'devpi-server>=3.0.1',
                     'devpi-client',
                     'six',
-                    'ruamel.yaml>=0.15;python_version == "2.7"',
-                    'ruamel.yaml>=0.15;python_version > "3.4"',
+                    'ruamel.yaml>=0.15',
                     ]
 
-tests_require = []
-
 entry_points = {
     'pytest11': [
         'devpi_server = _pytest_devpi_server',
@@ -44,7 +41,6 @@
         author_email='[email protected]',
         classifiers=classifiers,
         install_requires=install_requires,
-        tests_require=tests_require,
         packages=find_packages(exclude='tests'),
         entry_points=entry_points,
     ))

pytest-devpi-server/tests/integration/test_devpi_server.py

@@ -1,4 +1,5 @@
 import json
+import os
 from pathlib import Path
 
 NEW_INDEX = {
@@ -25,7 +26,7 @@ def test_server(devpi_server):
 
 def test_upload(devpi_server):
     pkg_dir: Path = devpi_server.workspace / "pkg"
-    pkg_dir.mkdir(exist_ok=True)
+    pkg_dir.mkdir(parents=True, exist_ok=True)
     setup_py = pkg_dir / "setup.py"
     setup_py.write_text(
         """
@@ -34,11 +35,16 @@ def test_upload(devpi_server):
       version='1.2.3')
 """
     )
-    devpi_server.api("upload")
-    res = devpi_server.api(
-        "getjson", "/{}/{}".format(devpi_server.user, devpi_server.index)
-    )
-    assert json.loads(res)["result"]["projects"] == ["test-foo"]
+    orig_dir = os.getcwd()
+    try:
+        os.chdir(pkg_dir)
+        devpi_server.api("upload")
+        res = devpi_server.api(
+            "getjson", "/{}/{}".format(devpi_server.user, devpi_server.index)
+        )
+        assert json.loads(res)["result"]["projects"] == ["test-foo"]
+    finally:
+        os.chdir(orig_dir)
 
 
 def test_function_index(devpi_server, devpi_function_index):

pytest-server-fixtures/setup.py

@@ -38,7 +38,6 @@
 }
 
 tests_require = [
-                 'mock; python_version<"3.3"',
                  'psutil',
                  ]