diff options
| -rw-r--r-- | .gitreview | 2 | ||||
| -rw-r--r-- | .zuul.yaml | 6 | ||||
| -rw-r--r-- | lower-constraints.txt | 1 | ||||
| -rw-r--r-- | releasenotes/source/index.rst | 1 | ||||
| -rw-r--r-- | releasenotes/source/stein.rst | 6 | ||||
| -rw-r--r-- | swiftclient/client.py | 4 | ||||
| -rw-r--r-- | swiftclient/service.py | 4 | ||||
| -rw-r--r-- | test-requirements.txt | 1 | ||||
| -rw-r--r-- | tox.ini | 5 |
9 files changed, 21 insertions, 9 deletions
@@ -1,4 +1,4 @@ [gerrit] -host=review.openstack.org +host=review.opendev.org port=29418 project=openstack/python-swiftclient.git @@ -9,7 +9,7 @@ # job sets zuul_work_dir to the swift directory and uses tox # for installation. required-projects: - - git.openstack.org/openstack/python-swiftclient + - opendev.org/openstack/python-swiftclient - job: name: swiftclient-functional @@ -19,10 +19,10 @@ python-swiftclient installed from source instead as package from PyPI. required-projects: - - git.openstack.org/openstack/python-swiftclient + - opendev.org/openstack/python-swiftclient vars: # Override value from parent job to use swiftclient tests - zuul_work_dir: "{{ zuul.projects['git.openstack.org/openstack/python-swiftclient'].src_dir }}" + zuul_work_dir: "{{ zuul.projects['opendev.org/openstack/python-swiftclient'].src_dir }}" - job: name: swiftclient-functional-py2 diff --git a/lower-constraints.txt b/lower-constraints.txt index fefb90a..ab45e39 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -22,7 +22,6 @@ mock==1.2.0 netaddr==0.7.10 openstackdocstheme==1.18.1 oslo.config==1.2.0 -oslosphinx==4.7.0 pbr==2.0.0 pep8==1.5.7 PrettyTable==0.7 diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index 92da0e8..27f675e 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -6,6 +6,7 @@ :maxdepth: 1 current + stein rocky queens pike diff --git a/releasenotes/source/stein.rst b/releasenotes/source/stein.rst new file mode 100644 index 0000000..efaceb6 --- /dev/null +++ b/releasenotes/source/stein.rst @@ -0,0 +1,6 @@ +=================================== + Stein Series Release Notes +=================================== + +.. release-notes:: + :branch: stable/stein diff --git a/swiftclient/client.py b/swiftclient/client.py index 6a2b43b..4406689 100644 --- a/swiftclient/client.py +++ b/swiftclient/client.py @@ -1885,7 +1885,9 @@ class Connection(object): reset = getattr(contents, 'reset', None) if tell and seek: orig_pos = tell() - reset_func = lambda *a, **k: seek(orig_pos) + + def reset_func(*a, **kw): + seek(orig_pos) elif reset: reset_func = reset return self._retry(reset_func, put_object, container, obj, contents, diff --git a/swiftclient/service.py b/swiftclient/service.py index 71c36ec..8f3648e 100644 --- a/swiftclient/service.py +++ b/swiftclient/service.py @@ -451,7 +451,9 @@ class SwiftService(object): **_default_local_options ) process_options(self._options) - create_connection = lambda: get_conn(self._options) + + def create_connection(): + return get_conn(self._options) self.thread_manager = MultiThreadingManager( create_connection, segment_threads=self._options['segment_threads'], diff --git a/test-requirements.txt b/test-requirements.txt index 13cf1e9..d822214 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,7 +3,6 @@ hacking>=1.1.0,<1.2.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 keystoneauth1>=3.4.0 # Apache-2.0 mock>=1.2.0 # BSD -oslosphinx>=4.7.0 # Apache-2.0 sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD stestr>=2.0.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0 @@ -77,7 +77,10 @@ commands= # H403: multi line docstrings should end on a new line # H404: multi line docstring should start without a leading new line # H405: multi line docstring summary not separated with an empty line -ignore = E731,H101,H301,H306,H401,H403,H404,H405 +ignore = H101,H301,H306,H401,H403,H404,H405 +# H106: Don’t put vim configuration in source files +# H203: Use assertIs(Not)None to check for None +enable-extensions=H106,H203 show-source = True exclude = .venv,.tox,dist,doc,*egg |