prepare 6.9.2 release (#123)

CONTRIBUTING.md

@@ -17,8 +17,8 @@ We encourage pull requests and other contributions from the community. Before su
 It's advisable to use [`virtualenv`](https://virtualenv.pypa.io/) to create a development environment within the project directory:
 
 ```
-mkvirtualenv python-client
-source ./python-client/bin/activate
+mkvirtualenv python-server-sdk
+source ~/.virtualenvs/python-server-sdk/bin/activate
 ```
 
 To install the runtime and test requirements:

README.md

@@ -2,8 +2,8 @@
 
 [![Circle CI](https://img.shields.io/circleci/project/launchdarkly/python-server-sdk.png)](https://circleci.com/gh/launchdarkly/python-server-sdk)
 
-[![PyPI](https://img.shields.io/pypi/v/ldclient-py.svg?maxAge=2592000)](https://pypi.python.org/pypi/ldclient-py)
-[![PyPI](https://img.shields.io/pypi/pyversions/ldclient-py.svg)](https://pypi.python.org/pypi/ldclient-py)
+[![PyPI](https://img.shields.io/pypi/v/launchdarkly-server-sdk.svg?maxAge=2592000)](https://pypi.python.org/pypi/launchdarkly-server-sdk)
+[![PyPI](https://img.shields.io/pypi/pyversions/launchdarkly-server-sdk.svg)](https://pypi.python.org/pypi/launchdarkly-server-sdk)
 
 ## LaunchDarkly overview
 

docs/Makefile

@@ -5,7 +5,7 @@
 
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
-SPHINXPROJ    = ldclient-py
+SPHINXPROJ    = launchdarkly-server-sdk
 SOURCEDIR     = .
 BUILDDIR      = build
 

docs/conf.py

@@ -25,7 +25,7 @@
 
 # -- Project information -----------------------------------------------------
 
-project = u'ldclient-py'
+project = u'launchdarkly-server-sdk'
 copyright = u'2019, LaunchDarkly'
 author = u'LaunchDarkly'
 
@@ -110,7 +110,7 @@
 # -- Options for HTMLHelp output ---------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'ldclient-pydoc'
+htmlhelp_basename = 'launchdarkly-server-sdk-doc'
 
 
 # -- Options for LaTeX output ------------------------------------------------
@@ -137,7 +137,7 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'ldclient-py.tex', u'ldclient-py Documentation',
+    (master_doc, 'launchdarkly-server-sdk.tex', u'launchdarkly-server-sdk Documentation',
      u'LaunchDarkly', 'manual'),
 ]
 
@@ -147,7 +147,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'ldclient-py', u'ldclient-py Documentation',
+    (master_doc, 'launchdarkly-server-sdk', u'launchdarkly-server-sdk Documentation',
      [author], 1)
 ]
 
@@ -158,8 +158,8 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'ldclient-py', u'ldclient-py Documentation',
-     author, 'ldclient-py', 'One line description of project.',
+    (master_doc, 'launchdarkly-server-sdk', u'launchdarkly-server-sdk Documentation',
+     author, 'launchdarkly-server-sdk', 'One line description of project.',
      'Miscellaneous'),
 ]
 

docs/index.rst

@@ -1,4 +1,4 @@
-.. ldclient-py documentation master file, created by
+.. launchdarkly-server-sdk documentation master file, created by
    sphinx-quickstart on Mon Feb  4 13:16:49 2019.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
@@ -8,7 +8,7 @@ LaunchDarkly Python SDK
 
 This is the API reference for the `LaunchDarkly <https://launchdarkly.com/>`_ SDK for Python.
 
-The latest version of the SDK can be found on `PyPI <https://pypi.org/project/ldclient-py/>`_, and the source code is on `GitHub <https://github.com/launchdarkly/python-client>`_.
+The latest version of the SDK can be found on `PyPI <https://pypi.org/project/launchdarkly-server-sdk/>`_, and the source code is on `GitHub <https://github.com/launchdarkly/python-server-sdk>`_.
 
 For more information, see LaunchDarkly's `Quickstart <https://docs.launchdarkly.com/docs>`_ and `SDK Reference Guide <http://docs.launchdarkly.com/docs/python-sdk-reference>`_.
 

setup.py

@@ -44,7 +44,7 @@ def run(self):
         raise SystemExit(errno)
 
 setup(
-    name='ldclient-py',
+    name='launchdarkly-server-sdk',
     version=ldclient_version,
     author='LaunchDarkly',
     author_email='team@launchdarkly.com',

testing/test_feature_store.py

@@ -19,6 +19,8 @@
 from ldclient.redis_feature_store import RedisFeatureStore
 from ldclient.versioned_data_kind import FEATURES
 
+skip_db_tests = os.environ.get('LD_SKIP_DATABASE_TESTS') == '1'
+
 
 class InMemoryTester(object):
     def init_store(self):
@@ -166,7 +168,7 @@ def _clear_data(self):
 
 
 class TestFeatureStore:
-    if os.environ.get('LD_SKIP_DATABASE_TESTS') == '1':
+    if skip_db_tests:
         params = [
             InMemoryTester()
         ]
@@ -321,6 +323,7 @@ def test_stores_with_different_prefixes_are_independent(self, tester):
         assert items == { 'flagB1': flag_b1, 'flagB2': flag_b2 }
 
 
+@pytest.mark.skipif(skip_db_tests, reason="skipping database tests")
 class TestRedisFeatureStoreExtraTests:
     def test_upsert_race_condition_against_external_client_with_higher_version(self):
         other_client = redis.StrictRedis(host='localhost', port=6379, db=0)