Skip to content

Commit 50c6ae9

Browse files
committed
devpi now requires devpi-init for initialization.
Updating so tests now work. See https://pypi.org/project/devpi-server/5.2.0/
1 parent b21eef7 commit 50c6ae9

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

pytest-devpi-server/_pytest_devpi_server/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,8 @@ def pre_setup(self):
121121
log.info("Extracting initial server data from {}".format(self.data))
122122
zipfile.ZipFile(self.data, 'r').extractall(self.server_dir)
123123
else:
124-
self.run([sys.executable, '-c', 'import sys; from devpi_server.main import main; sys.exit(main())',
124+
self.run([sys.exec_prefix + "/bin/devpi-init",
125125
'--serverdir', self.server_dir,
126-
'--init',
127126
])
128127

129128

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
u"acl_upload": [u"testuser"],
77
u"bases": [],
88
u"mirror_whitelist": [],
9+
u"mirror_whitelist_inheritance": u"intersection",
910
u"projects": [],
1011
u"type": u"stage",
1112
u"volatile": True,

0 commit comments

Comments
 (0)