devpi-server 6.13.0__tar.gz → 6.14.0__tar.gz

{devpi-server-6.13.0 → devpi-server-6.14.0}/CHANGELOG

@@ -2,6 +2,27 @@
 
 .. towncrier release notes start
 
+6.14.0 (2024-10-16)
+===================
+
+Features
+--------
+
+- Allow pushing of versions which only have documentation and no releases.
+
+- Allow pushing of release files only with no documentation. Requires devpi-client 7.2.0.
+
+- Allow pushing of documentation only with no release files. Requires devpi-client 7.2.0.
+
+
+
+Bug Fixes
+---------
+
+- No longer automatically "register" a project when pushing releases to PyPI. The reply changed from HTTP status 410 to 400 breaking the upload. With devpi-client 7.2.0 there is a ``--register-project`` option if it is still required for some other package registry.
+
+
+
 6.13.0 (2024-09-19)
 ===================
 

{devpi-server-6.13.0 → devpi-server-6.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devpi-server
-Version: 6.13.0
+Version: 6.14.0
 Summary: devpi-server: reliable private and pypi.org caching server
 Home-page: https://devpi.net
 Maintainer: Florian Schulze
@@ -105,6 +105,27 @@ Changelog
 
 .. towncrier release notes start
 
+6.14.0 (2024-10-16)
+===================
+
+Features
+--------
+
+- Allow pushing of versions which only have documentation and no releases.
+
+- Allow pushing of release files only with no documentation. Requires devpi-client 7.2.0.
+
+- Allow pushing of documentation only with no release files. Requires devpi-client 7.2.0.
+
+
+
+Bug Fixes
+---------
+
+- No longer automatically "register" a project when pushing releases to PyPI. The reply changed from HTTP status 410 to 400 breaking the upload. With devpi-client 7.2.0 there is a ``--register-project`` option if it is still required for some other package registry.
+
+
+
 6.13.0 (2024-09-19)
 ===================
 
@@ -193,24 +214,3 @@ Bug Fixes
 - Fix #1033: Use ``int`` for ``--mirror-cache-expiry`` to fix value of ``proxy_cache_valid`` in nginx caching config.
 
 
-
-6.10.0 (2023-12-19)
-===================
-
-Features
---------
-
-- Use ``Authorization`` header instead of adding username/password to URL when fetching from mirror.
-
-- Fix #998: Use the pure Python httpx library instead of aiohttp to prevent delays in supporting newest Python releases.
-
-
-
-Bug Fixes
----------
-
-- Fix #996: support hashes other than sha256 in application/vnd.pypi.simple.v1+json responses.
-
-- Only compare hostname instead of full URL prefix when parsing mirror packages to fix mirrors with basic authentication and absolute URLs. See #1006
-
-

devpi-server-6.14.0/devpi_server/__init__.py

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

{devpi-server-6.13.0 → devpi-server-6.14.0}/devpi_server/main.py

@@ -365,9 +365,12 @@ class XOM:
 
     @cached_property
     def supported_features(self):
-        results = set((
+        results = {
+            'push-no-docs',
+            'push-only-docs',
+            'push-register-project',
             'server-keyvalue-parsing',
-        ))
+        }
         for features in self.config.hook.devpiserver_get_features():
             results.update(features)
         return tuple(sorted(results))

{devpi-server-6.13.0 → devpi-server-6.14.0}/devpi_server/views.py

@@ -10,6 +10,7 @@ from devpi_common.url import URL
 from devpi_common.metadata import get_pyversion_filetype
 import devpi_server
 from html import escape
+from http import HTTPStatus
 from lazy import lazy
 from operator import attrgetter
 from pluggy import HookimplMarker
@@ -141,7 +142,7 @@ class HTTPResponse(HTTPSuccessful):
         Exception.__init__(self)
 
 
-def apireturn(code, message=None, result=None, type=None):
+def apiresult(code, message=None, result=None, type=None):  # noqa: A002
     d = dict()
     if result is not None:
         assert type is not None
@@ -151,7 +152,11 @@ def apireturn(code, message=None, result=None, type=None):
         d["message"] = message
     data = json.dumps(d, indent=2) + "\n"
     headers = {"content-type": "application/json"}
-    raise HTTPResponse(body=data, status=code, headers=headers)
+    return HTTPResponse(body=data, status=code, headers=headers)
+
+
+def apireturn(code, message=None, result=None, type=None):  # noqa: A002
+    raise apiresult(code, message=message, result=result, type=type)
 
 
 def json_preferred(request):
@@ -1007,8 +1012,8 @@ class PyPIView:
         stage = self.context.stage
         pushdata = getjson(request)
         try:
-            name = pushdata["name"]
-            version = pushdata["version"]
+            name = pushdata.pop("name")
+            version = pushdata.pop("version")
         except KeyError:
             apireturn(400, message="no name/version specified in json")
 
@@ -1018,14 +1023,21 @@ class PyPIView:
         except stage.MissesRegistration:
             apireturn(400, "there are no files for %s-%s on stage %s" % (
                 name, version, stage.name))
+        rels = {'releasefile', 'doczip', 'toxresult'}
+        no_docs = pushdata.pop("no_docs", False)
+        only_docs = pushdata.pop("only_docs", False)
+        if no_docs and only_docs:
+            return apiresult(400, "can't use 'no_docs' and 'only_docs' together")
+        if no_docs:
+            rels.remove('doczip')
+        elif only_docs:
+            rels = {'doczip'}
         links = {
             rel: sorted(linkstore.get_links(rel=rel), key=attrgetter('basename'))
-            for rel in ('releasefile', 'doczip', 'toxresult')}
-        if not links["releasefile"]:
-            self.log.info("%s: no release files for version %s-%s" %
-                          (stage.name, name, version))
-            apireturn(404, message="no release/files found for %s-%s" % (
-                name, version))
+            for rel in rels}
+        if not any(links.values()):
+            self.log.info("%s: no files for version %s %s", stage.name, name, version)
+            apireturn(404, f"no release/files found for {name} {version}")
 
         if not request.has_permission("pkg_read"):
             abort(request, 403, "package read forbidden")
@@ -1033,8 +1045,11 @@ class PyPIView:
         metadata = linkstore.metadata
 
         results = []
-        targetindex = pushdata.get("targetindex", None)
+        targetindex = pushdata.pop("targetindex", None)
         if targetindex is not None:  # in-server push
+            if pushdata:
+                keys = ', '.join(sorted(pushdata.keys()))
+                return apiresult(400, f"unknown additional options: {keys}")
             parts = targetindex.split("/")
             if len(parts) != 2:
                 apireturn(400, message="targetindex not in format user/index")
@@ -1057,6 +1072,7 @@ class PyPIView:
                 return apireturn(502, e.args[0])
             apireturn(200, result=results, type="actionlog")
         else:
+            register_project = pushdata.pop("register_project", False)
             posturl = pushdata["posturl"]
             username = pushdata["username"]
             password = pushdata["password"]
@@ -1064,22 +1080,25 @@ class PyPIView:
             # prepare metadata for submission
             metadata[":action"] = "submit"
             metadata["metadata_version"] = "2.1"
-            self.log.info("registering %s-%s to %s", name, version, posturl)
             session = new_requests_session(agent=("server", server_version))
             with contextlib.closing(session):
-                try:
-                    r = session.post(posturl, data=metadata, auth=pypiauth)
-                    r.close()
-                except Exception as e:
-                    exc_msg = ''.join(traceback.format_exception_only(e.__class__, e))
-                    results.append((-1, "exception on register:", exc_msg))
-                    apireturn(502, result=results, type="actionlog")
-                self.log.debug("register returned: %s", r.status_code)
-                results.append((r.status_code, "register", name, version))
-                ok_codes = (200, 201, 410)
-                proceed = (r.status_code in ok_codes)
+                ok_codes = {HTTPStatus.OK, HTTPStatus.CREATED}
+                if register_project:
+                    self.log.info("registering %s-%s to %s", name, version, posturl)
+                    try:
+                        r = session.post(posturl, data=metadata, auth=pypiauth)
+                        r.close()
+                    except Exception as e:  # noqa: BLE001
+                        exc_msg = ''.join(traceback.format_exception_only(e.__class__, e))
+                        results.append((-1, "exception on register:", exc_msg))
+                        apireturn(502, result=results, type="actionlog")
+                    self.log.debug("register returned: %s", r.status_code)
+                    results.append((r.status_code, "register", name, version))
+                    proceed = (r.status_code in ok_codes | {HTTPStatus.GONE})
+                else:
+                    proceed = True
                 if proceed:
-                    for link in links["releasefile"]:
+                    for link in links.get("releasefile", ()):
                         entry = link.entry
                         file_metadata = metadata.copy()
                         file_metadata[":action"] = "file_upload"
@@ -1106,7 +1125,7 @@ class PyPIView:
                             results.append((
                                 r.status_code, "upload", entry.relpath, text))
                             r.close()
-                    if links["doczip"]:
+                    if links.get("doczip", ()):
                         doc_metadata = metadata.copy()
                         doc_metadata[":action"] = "doc_upload"
                         doczip = links["doczip"][0].entry.file_get_content()
@@ -1128,7 +1147,7 @@ class PyPIView:
 
     def _push_links(self, links, target_stage, name, version):
         stage = self.context.stage
-        for link in links["releasefile"]:
+        for link in links.get("releasefile", ()):
             entry = link.entry
             logs = link.get_logs()
             del link
@@ -1170,7 +1189,7 @@ class PyPIView:
                         src=self.context.stage.name,
                         dst=target_stage.name)
                     yield (200, "store_toxresult", tlink.entrypath)
-        for link in links["doczip"]:
+        for link in links.get("doczip", ()):
             with link.entry.file_open_read() as doczip:
                 new_link = target_stage.store_doczip(
                     name, version, doczip, hashes=link.entry.hashes)

{devpi-server-6.13.0 → devpi-server-6.14.0}/devpi_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devpi-server
-Version: 6.13.0
+Version: 6.14.0
 Summary: devpi-server: reliable private and pypi.org caching server
 Home-page: https://devpi.net
 Maintainer: Florian Schulze
@@ -105,6 +105,27 @@ Changelog
 
 .. towncrier release notes start
 
+6.14.0 (2024-10-16)
+===================
+
+Features
+--------
+
+- Allow pushing of versions which only have documentation and no releases.
+
+- Allow pushing of release files only with no documentation. Requires devpi-client 7.2.0.
+
+- Allow pushing of documentation only with no release files. Requires devpi-client 7.2.0.
+
+
+
+Bug Fixes
+---------
+
+- No longer automatically "register" a project when pushing releases to PyPI. The reply changed from HTTP status 410 to 400 breaking the upload. With devpi-client 7.2.0 there is a ``--register-project`` option if it is still required for some other package registry.
+
+
+
 6.13.0 (2024-09-19)
 ===================
 
@@ -193,24 +214,3 @@ Bug Fixes
 - Fix #1033: Use ``int`` for ``--mirror-cache-expiry`` to fix value of ``proxy_cache_valid`` in nginx caching config.
 
 
-
-6.10.0 (2023-12-19)
-===================
-
-Features
---------
-
-- Use ``Authorization`` header instead of adding username/password to URL when fetching from mirror.
-
-- Fix #998: Use the pure Python httpx library instead of aiohttp to prevent delays in supporting newest Python releases.
-
-
-
-Bug Fixes
----------
-
-- Fix #996: support hashes other than sha256 in application/vnd.pypi.simple.v1+json responses.
-
-- Only compare hostname instead of full URL prefix when parsing mirror packages to fix mirrors with basic authentication and absolute URLs. See #1006
-
-

{devpi-server-6.13.0 → devpi-server-6.14.0}/setup.py

@@ -59,7 +59,7 @@ if __name__ == "__main__":
         'Funding': 'https://github.com/sponsors/devpi',
         'Source Code': 'https://github.com/devpi/devpi'
       },
-      version='6.13.0',
+      version='6.14.0',
       maintainer="Florian Schulze",
       maintainer_email="mail@pyfidelity.com",
       packages=[

{devpi-server-6.13.0 → devpi-server-6.14.0}/test_devpi_server/plugin.py

@@ -910,6 +910,13 @@ class Mapp(MappMixin):
         assert r.status_code == code
         if waithooks:
             self._wait_for_serial_in_result(r)
+
+        # return the file url so users/callers can easily use it
+        # (probably the official server response should include the url)
+        r.file_url = make_file_url(basename, content, stagename=indexname)
+        r.file_url_no_hash = make_file_url(
+            basename, content, stagename=indexname, add_hash=False)
+
         return r
 
     def upload_toxresult(self, path, content, code=200, waithooks=False):

{devpi-server-6.13.0 → devpi-server-6.14.0}/test_devpi_server/test_views.py

@@ -1389,8 +1389,57 @@ def test_upload_docs_for_version_without_release(mapp, testapp, monkeypatch):
     mapp.upload_doc("pkg1-2.7.doc.zip", b'', "pkg1", "2.7")
 
 
+def test_upload_and_push_docs_only(mapp, testapp):
+    mapp.create_and_login_user()
+    mapp.create_index("prod")
+    mapp.create_index("dev")
+    mapp.upload_file_pypi("pkg1-2.6.tgz", b"123", "pkg1", "2.6")
+    content26 = zip_dict({"index.html": "<html><body>2.6</body></html>"})
+    mapp.upload_doc("pkg1.zip", content26, "pkg1", "")
+    mapp.upload_file_pypi("pkg1-2.7.tgz", b"123", "pkg1", "2.7")
+    content27 = zip_dict({"index.html": "<html><body>2.7</body></html>"})
+    mapp.upload_doc("pkg1.zip", content27, "pkg1", "")
+    req = dict(name="pkg1", version="2.6", targetindex="someuser/prod", only_docs=True)
+    testapp.post("/someuser/dev", params=json.dumps(req), code=200)
+    vv = get_view_version_links(testapp, "/someuser/prod", "pkg1", "2.6")
+    (link,) = vv.get_links()
+    assert link.basename == "pkg1-2.6.doc.zip"
+    assert link.rel == "doczip"
+    mapp.getjson("/someuser/prod/2.7", code=404)
+
+
+def test_upload_and_push_no_docs(mapp, testapp):
+    mapp.create_and_login_user()
+    mapp.create_index("prod")
+    mapp.create_index("dev")
+    mapp.upload_file_pypi("pkg1-2.6.tgz", b"123", "pkg1", "2.6")
+    content26 = zip_dict({"index.html": "<html><body>2.6</body></html>"})
+    mapp.upload_doc("pkg1.zip", content26, "pkg1", "")
+    mapp.upload_file_pypi("pkg1-2.7.tgz", b"123", "pkg1", "2.7")
+    content27 = zip_dict({"index.html": "<html><body>2.7</body></html>"})
+    mapp.upload_doc("pkg1.zip", content27, "pkg1", "")
+    req = dict(name="pkg1", version="2.6", targetindex="someuser/prod", no_docs=True)
+    testapp.post("/someuser/dev", params=json.dumps(req), code=200)
+    vv = get_view_version_links(testapp, "/someuser/prod", "pkg1", "2.6")
+    (link,) = vv.get_links()
+    assert link.basename == "pkg1-2.6.tgz"
+    assert link.rel == "releasefile"
+    mapp.getjson("/someuser/prod/2.7", code=404)
+
+
+def test_upload_and_push_no_docs_and_only_docs(mapp, testapp):
+    mapp.create_and_login_user()
+    mapp.create_index("dev")
+    mapp.upload_file_pypi("pkg1-2.6.tgz", b"123", "pkg1", "2.6")
+    content26 = zip_dict({"index.html": "<html><body>2.6</body></html>"})
+    mapp.upload_doc("pkg1.zip", content26, "pkg1", "")
+    req = dict(name="pkg1", version="2.6", targetindex="someuser/prod", no_docs=True, only_docs=True)
+    r = testapp.post("/someuser/dev", params=json.dumps(req), code=400)
+    assert r.json["message"] == "can't use 'no_docs' and 'only_docs' together"
+
+
 @proj
-def test_upload_and_push_internal(mapp, testapp, monkeypatch, proj):
+def test_upload_and_push_internal(mapp, testapp, proj):
     mapp.create_user("user1", "1")
     mapp.create_and_login_user("user2")
     mapp.create_index("prod", indexconfig=dict(acl_upload=["user1", "user2"]))
@@ -1449,6 +1498,42 @@ def test_upload_and_push_internal(mapp, testapp, monkeypatch, proj):
     assert link.href.endswith("/pkg1-2.6.tgz")
 
 
+@proj
+def test_upload_and_push_internal_no_releases_but_docs(mapp, testapp, proj):
+    mapp.create_user("user1", "1")
+    mapp.create_and_login_user("user2")
+    mapp.create_index("prod", indexconfig=dict(acl_upload=["user1", "user2"]))
+    mapp.create_index("dev", indexconfig=dict(acl_upload=["user2"]))
+
+    mapp.login("user1", "1")
+    mapp.create_index("dev")
+    mapp.use("user1/dev")
+    content = zip_dict({"index.html": "<html/>"})
+    mapp.upload_doc("pkg1.zip", content, "pkg1", "2.6")
+
+    # check that push is authorized and executed towards user2/prod index
+    req = dict(name="pkg1", version="2.6", targetindex="user2/prod")
+    r = testapp.push("/user1/dev", json.dumps(req))
+    assert r.status_code == 200
+    vv = get_view_version_links(testapp, "/user2/prod", "pkg1", "2.6",
+                                proj=proj)
+    (link,) = vv.get_links()
+    assert link.rel == "doczip"
+    history_log = link.log
+    assert len(history_log) == 2
+    assert history_log[0]['what'] == 'upload'
+    assert history_log[0]['who'] == 'user1'
+    assert history_log[0]['dst'] == 'user1/dev'
+    assert history_log[1]['what'] == 'push'
+    assert history_log[1]['who'] == 'user1'
+    assert history_log[1]['src'] == 'user1/dev'
+    assert history_log[1]['dst'] == 'user2/prod'
+    assert link.href.endswith("/pkg1-2.6.doc.zip")
+    r = testapp.get(link.href)
+    archive = Archive(BytesIO(r.body))
+    assert 'index.html' in archive.namelist()
+
+
 def test_acl_toxresults_upload(mapp, testapp, tox_result_data):
     mapp.create_and_login_user("user1", "1")
     mapp.create_index("prod")

{devpi-server-6.13.0 → devpi-server-6.14.0}/test_devpi_server/test_views_push_external.py

@@ -33,7 +33,7 @@ def test_upload_and_push_external(mapp, testapp, reqmock):
 
     # push OK
     req = dict(name="pkg1", version="2.6", posturl="http://whatever.com/",
-               username="user", password="password")
+               username="user", password="password", register_project=True)
     rec = reqmock.mockresponse(url=None, code=200, method="POST", data="msg")
     body = json.dumps(req).encode("utf-8")
     r = testapp.request(api.index, method="POST", body=body,
@@ -56,7 +56,7 @@ def test_upload_and_push_external(mapp, testapp, reqmock):
     rec = reqmock.mockresponse(url=None, code=410, method="POST", data="msg")
     r = testapp.request(api.index, method="POST", body=body,
                         expect_errors=True)
-    assert r.status_code == 200
+    assert r.status_code == 502
     (action_register, action_upload, action_docfile) = r.json["result"]
     assert action_register == [410, 'register', 'pkg1', '2.6']
     assert action_upload == [
@@ -73,6 +73,41 @@ def test_upload_and_push_external(mapp, testapp, reqmock):
     assert result[0][1] == 'register'
 
 
+def test_upload_and_push_external_no_docs(mapp, testapp, reqmock):
+    from devpi_server.filestore import relpath_prefix
+    api = mapp.create_and_use()
+    content = b"123"
+    hashdir = relpath_prefix(content)
+    mapp.upload_file_pypi("pkg1-2.6.tgz", content, "pkg1", "2.6")
+    zipcontent = zip_dict({"index.html": "<html/>"})
+    mapp.upload_doc("pkg1.zip", zipcontent, "pkg1", "")
+    req = dict(name="pkg1", version="2.6", posturl="http://whatever.com/",
+               username="user", password="password", no_docs=True)
+    reqmock.mockresponse(url=None, code=200, method="POST", data="msg")
+    body = json.dumps(req).encode()
+    r = testapp.request(api.index, method="POST", body=body)
+    assert r.status_code == 200
+    (action_upload,) = r.json["result"]
+    assert action_upload == [
+        200, 'upload', f'user1/dev/+f/{hashdir}/pkg1-2.6.tgz', '']
+
+
+def test_upload_and_push_external_only_docs(mapp, testapp, reqmock):
+    api = mapp.create_and_use()
+    content = b"123"
+    mapp.upload_file_pypi("pkg1-2.6.tgz", content, "pkg1", "2.6")
+    zipcontent = zip_dict({"index.html": "<html/>"})
+    mapp.upload_doc("pkg1.zip", zipcontent, "pkg1", "")
+    req = dict(name="pkg1", version="2.6", posturl="http://whatever.com/",
+               username="user", password="password", only_docs=True)
+    reqmock.mockresponse(url=None, code=200, method="POST", data="msg")
+    body = json.dumps(req).encode()
+    r = testapp.request(api.index, method="POST", body=body)
+    assert r.status_code == 200
+    (action_docfile,) = r.json["result"]
+    assert action_docfile == [200, 'docfile', 'pkg1']
+
+
 def test_upload_and_push_external_exception(mapp, testapp, reqmock):
     import requests
     api = mapp.create_and_use()
@@ -89,7 +124,7 @@ def test_upload_and_push_external_exception(mapp, testapp, reqmock):
 
     # first test should fail during register
     req = dict(name="pkg1", version="2.6", posturl="http://whatever.com/",
-               username="user", password="password")
+               username="user", password="password", register_project=True)
     body = json.dumps(req).encode("utf-8")
     r = testapp.request(api.index, method="POST", body=body,
                         expect_errors=True)
@@ -106,11 +141,11 @@ def test_upload_and_push_external_exception(mapp, testapp, reqmock):
         status=410, preload_content=False,
         reason="Project pre-registration is no longer required or supported, so continue directly to uploading files."))
     req = dict(name="pkg1", version="2.6", posturl="http://whatever.com/",
-               username="user", password="password")
+               username="user", password="password", register_project=True)
     body = json.dumps(req).encode("utf-8")
     r = testapp.request(api.index, method="POST", body=body,
                         expect_errors=True)
-    assert r.status_code == 200
+    assert r.status_code == 502
     assert r.json['type'] == 'actionlog'
     assert len(r.json['result']) == 2
     assert r.json['result'][0][0] == 410
@@ -132,18 +167,16 @@ def test_upload_and_push_external_metadata12(mapp, reqmock, testapp):
     assert verdata['requires_python'] == ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
     req = dict(name="pkg1", version="2.6", posturl="http://whatever.com/",
                username="user", password="password")
-    rec = reqmock.mockresponse(url=None, code=200, method="POST", data="msg")
+    rep = reqmock.mockresponse(url=None, code=200, method="POST", data="msg")
     body = json.dumps(req).encode("utf-8")
     r = testapp.request(api.index, method="POST", body=body,
                         expect_errors=True)
     assert r.status_code == 200
-    assert len(rec.requests) == 2
-    for i in range(2):
-        assert rec.requests[i].url == req["posturl"]
-    req = rec.requests[1]
+    (rec,) = rep.requests
+    assert rec.url == req["posturl"]
     fs = cgi_FieldStorage(
-        fp=BytesIO(req.body),
-        headers=req.headers,
+        fp=BytesIO(rec.body),
+        headers=rec.headers,
         environ={
             'REQUEST_METHOD': 'POST'})
     assert fs.getvalue('metadata_version') == "2.1"
@@ -162,18 +195,16 @@ def test_upload_and_push_external_metadata21(mapp, reqmock, testapp):
     assert verdata['description_content_type'] == "text/plain"
     req = dict(name="pkg1", version="2.6", posturl="http://whatever.com/",
                username="user", password="password")
-    rec = reqmock.mockresponse(url=None, code=200, method="POST", data="msg")
+    rep = reqmock.mockresponse(url=None, code=200, method="POST", data="msg")
     body = json.dumps(req).encode("utf-8")
     r = testapp.request(api.index, method="POST", body=body,
                         expect_errors=True)
     assert r.status_code == 200
-    assert len(rec.requests) == 2
-    for i in range(2):
-        assert rec.requests[i].url == req["posturl"]
-    req = rec.requests[1]
+    (rec,) = rep.requests
+    assert rec.url == req["posturl"]
     fs = cgi_FieldStorage(
-        fp=BytesIO(req.body),
-        headers=req.headers,
+        fp=BytesIO(rec.body),
+        headers=rec.headers,
         environ={
             'REQUEST_METHOD': 'POST'})
     assert fs.getvalue('metadata_version') == "2.1"
@@ -221,7 +252,7 @@ def test_upload_and_push_warehouse(mapp, testapp, reqmock):
 
     # push OK
     req = dict(name="pkg1", version="2.6", posturl="http://whatever.com/",
-               username="user", password="password")
+               username="user", password="password", register_project=True)
     body = json.dumps(req).encode("utf-8")
     r = testapp.request(api.index, method="POST", body=body,
                         expect_errors=True)
@@ -250,9 +281,8 @@ def test_upload_and_push_egg(mapp, testapp, reqmock):
     # push
     req = dict(name="pkg2", version="1.0", posturl="http://whatever.com/",
                username="user", password="password")
-    rec = reqmock.mockresponse(url=None, data=b"msg", code=200)
+    rep = reqmock.mockresponse(url=None, data=b"msg", code=200)
     r = testapp.push(api.index, json.dumps(req))
     assert r.status_code == 200
-    assert len(rec.requests) == 2
-    assert rec.requests[0].url == req["posturl"]
-    assert rec.requests[1].url == req["posturl"]
+    (rec,) = rep.requests
+    assert rec.url == req["posturl"]

devpi-server-6.13.0/devpi_server/__init__.py

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