From ee87ef76a54c54c88ef100663b1fb0d75f19917e Mon Sep 17 00:00:00 2001 From: fundead Date: Wed, 15 Feb 2017 09:28:31 +1300 Subject: [PATCH 1/6] Fix syntax error typo in WSGI middleware, py2/3. Closes #58 --- python2/raygun4py/middleware/wsgi.py | 2 +- python3/raygun4py/middleware/wsgi.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python2/raygun4py/middleware/wsgi.py b/python2/raygun4py/middleware/wsgi.py index c6c9787..651fbe6 100644 --- a/python2/raygun4py/middleware/wsgi.py +++ b/python2/raygun4py/middleware/wsgi.py @@ -40,7 +40,7 @@ def __call__(self, environ, start_response): def build_request(self, environ): request = {} - http_host = environ.get('HTTP_HOST'], None) + http_host = environ.get(['HTTP_HOST'], None) if http_host is not None: http_host = http_host.replace(' ', '') diff --git a/python3/raygun4py/middleware/wsgi.py b/python3/raygun4py/middleware/wsgi.py index 3ca4e74..0305e10 100644 --- a/python3/raygun4py/middleware/wsgi.py +++ b/python3/raygun4py/middleware/wsgi.py @@ -38,7 +38,7 @@ def __call__(self, environ, start_response): def build_request(self, environ): request = {} - http_host = environ.get('HTTP_HOST'], None) + http_host = environ.get(['HTTP_HOST'], None) if http_host is not None: http_host = http_host.replace(' ', '') From 494c3cbd2c3dd7426b091598201f93be4728067f Mon Sep 17 00:00:00 2001 From: fundead Date: Wed, 15 Feb 2017 09:35:36 +1300 Subject: [PATCH 2/6] Changelog/version bump --- CHANGELOG.rst | 4 ++++ setup.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3f6cd33..dbf0033 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,7 @@ +3.1.5 + +- Fix a syntax error in the WSGI middlewre introduced in 3.1.4 + 3.1.4 - Fix runtime bugs involving the WSGI pipeline, a local variable accessor edge case, and a pickling old-style classes exception diff --git a/setup.py b/setup.py index 7ed3a71..aa6cd03 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( name='raygun4py', - version='3.1.4', + version='3.1.5', packages=packages, package_dir= { "raygun4py": base_dir + "/raygun4py" From 70a4d2a6650f6fcb1cd579b65a97d24cea29ae86 Mon Sep 17 00:00:00 2001 From: fundead Date: Wed, 15 Feb 2017 09:39:53 +1300 Subject: [PATCH 3/6] Add py 3.6 to travis, attempt readding pypy3 to see if the tests pass now --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 762480d..c846697 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: python cache: pip -python: ["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "pypy"] +python: ["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "3.6", "pypy", "pypy3"] install: - pip install jsonpickle @@ -21,7 +21,7 @@ script: # Coverage/Coveralls has dropped support for Python 3.2 - if [[ $TRAVIS_PYTHON_VERSION != 3.2 && $TRAVIS_PYTHON_VERSION == 3* ]]; then coverage run -m unittest discover python3; fi - if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then coverage run -m unittest2 discover python2; fi - # - if [[ $TRAVIS_PYTHON_VERSION == 'pypy3' ]]; then coverage run -m unittest discover python3; fi + - if [[ $TRAVIS_PYTHON_VERSION == 'pypy3' ]]; then coverage run -m unittest discover python3; fi after_success: coveralls \ No newline at end of file From b475c3108f8be01802c29d6bfe6454798c909002 Mon Sep 17 00:00:00 2001 From: fundead Date: Wed, 15 Feb 2017 09:45:14 +1300 Subject: [PATCH 4/6] No such luck; pypy3 still has a bug in the chained exceptions --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c846697..aca4d38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: python cache: pip -python: ["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "3.6", "pypy", "pypy3"] +python: ["2.6", "2.7", "3.2", "3.3", "3.4", "3.5", "3.6", "pypy"] install: - pip install jsonpickle @@ -21,7 +21,7 @@ script: # Coverage/Coveralls has dropped support for Python 3.2 - if [[ $TRAVIS_PYTHON_VERSION != 3.2 && $TRAVIS_PYTHON_VERSION == 3* ]]; then coverage run -m unittest discover python3; fi - if [[ $TRAVIS_PYTHON_VERSION == 'pypy' ]]; then coverage run -m unittest2 discover python2; fi - - if [[ $TRAVIS_PYTHON_VERSION == 'pypy3' ]]; then coverage run -m unittest discover python3; fi + # - if [[ $TRAVIS_PYTHON_VERSION == 'pypy3' ]]; then coverage run -m unittest discover python3; fi after_success: coveralls \ No newline at end of file From 61b06bca30db86d777627ea974fd169a07f3344b Mon Sep 17 00:00:00 2001 From: fundead Date: Mon, 29 May 2017 15:46:41 +1200 Subject: [PATCH 5/6] Relax jsonpickle, requests etc semver require expressions to greater/equal to current versions. Closes #60 --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index aa6cd03..538f193 100644 --- a/setup.py +++ b/setup.py @@ -22,9 +22,9 @@ description='Official Raygun provider for Python 2.6/2.7 and Python 3+', long_description=open('README.rst').read(), install_requires=[ - 'jsonpickle == 0.9.2', - 'blinker == 1.3.0', - 'requests == 2.9.1' + 'jsonpickle >= 0.9.2', + 'blinker >= 1.3.0', + 'requests >= 2.9.1' ], entry_points={ 'console_scripts': [ From 14e78c31ed2fed62cbad84424a39b5a8ea575cec Mon Sep 17 00:00:00 2001 From: fundead Date: Mon, 29 May 2017 15:54:27 +1200 Subject: [PATCH 6/6] Update changelog --- CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index dbf0033..1143f2a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,7 @@ 3.1.5 - Fix a syntax error in the WSGI middlewre introduced in 3.1.4 +- Relaxes dependency requirements for jsonpickle etc 3.1.4