Skip to content

Commit

Permalink
Fix #567: the pip search view is no longer proxied to the master.
Browse files Browse the repository at this point in the history
  • Loading branch information
fschulze committed Sep 29, 2019
1 parent 7120989 commit 9906a93
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Expand Up @@ -40,7 +40,8 @@ jobs:
- devpi index -c "${DEVPI_INDEX}" bases=root/pypi
- devpi use "${DEVPI_INDEX}"
- devpi push --index root/pypi devpi-server==4.0.0 "${DEVPI_INDEX}"
- devpi push --index root/pypi devpi-server==4.2.1 "${DEVPI_INDEX}"
# BBB,XXX uncomment when devpi-server 5.2.0 is released
# - devpi push --index root/pypi devpi-server==5.2.0 "${DEVPI_INDEX}"
- cd ${TRAVIS_BUILD_DIR}/common
- yes | towncrier
- devpi upload
Expand Down
2 changes: 1 addition & 1 deletion web/devpi_web/__init__.py
@@ -1 +1 @@
__version__ = '3.5.2'
__version__ = '4.0.0.dev3'
2 changes: 1 addition & 1 deletion web/devpi_web/views.py
Expand Up @@ -1018,7 +1018,7 @@ def query_from_xmlrpc(self, body):

@view_config(
route_name="/{user}/{index}/", request_method="POST",
content_type="text/xml")
content_type="text/xml", is_mutating=False)
def xmlrpc_search(self):
try:
query = self.query_from_xmlrpc(self.request.body)
Expand Down
1 change: 1 addition & 0 deletions web/news/567.bugfix
@@ -0,0 +1 @@
Fix #567: the ``pip search`` view is no longer proxied to the master.
1 change: 1 addition & 0 deletions web/news/server.other
@@ -0,0 +1 @@
The minimum supported version of devpi-server is now 5.2.0.
4 changes: 2 additions & 2 deletions web/setup.py
Expand Up @@ -28,7 +28,7 @@ def get_changelog():
description="devpi-web: a web view for devpi-server",
long_description="\n\n".join([README, CHANGELOG]),
url="http://doc.devpi.net",
version='3.5.2',
version='4.0.0.dev3',
maintainer="Holger Krekel, Florian Schulze",
maintainer_email="holger@merlinux.eu",
license="MIT",
Expand All @@ -54,7 +54,7 @@ def get_changelog():
'Whoosh<3',
'beautifulsoup4>=4.3.2',
'defusedxml',
'devpi-server>=4.2.1',
'devpi-server>=5.2dev',
'devpi-common>=3.2.0',
'docutils>=0.11',
'pygments>=1.6',
Expand Down
8 changes: 4 additions & 4 deletions web/tox.ini
@@ -1,5 +1,5 @@
[tox]
envlist = py27{,-keyfs,-server421},py34,py35,pypy
envlist = py27{,-keyfs,-server520},py34,py35,pypy


[testenv]
Expand All @@ -10,11 +10,11 @@ passenv = LANG
deps =
webtest
mock
!server421: pytest
pytest
pytest-cov
pytest-flake8
server421: devpi-server==4.2.1
server421: pytest<4.1.0
# BBB,XXX uncomment when devpi-server 5.2.0 is released
# server520: devpi-server==5.2.0


[testenv:py27-keyfs]
Expand Down

0 comments on commit 9906a93

Please sign in to comment.