summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.zuul.yaml2
-rw-r--r--designateclient/functionaltests/v2/fixtures.py2
-rw-r--r--doc/examples/recordset_create.py1
-rw-r--r--doc/examples/zone_create_primary.py1
-rw-r--r--doc/examples/zone_list_paging.py1
-rw-r--r--lower-constraints.txt3
-rw-r--r--releasenotes/source/index.rst1
-rw-r--r--releasenotes/source/xena.rst6
-rw-r--r--test-requirements.txt1
9 files changed, 9 insertions, 9 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index ac4b130..8ddfc69 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -4,7 +4,7 @@
- designate-devstack-jobs
- openstack-cover-jobs
- openstack-lower-constraints-jobs
- - openstack-python3-xena-jobs
+ - openstack-python3-yoga-jobs
- openstackclient-plugin-jobs
- publish-openstack-docs-pti
- release-notes-jobs-python3
diff --git a/designateclient/functionaltests/v2/fixtures.py b/designateclient/functionaltests/v2/fixtures.py
index 8e2ff95..cc5a83b 100644
--- a/designateclient/functionaltests/v2/fixtures.py
+++ b/designateclient/functionaltests/v2/fixtures.py
@@ -13,8 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
"""
-from __future__ import absolute_import
-from __future__ import print_function
import sys
import tempfile
import traceback
diff --git a/doc/examples/recordset_create.py b/doc/examples/recordset_create.py
index 4be7c4d..bc12d4c 100644
--- a/doc/examples/recordset_create.py
+++ b/doc/examples/recordset_create.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import logging
import os
diff --git a/doc/examples/zone_create_primary.py b/doc/examples/zone_create_primary.py
index 2ebc404..65f8f44 100644
--- a/doc/examples/zone_create_primary.py
+++ b/doc/examples/zone_create_primary.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import logging
import os
diff --git a/doc/examples/zone_list_paging.py b/doc/examples/zone_list_paging.py
index e16227b..4d501a9 100644
--- a/doc/examples/zone_list_paging.py
+++ b/doc/examples/zone_list_paging.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
import logging
import os
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 80fbcd9..909c517 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -7,7 +7,7 @@ cmd2==0.8.0
coverage==4.0
cryptography==3.1
debtcollector==1.2.0
-decorator==3.4.0
+decorator==4.2.1
deprecation==1.0
dogpile.cache==0.6.2
dulwich==0.15.0
@@ -32,7 +32,6 @@ netifaces==0.10.4
openstacksdk==0.11.2
os-client-config==1.28.0
os-service-types==1.2.0
-os-testr==1.0.0
osc-lib==1.8.0
oslo.concurrency==3.25.0
oslo.config==5.2.0
diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst
index 06df341..94260cd 100644
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -6,6 +6,7 @@
:maxdepth: 1
unreleased
+ xena
wallaby
victoria
ussuri
diff --git a/releasenotes/source/xena.rst b/releasenotes/source/xena.rst
new file mode 100644
index 0000000..1be85be
--- /dev/null
+++ b/releasenotes/source/xena.rst
@@ -0,0 +1,6 @@
+=========================
+Xena Series Release Notes
+=========================
+
+.. release-notes::
+ :branch: stable/xena
diff --git a/test-requirements.txt b/test-requirements.txt
index 122e6a2..b913174 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,6 @@ hacking>=3.0.1,<3.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
oslo.config>=5.2.0 # Apache-2.0
oslotest>=3.2.0 # Apache-2.0
-os-testr>=1.0.0 # Apache-2.0
python-subunit>=1.0.0 # Apache-2.0/BSD
requests-mock>=1.2.0 # Apache-2.0
stestr>=2.0.0 # Apache-2.0