Merge pull request #180 from Smattacus/dev.smattacus.devpi-server.update

devpi now requires devpi-init for initialization.

Author: eeaston

pytest-devpi-server/_pytest_devpi_server/__init__.py

@@ -121,9 +121,8 @@ def pre_setup(self):
             log.info("Extracting initial server data from {}".format(self.data))
             zipfile.ZipFile(self.data, 'r').extractall(self.server_dir)
         else:
-            self.run([sys.executable, '-c', 'import sys; from devpi_server.main import main; sys.exit(main())',
+            self.run([os.path.join(sys.exec_prefix, "bin", "devpi-init"),
                     '--serverdir', self.server_dir,
-                    '--init',
                     ])
 
 

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

@@ -6,6 +6,7 @@
         u"acl_upload": [u"testuser"],
         u"bases": [],
         u"mirror_whitelist": [],
+        u"mirror_whitelist_inheritance": u"intersection",
         u"projects": [],
         u"type": u"stage",
         u"volatile": True,