Merge 2fa97f8 into 986d7ca

CHANGELOG.rst

@@ -1,3 +1,8 @@
+0.5.1
+-----
+
+- Improve compatibility with Devpi 5.x by not processing events during state import.
+
 0.5.0
 -----
 

devpi_plumber/server.py

@@ -44,7 +44,7 @@ def TestServer(users={}, indices={}, config={}, fail_on_output=['Traceback']):
 
 def import_state(serverdir, importdir):
     devpi_server_command(serverdir=serverdir, init=None)
-    devpi_server_command(serverdir=serverdir, **{'import': importdir})
+    devpi_server_command(serverdir=serverdir, **{'import': importdir, 'no-events': None})
 
 
 def export_state(serverdir, exportdir):

requirements.in

@@ -17,3 +17,5 @@ sphinx
 
 # special cases to support multiple python versions
 more-itertools<6.0.0
+pytest<5  # Python 2
+sphinx<2  # Python 2

requirements.txt

@@ -2,70 +2,76 @@
 # 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
 #
 alabaster==0.7.12         # via sphinx
 apipkg==1.5               # via execnet
 appdirs==1.4.3            # via devpi-server
 argon2-cffi==19.1.0       # via passlib
 atomicwrites==1.3.0       # via pytest
-attrs==19.1.0             # via pytest
-babel==2.6.0              # via sphinx
-certifi==2018.11.29       # via requests
-cffi==1.12.2              # via argon2-cffi
+attrs==19.1.0             # via packaging, pytest
+babel==2.7.0              # via sphinx
+certifi==2019.6.16        # via requests
+cffi==1.12.3              # via argon2-cffi
 chardet==3.0.4            # via requests
-check-manifest==0.37      # via devpi-client
-coverage==4.5.2           # via pytest-cov
-devpi-client==4.2.0
-devpi-common==3.3.1       # via devpi-client, devpi-server
-devpi-server==4.8.0
-docutils==0.14            # via sphinx
-execnet==1.5.0            # via devpi-server
-filelock==3.0.10          # via tox
-hupper==1.5               # via pyramid
+check-manifest==0.39      # via devpi-client
+coverage==4.5.4           # via pytest-cov
+devpi-client==5.0.0
+devpi-common==3.4.0       # via devpi-client, devpi-server
+devpi-server==5.1.0
+docutils==0.15.2          # via sphinx
+execnet==1.6.1            # via devpi-server
+filelock==3.0.12          # via tox
+hupper==1.8.1             # via pyramid
 idna==2.8                 # via requests
 imagesize==1.1.0          # via sphinx
+importlib-metadata==0.19  # via pluggy, pytest, tox
 itsdangerous==1.1.0       # via devpi-server
-jinja2==2.10              # via sphinx
+jinja2==2.10.1            # via sphinx
 markupsafe==1.1.1         # via jinja2
-mock==2.0.0
+mock==3.0.5
 more-itertools==5.0.0
-packaging==19.0           # via sphinx
+packaging==19.1           # via pytest, sphinx, tox
 passlib[argon2]==1.7.1    # via devpi-server
 pastedeploy==2.0.1        # via plaster-pastedeploy
-pbr==5.1.3                # via mock
 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, pytest, tox
+pluggy==0.12.0            # via devpi-client, devpi-server, pytest, tox
 py==1.8.0                 # via devpi-client, devpi-common, devpi-server, pytest, tox
 pycparser==2.19           # via cffi
-pygments==2.3.1           # via sphinx
-pyparsing==2.3.1          # via packaging
-pyramid==1.10.2           # via devpi-server
-pytest-cov==2.6.1
-pytest==4.3.0
+pygments==2.4.2           # via sphinx
+pyparsing==2.4.2          # via packaging
+pyramid==1.10.4           # via devpi-server
+pytest-cov==2.7.1
+pytest==4.6.4
 python-dateutil==2.8.0    # via strictyaml
-pytz==2018.9              # via babel
+pytz==2019.2              # via babel
 repoze.lru==0.7           # via devpi-server
-requests==2.21.0          # via devpi-common, sphinx
-ruamel.yaml==0.15.89      # via strictyaml
-setuptools-scm==3.2.0
+requests==2.22.0          # via devpi-common, sphinx
+ruamel.yaml.clib==0.1.0   # via ruamel.yaml
+ruamel.yaml==0.16.0       # via strictyaml
+setuptools-scm==3.3.3
 six==1.12.0               # via argon2-cffi, mock, more-itertools, packaging, pytest, python-dateutil, sphinx, tox
-snowballstemmer==1.2.1    # via sphinx
-sphinx==1.8.4
-sphinxcontrib-websupport==1.1.0  # via sphinx
-strictyaml==1.0.0         # via devpi-server
-toml==0.10.0              # via tox
-tox==3.7.0                # via devpi-client
+snowballstemmer==1.9.0    # via sphinx
+sphinx==1.8.5
+sphinxcontrib-websupport==1.1.2  # via sphinx
+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
-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
+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
+wcwidth==0.1.7            # via pytest
 webob==1.8.5              # via pyramid
+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, sphinx, zope.deprecation, zope.interface

setup.py

@@ -28,6 +28,7 @@
         'test': ['devpi-server>=4.2.1'],
     },
     tests_require=[
+        'mock',
         'pytest',
         'pytest-cov',
     ],