devpi-server 6.12.0__tar.gz → 6.12.1__tar.gz

{devpi_server-6.12.0 → devpi-server-6.12.1}/CHANGELOG

@@ -2,6 +2,20 @@
 
 .. towncrier release notes start
 
+6.12.1 (2024-07-24)
+===================
+
+Bug Fixes
+---------
+
+- Support Python 3.13 by depending on legacy-cgi.
+
+- Preserve query string when proxying requests from replica to primary. This fixes force removal on non-volatile indexes and probably other bugs.
+
+- Fix #1044: Correctly update cache expiry time when mirrored server returns 304 Not Modified.
+
+
+
 6.12.0 (2024-06-25)
 ===================
 

{devpi_server-6.12.0 → devpi-server-6.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devpi-server
-Version: 6.12.0
+Version: 6.12.1
 Summary: devpi-server: reliable private and pypi.org caching server
 Home-page: https://devpi.net
 Maintainer: Florian Schulze
@@ -27,25 +27,10 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.7
 License-File: LICENSE
 License-File: AUTHORS
-Requires-Dist: py>=1.4.23
-Requires-Dist: httpx
-Requires-Dist: argon2-cffi
-Requires-Dist: attrs>=21.3.0
-Requires-Dist: defusedxml
-Requires-Dist: devpi_common<5,>3.6.0
-Requires-Dist: itsdangerous>=0.24
-Requires-Dist: platformdirs
-Requires-Dist: pyramid>=2
-Requires-Dist: waitress>=1.0.1
-Requires-Dist: repoze.lru>=0.6
-Requires-Dist: passlib[argon2]
-Requires-Dist: pluggy<2.0,>=0.6.0
-Requires-Dist: ruamel.yaml
-Requires-Dist: strictyaml
-Requires-Dist: lazy
 
 =============================================================================
 devpi-server: server for private package indexes and PyPI caching
@@ -119,6 +104,20 @@ Changelog
 
 .. towncrier release notes start
 
+6.12.1 (2024-07-24)
+===================
+
+Bug Fixes
+---------
+
+- Support Python 3.13 by depending on legacy-cgi.
+
+- Preserve query string when proxying requests from replica to primary. This fixes force removal on non-volatile indexes and probably other bugs.
+
+- Fix #1044: Correctly update cache expiry time when mirrored server returns 304 Not Modified.
+
+
+
 6.12.0 (2024-06-25)
 ===================
 
@@ -188,14 +187,3 @@ Bug Fixes
 
 - Prevent duplicates when adding values to lists in index configuration with ``+=`` operator.
 
-
-6.9.1 (2023-07-02)
-==================
-
-Bug Fixes
----------
-
-- Prevent error in find_pre_existing_file in case of incomplete metadata.
-
-- Fix #980: Remove long deprecated backward compatibility for old pluggy versions to fix error with pluggy 1.1.0.
-

devpi-server-6.12.1/devpi_server/__init__.py

@@ -0,0 +1 @@
+__version__ = '6.12.1'

{devpi_server-6.12.0 → devpi-server-6.12.1}/devpi_server/config.py

@@ -321,27 +321,15 @@ def add_deploy_options(parser, pluginmanager):
 
     parser.addoption(
         "--argon2-memory-cost", type=int, default=DEFAULT_ARGON2_MEMORY_COST,
-        help="Argon2 memory cost parameter for key derivation. "
-             "This is *not* for the user password hashes. "
-             "There should be no need to touch this setting, "
-             "except you really know what this is about! "
-             "Replicas need to use the same parameters as the master.")
+        help=argparse.SUPPRESS)
 
     parser.addoption(
         "--argon2-parallelism", type=int, default=DEFAULT_ARGON2_PARALLELISM,
-        help="Argon2 parallelism parameter for key derivation. "
-             "This is *not* for the user password hashes. "
-             "There should be no need to touch this setting, "
-             "except you really know what this is about! "
-             "Replicas need to use the same parameters as the master.")
+        help=argparse.SUPPRESS)
 
     parser.addoption(
         "--argon2-time-cost", type=int, default=DEFAULT_ARGON2_TIME_COST,
-        help="Argon2 time cost parameter for key derivation. "
-             "This is *not* for the user password hashes. "
-             "There should be no need to touch this setting, "
-             "except you really know what this is about! "
-             "Replicas need to use the same parameters as the master.")
+        help=argparse.SUPPRESS)
 
     parser.addoption(
         "--requests-only", action="store_true",
@@ -567,7 +555,7 @@ class MyArgumentParser(argparse.ArgumentParser):
             default = action.default
             if isinstance(action, argparse._StoreFalseAction):
                 default = not default
-            if action.help and action.default != '==SUPPRESS==':
+            if action.help and action.help is not argparse.SUPPRESS and action.default is not argparse.SUPPRESS:
                 action.help += " [%s]" % default
 
     def addgroup(self, *args, **kwargs):

{devpi_server-6.12.0 → devpi-server-6.12.1}/devpi_server/keyfs.py

@@ -673,13 +673,9 @@ class Transaction(object):
     def exists(self, typedkey):
         if typedkey in self.cache:
             val = self.cache[typedkey]
-            if val in (absent, deleted):
-                return False
-            return True
+            return val not in (absent, deleted)
         (serial, val) = self.get_original(typedkey)
-        if val in (absent, deleted):
-            return False
-        return True
+        return val not in (absent, deleted)
 
     def delete(self, typedkey):
         if not self.write:
@@ -692,7 +688,7 @@ class Transaction(object):
             raise self.keyfs.ReadOnly()
         # sanity check for dictionaries: we always want to have unicode
         # keys, not bytes
-        if typedkey.type == dict:
+        if typedkey.type is dict:
             check_unicode_keys(val)
         assert val is not None
         self.cache[typedkey] = val

{devpi_server-6.12.0 → devpi-server-6.12.1}/devpi_server/mirror.py

@@ -794,8 +794,8 @@ class MirrorStage(BaseStage):
                 f"timeout after {self.timeout} seconds while getting data for {project!r}")
         except self.UpstreamNotModified as e:
             if links is not None:
-                self.keyfs.tx.on_commit_success(partial(
-                    self.cache_retrieve_times.refresh, project, e.etag))
+                # immediately update the cache
+                self.cache_retrieve_times.refresh(project, e.etag)
                 return self.SimpleLinks(links)
             if e.etag is None:
                 threadlog.error(

{devpi_server-6.12.0 → devpi-server-6.12.1}/devpi_server/model.py

@@ -42,9 +42,9 @@ def join_links_data(links, requires_python, yanked):
     # build list of (key, href, require_python, yanked) tuples
     result = []
     links = zip_longest(links, requires_python, yanked, fillvalue=None)
-    for link, require_python, yanked in links:
+    for link, require_python, link_yanked in links:
         key, href = link
-        result.append((key, href, require_python, yanked))
+        result.append((key, href, require_python, link_yanked))
     return result
 
 
@@ -1615,11 +1615,10 @@ class LinkStore:
 
     @property
     def metadata(self):
-        metadata = {}
-        for k, v in get_mutable_deepcopy(self.verdata).items():
-            if not k.startswith("+"):
-                metadata[k] = v
-        return metadata
+        return {
+            k: v
+            for k, v in get_mutable_deepcopy(self.verdata).items()
+            if not k.startswith("+")}
 
     def get_file_entry(self, relpath):
         return self.filestore.get_file_entry(relpath)

{devpi_server-6.12.0 → devpi-server-6.12.1}/devpi_server/replica.py

@@ -6,6 +6,7 @@ import secrets
 import threading
 import time
 import traceback
+from contextlib import suppress
 from functools import partial
 from pluggy import HookimplMarker
 from pyramid.httpexceptions import HTTPNotFound, HTTPAccepted, HTTPBadRequest
@@ -1174,18 +1175,22 @@ class BodyFileWrapper:
         self.len = length
 
 
-def proxy_request_to_master(xom, request, stream=False):
+def proxy_request_to_master(xom, request, *, stream=False):
     master_url = xom.config.master_url
-    url = master_url.joinpath(request.path).url
+    request_url = URL(request.url)
+    url = (
+        master_url
+        .joinpath(request_url.path)
+        .replace(query=request_url.query)
+        .url)
     assert url.startswith(master_url.url)
     http = xom._httpsession
     with threadlog.around("info", "relaying: %s %s", request.method, url):
         try:
             headers = clean_request_headers(request)
-            try:
+            length = None
+            with suppress(ValueError, TypeError):
                 length = int(headers.get('Content-Length'))
-            except (ValueError, TypeError):
-                length = None
             if length:
                 body = BodyFileWrapper(request.body_file, length)
             else:
@@ -1197,7 +1202,8 @@ def proxy_request_to_master(xom, request, stream=False):
                                 allow_redirects=False,
                                 timeout=xom.config.args.proxy_timeout)
         except http.Errors as e:
-            raise UpstreamError("proxy-write-to-master %s: %s" % (url, e))
+            msg = f"proxy-write-to-master {url}: {e}"
+            raise UpstreamError(msg) from e
 
 
 def proxy_write_to_master(xom, request):
@@ -1231,10 +1237,11 @@ def proxy_write_to_master(xom, request):
                     headers=headers)
 
 
-def proxy_view_to_master(context, request):
+def proxy_view_to_master(_context, request):
     xom = request.registry["xom"]
     tx = getattr(xom.keyfs, "tx", None)
-    assert getattr(tx, "write", False) is False, "there should be no write transaction"
+    if getattr(tx, "write", False):
+        raise RuntimeError("there should be no write transaction")
     return proxy_write_to_master(xom, request)
 
 

{devpi_server-6.12.0 → devpi-server-6.12.1}/devpi_server/vendor/_pip.py

@@ -14,12 +14,12 @@ class HTMLPage(object):
     """Represents one page, along with its URL"""
 
     # FIXME: these regexes are horrible hacks:
-    _homepage_re = re.compile(r'<th>\s*home\s*page', re.I)
-    _download_re = re.compile(r'<th>\s*download\s+url', re.I)
+    _homepage_re = re.compile(r'<th>\s*home\s*page', re.IGNORECASE)
+    _download_re = re.compile(r'<th>\s*download\s+url', re.IGNORECASE)
     # These aren't so awful:
-    _rel_re = re.compile(r"""<[^>]*\srel\s*=\s*['"]?([^'">]+)[^>]*>""", re.I)
-    _href_re = re.compile('href=(?:"([^"]*)"|\'([^\']*)\'|([^>\\s\\n]*))', re.I | re.S)
-    _base_re = re.compile(r"""<base\s+href\s*=\s*['"]?([^'">]+)""", re.I)
+    _rel_re = re.compile(r"""<[^>]*\srel\s*=\s*['"]?([^'">]+)[^>]*>""", re.IGNORECASE)
+    _href_re = re.compile('href=(?:"([^"]*)"|\'([^\']*)\'|([^>\\s\\n]*))', re.IGNORECASE | re.DOTALL)
+    _base_re = re.compile(r"""<base\s+href\s*=\s*['"]?([^'">]+)""", re.IGNORECASE)
 
     def __init__(self, content, url, headers=None):
         self.content = content
@@ -113,7 +113,7 @@ class HTMLPage(object):
             url = self.clean_link(urljoin(self.base_url, url))
             yield Link(url, self)
 
-    _clean_re = re.compile(r'[^a-z0-9$&+,/:;=?@.#%_\\|-]', re.I)
+    _clean_re = re.compile(r'[^a-z0-9$&+,/:;=?@.#%_\\|-]', re.IGNORECASE)
 
     def clean_link(self, url):
         """Makes sure a link is fully encoded.  That is, if a ' ' shows up in

{devpi_server-6.12.0 → devpi-server-6.12.1}/devpi_server/views.py

@@ -81,9 +81,7 @@ def _select_simple_content_type(request):
 
 
 def is_simple_json(request):
-    if _select_simple_content_type(request) == SIMPLE_API_V1_JSON:
-        return True
-    return False
+    return _select_simple_content_type(request) == SIMPLE_API_V1_JSON
 
 
 def is_requested_by_installer(request):
@@ -449,9 +447,7 @@ def version_in_filename(version, filename):
     if version in filename:
         return True
     # PEP 427 escaped wheels
-    if re.sub(r"[^\w\d.]+", "_", version, flags=re.UNICODE) in filename:
-        return True
-    return False
+    return re.sub(r"[^\w\d.]+", "_", version, flags=re.UNICODE) in filename
 
 
 class PyPIView:
@@ -596,9 +592,7 @@ class PyPIView:
     def _use_absolute_urls(self):
         if self.xom.config.args.absolute_urls:
             return True
-        if 'HTTP_X_DEVPI_ABSOLUTE_URLS' in self.request.environ:
-            return True
-        return False
+        return 'HTTP_X_DEVPI_ABSOLUTE_URLS' in self.request.environ
 
     @view_config(route_name="/{user}/{index}/+simple/{project}")
     def simple_list_project_redirect(self):
@@ -786,18 +780,18 @@ class PyPIView:
         # depending on remote networks
         content_type = _select_simple_content_type(self.request)
         if content_type == SIMPLE_API_V1_JSON:
-            app_iter = self._simple_list_all_json_v1(stage, stage_results)
+            app_iter = self._simple_list_all_json_v1(stage_results)
         elif is_requested_by_installer(self.request):
-            app_iter = self._simple_list_all_installer(stage, stage_results)
+            app_iter = self._simple_list_all_installer(stage_results)
         else:
-            app_iter = self._simple_list_all(stage, stage_results)
+            app_iter = self._simple_list_all(stage.name, stage_results)
         return Response(
             app_iter=buffered_iterator(app_iter),
             content_type=content_type,
             vary=set(["Accept", "User-Agent"]))
 
-    def _simple_list_all(self, stage, stage_results):
-        title = "%s: simple list (including inherited indices)" % (stage.name)
+    def _simple_list_all(self, stage_name, stage_results):
+        title = f"{stage_name}: simple list (including inherited indices)"
         yield f"<!DOCTYPE html><html><head><title>{title}</title></head><body><h1>{title}</h1>".encode("utf-8")
         last_index = len(stage_results) - 1
         seen = set()
@@ -814,7 +808,7 @@ class PyPIView:
                         seen.add(name)
         yield "</body></html>".encode("utf-8")
 
-    def _simple_list_all_installer(self, stage, stage_results):
+    def _simple_list_all_installer(self, stage_results):
         yield "<!DOCTYPE html><html><body>".encode("utf-8")
         last_index = len(stage_results) - 1
         seen = set()
@@ -826,7 +820,7 @@ class PyPIView:
                         seen.add(name)
         yield "</body></html>".encode("utf-8")
 
-    def _simple_list_all_json_v1(self, stage, stage_results):
+    def _simple_list_all_json_v1(self, stage_results):
         yield '{"meta":{"api-version":"1.0"},"projects":['.encode("utf-8")
         last_index = len(stage_results) - 1
         seen = set()

{devpi_server-6.12.0 → devpi-server-6.12.1}/devpi_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devpi-server
-Version: 6.12.0
+Version: 6.12.1
 Summary: devpi-server: reliable private and pypi.org caching server
 Home-page: https://devpi.net
 Maintainer: Florian Schulze
@@ -27,25 +27,10 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.7
 License-File: LICENSE
 License-File: AUTHORS
-Requires-Dist: py>=1.4.23
-Requires-Dist: httpx
-Requires-Dist: argon2-cffi
-Requires-Dist: attrs>=21.3.0
-Requires-Dist: defusedxml
-Requires-Dist: devpi_common<5,>3.6.0
-Requires-Dist: itsdangerous>=0.24
-Requires-Dist: platformdirs
-Requires-Dist: pyramid>=2
-Requires-Dist: waitress>=1.0.1
-Requires-Dist: repoze.lru>=0.6
-Requires-Dist: passlib[argon2]
-Requires-Dist: pluggy<2.0,>=0.6.0
-Requires-Dist: ruamel.yaml
-Requires-Dist: strictyaml
-Requires-Dist: lazy
 
 =============================================================================
 devpi-server: server for private package indexes and PyPI caching
@@ -119,6 +104,20 @@ Changelog
 
 .. towncrier release notes start
 
+6.12.1 (2024-07-24)
+===================
+
+Bug Fixes
+---------
+
+- Support Python 3.13 by depending on legacy-cgi.
+
+- Preserve query string when proxying requests from replica to primary. This fixes force removal on non-volatile indexes and probably other bugs.
+
+- Fix #1044: Correctly update cache expiry time when mirrored server returns 304 Not Modified.
+
+
+
 6.12.0 (2024-06-25)
 ===================
 
@@ -188,14 +187,3 @@ Bug Fixes
 
 - Prevent duplicates when adding values to lists in index configuration with ``+=`` operator.
 
-
-6.9.1 (2023-07-02)
-==================
-
-Bug Fixes
----------
-
-- Prevent error in find_pre_existing_file in case of incomplete metadata.
-
-- Fix #980: Remove long deprecated backward compatibility for old pluggy versions to fix error with pluggy 1.1.0.
-

{devpi_server-6.12.0 → devpi-server-6.12.1}/devpi_server.egg-info/SOURCES.txt

@@ -1,7 +1,6 @@
 .flake8
 AUTHORS
 CHANGELOG
-CHANGELOG.short.rst
 LICENSE
 MANIFEST.in
 README.rst

{devpi_server-6.12.0 → devpi-server-6.12.1}/devpi_server.egg-info/requires.txt

@@ -1,7 +1,7 @@
 py>=1.4.23
 httpx
 argon2-cffi
-attrs>=21.3.0
+attrs>=22.2.0
 defusedxml
 devpi_common<5,>3.6.0
 itsdangerous>=0.24
@@ -14,3 +14,6 @@ pluggy<2.0,>=0.6.0
 ruamel.yaml
 strictyaml
 lazy
+
+[:python_version >= "3.13"]
+legacy-cgi

{devpi_server-6.12.0 → devpi-server-6.12.1}/setup.py

@@ -29,10 +29,11 @@ if __name__ == "__main__":
     install_requires = ["py>=1.4.23",
                         "httpx",
                         "argon2-cffi",
-                        "attrs>=21.3.0",
+                        "attrs>=22.2.0",
                         "defusedxml",
                         "devpi_common<5,>3.6.0",
                         "itsdangerous>=0.24",
+                        "legacy-cgi;python_version>='3.13'",
                         "platformdirs",
                         "pyramid>=2",
                         "waitress>=1.0.1",
@@ -57,7 +58,7 @@ if __name__ == "__main__":
         'Documentation': 'https://doc.devpi.net',
         'Source Code': 'https://github.com/devpi/devpi'
       },
-      version='6.12.0',
+      version='6.12.1',
       maintainer="Florian Schulze",
       maintainer_email="mail@pyfidelity.com",
       packages=[
@@ -82,7 +83,7 @@ if __name__ == "__main__":
         "Programming Language :: Python :: Implementation :: PyPy",
       ] + [
             ("Programming Language :: Python :: %s" % x)
-            for x in "3.7 3.8 3.9 3.10 3.11 3.12".split()],
+            for x in "3.7 3.8 3.9 3.10 3.11 3.12 3.13".split()],
       install_requires=install_requires,
       extras_require=extras_require,
       python_requires='>=3.7',

{devpi_server-6.12.0 → devpi-server-6.12.1}/test_devpi_server/functional.py

@@ -349,6 +349,18 @@ class TestIndexPushThings:
 
 @pytest.mark.nomocking
 class TestProjectThings:
+    def test_non_volatile_force_delete(self, mapp, server_version):
+        force_delete_fix_version = parse_version("6.12.1dev")
+        if server_version < force_delete_fix_version:
+            pytest.skip("devpi-server without force delete via replica fix")
+        mapp.create_and_login_user("cuser3")
+        mapp.create_index("dev", indexconfig={"volatile": False})
+        mapp.use("cuser3/dev")
+        content = mapp.makepkg("hello-1.0.tar.gz", b"content", "hello", "1.0")
+        mapp.upload_file_pypi("hello-1.0.tar.gz", content, "hello", "1.0")
+        mapp.delete_project("hello", code=403)
+        mapp.delete_project("hello", force=True)
+
     def test_toxresult(self, mapp):
         import json
         mapp.create_and_use('pruser1/dev')

{devpi_server-6.12.0 → devpi-server-6.12.1}/test_devpi_server/plugin.py

@@ -364,22 +364,21 @@ def httpget(pypiurls):
             self._md5 = hashlib.md5()  # noqa: S324
             self.call_log = []
 
-        async def async_httpget(self, url, allow_redirects, timeout=None, extra_headers=None):
-            response = self.__call__(url, allow_redirects, extra_headers, timeout=timeout)
-            if response.status_code < 300:
-                text = response.text
-            else:
-                text = None
+        async def async_httpget(self, url, *, allow_redirects, timeout=None, extra_headers=None):
+            response = self.__call__(url, allow_redirects=allow_redirects, extra_headers=extra_headers, timeout=timeout)
+            text = response.text if response.status_code < 300 else None
             return (response, text)
 
-        def __call__(self, url, allow_redirects=False, extra_headers=None, **kw):
+        def __call__(self, url, *, allow_redirects=False, extra_headers=None, **kw):
             class mockresponse:
                 def __init__(xself, url):
                     fakeresponse = self.url2response.get(url)
+                    from_list = False
                     if isinstance(fakeresponse, list):
                         if not fakeresponse:
                             pytest.fail(
                                 f"http_api call to {url} has no further replies")
+                        from_list = True
                         fakeresponse = fakeresponse.pop(0)
                     if fakeresponse is None:
                         fakeresponse = dict(
@@ -396,6 +395,13 @@ def httpget(pypiurls):
                     xself.headers.setdefault('content-type', fakeresponse.get(
                         'content_type', 'text/html'))
                     if "etag" in fakeresponse:
+                        # add follow up response
+                        new_response = dict(fakeresponse, status_code=304)
+                        new_response.pop("etag")
+                        if from_list:
+                            self.url2response[url].append(new_response)
+                        else:
+                            self.url2response[url] = new_response
                         fakeresponse["headers"]["ETag"] = fakeresponse["etag"]
 
                 def close(xself):
@@ -455,12 +461,7 @@ def httpget(pypiurls):
             if pypiserial is not None:
                 headers["X-PYPI-LAST-SERIAL"] = str(pypiserial)
             kw.setdefault("url", URL(remoteurl).joinpath(name).asdir().url)
-            if "etag" in kw:
-                etag = kw.pop("etag")
-                self.add(text=text, **kw, etag=etag)
-                self.add(text=text, **kw, status_code=304)
-            else:
-                self.mockresponse(text=text, **kw)
+            self.mockresponse(text=text, **kw)
             return ret
 
         def _getmd5digest(self, s):
@@ -665,21 +666,14 @@ class Mapp(MappMixin):
             assert res.get("email") == email
 
     def modify_user(self, user, code=200, password=None, **kwargs):
-        reqdict = {}
+        reqdict = dict(kwargs)
         if password:
             reqdict["password"] = password
-        for key, value in kwargs.items():
-            reqdict[key] = value
         r = self.testapp.patch_json("/%s" % user, reqdict, expect_errors=True)
         assert r.status_code == code
         if code == 200:
             assert r.json == dict(message="user updated")
 
-    def create_user_fails(self, user, password, email="hello@example.com"):
-        with pytest.raises(webtest.AppError) as excinfo:
-            self.create_user(user, password)
-        assert "409" in excinfo.value.args[0]
-
     def create_and_login_user(self, user="someuser", password="123"):  # noqa: S107
         self.create_user(user, password)
         self.login(user, password)
@@ -796,11 +790,15 @@ class Mapp(MappMixin):
         r = self.testapp.get_json("/%s" % indexname)
         return r.json["result"]["mirror_whitelist"]
 
-    def delete_project(self, project, code=200, indexname=None,
-                       waithooks=False):
+    def delete_project(
+        self, project, *,
+        code=200, indexname=None, force=False, waithooks=False,
+    ):
         indexname = self._getindexname(indexname)
-        r = self.testapp.delete_json("/%s/%s" % (indexname,
-                project), {}, expect_errors=True)
+        path = f"/{indexname}/{project}"
+        if force:
+            path = f"{path}?force"
+        r = self.testapp.delete_json(path, {}, expect_errors=True)
         assert r.status_code == code
         if waithooks:
             self._wait_for_serial_in_result(r)
@@ -1326,22 +1324,6 @@ def simpypi(simpypiserver):
     return simpypiserver.simpypi
 
 
-# incremental testing
-
-def pytest_runtest_makereport(item, call):
-    if "incremental" in item.keywords:
-        if call.excinfo is not None:
-            parent = item.parent
-            parent._previousfailed = item
-
-
-def pytest_runtest_setup(item):
-    if "incremental" in item.keywords:
-        previousfailed = getattr(item.parent, "_previousfailed", None)
-        if previousfailed is not None:
-            pytest.xfail("previous test failed (%s)" %previousfailed.name)
-
-
 @pytest.fixture
 def gen():
     return Gen()

{devpi_server-6.12.0 → devpi-server-6.12.1}/test_devpi_server/test_fileutil.py

@@ -72,10 +72,10 @@ def test_execnet_opcodes():
 def test_loads(data, expected):
     result = loads(data)
     assert result == expected
-    assert type(result) == type(expected)
+    assert type(result) is type(expected)
     result = _loads(data)
     assert result == expected
-    assert type(result) == type(expected)
+    assert type(result) is type(expected)
     # try round-trip
     dump = dumps(expected)
     assert len(dump) == dumplen(expected)