Merge pull request #68 from mrterry/version

Prep for release.
Nextdoor · Feb 23, 2017 · e1a3ad2 · e1a3ad2
2 parents f73c18e + a758647
commit e1a3ad2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/nd_service_registry/registration_integration.py b/nd_service_registry/registration_integration.py
@@ -213,8 +213,8 @@ def test_greedy_ownership_of_data(self):
         self.zk.set(path, value=b'bogus')
         waituntil(eph1._watcher.get, current_stat, 5)
         (data, stat) = self.zk.get(path)
-        self.assertTrue(b'"unittest":"data"' in data)
-        self.assertFalse(b'bogus' in data)
+        self.assertIn(b'"unittest":"data"', data)
+        self.assertNotIn(b'bogus', data)
 
         # Now lets intentionally delete the node and see it get re-run
         current_stat = eph1.get()

diff --git a/nd_service_registry/version.py b/nd_service_registry/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = '1.0.0'  # http://semver.org/
+__version__ = '1.1.0'  # http://semver.org/
diff --git a/setup.py b/setup.py
@@ -167,6 +167,8 @@ def run(self):
         'License :: OSI Approved :: Apache Software License',
         'Intended Audience :: Developers',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 3',
         'Operating System :: POSIX',
         'Natural Language :: English',
     ],