prepare 7.0.0 release (launchdarkly#147)

Author: LaunchDarklyCI

Diff for: .circleci/config.yml

@@ -6,20 +6,6 @@ orbs:
 workflows:
   test:
     jobs:
-      - test-linux:
-          name: Python 2.7
-          docker-image: circleci/python:2.7-jessie
-          test-with-codeclimate: true  # we only need to run CodeClimate in one job
-      - test-linux:
-          name: Python 3.3
-          docker-image: circleci/python:3.3-jessie
-          consul-supported: false  # Consul isn't supported in 3.3
-          filesource-supported: false  # FileDataSource isn't supported in 3.3
-          test-packaging: false  # packaging test requires virtualenv, which isn't supported in 3.3
-      - test-linux:
-          name: Python 3.4
-          docker-image: circleci/python:3.4-jessie
-          consul-supported: false  # Consul isn't supported in 3.4
       - test-linux:
           name: Python 3.5
           docker-image: circleci/python:3.5-jessie
@@ -32,30 +18,27 @@ workflows:
       - test-linux:
           name: Python 3.8
           docker-image: circleci/python:3.8-buster
+      - test-linux:
+          name: Python 3.9
+          docker-image: circleci/python:3.9-rc-buster
       - test-windows:
-          name: Windows Py2.7
-          py3: false
-      - test-windows:
-          name: Windows Py3.3
+          name: Windows Python 3
           py3: true
 
 jobs:
   test-linux:
     parameters:
       docker-image:
         type: string
-      consul-supported:
-        type: boolean
-        default: true
-      filesource-supported:
-        type: boolean
-        default: true
       test-packaging:
         type: boolean
         default: true
       test-with-codeclimate:
         type: boolean
         default: false
+      test-with-mypy:
+        type: boolean
+        default: true
     docker:
       - image: <<parameters.docker-image>>
       - image: redis
@@ -68,12 +51,8 @@ jobs:
           command: |
             sudo pip install --upgrade pip virtualenv;
             sudo pip install -r test-requirements.txt;
-            if [[ "<<parameters.filesource-supported>>" == "true" ]]; then
-              sudo pip install -r test-filesource-optional-requirements.txt;
-            fi;
-            if [[ "<<parameters.consul-supported>>" == "true" ]]; then
-              sudo pip install -r consul-requirements.txt;
-            fi;
+            sudo pip install -r test-filesource-optional-requirements.txt;
+            sudo pip install -r consul-requirements.txt;
             sudo python setup.py install;
             pip freeze
       - when:
@@ -101,6 +80,15 @@ jobs:
                 command: |
                   sudo rm -rf dist *.egg-info
                   ./test-packaging/test-packaging.sh
+      - when:
+          condition: <<parameters.test-with-mypy>>
+          steps:
+            - run:
+                name: verify typehints
+                command: |
+                  pip install mypy
+                  export PATH="/home/circleci/.local/bin:$PATH"
+                  mypy --config-file mypy.ini --python-version 3.5 ldclient/*.py testing/*.py
       - store_test_results:
           path: test-reports
       - store_artifacts:
@@ -115,21 +103,9 @@ jobs:
         type: boolean
     steps:
       - checkout
-      - when:
-          condition: <<parameters.py3>>
-          steps:
-            - run:
-                name: install Python 3
-                command: choco install python --no-progress
-      - unless:
-          condition: <<parameters.py3>>
-          steps:
-            - run:
-                name: install Python 2.7
-                command: |
-                  $ProgressPreference = "SilentlyContinue"  # prevents console errors from CircleCI host
-                  iwr -outf python-2.7.16.amd64.msi https://www.python.org/ftp/python/2.7.16/python-2.7.16.amd64.msi
-                  Start-Process msiexec.exe -Wait -ArgumentList '/I python-2.7.16.amd64.msi /quiet'
+      - run:
+          name: install Python 3
+          command: choco install python --no-progress
       - run:
           name: set up DynamoDB
           command: |
@@ -165,7 +141,6 @@ jobs:
       - run:
           name: install requirements
           command: |
-            $env:Path += ";C:\Python27\;C:\Python27\Scripts\"  # has no effect if 2.7 isn't installed
             python --version
             pip install -r test-requirements.txt
             pip install -r consul-requirements.txt
@@ -174,7 +149,6 @@ jobs:
           name: run tests
           command: |
             mkdir test-reports
-            $env:Path += ";C:\Python27\;C:\Python27\Scripts\"  # has no effect if 2.7 isn't installed
             python -m pytest -s --junitxml=test-reports/junit.xml testing;
       - store_test_results:
           path: test-reports

Diff for: MANIFEST.in

@@ -4,4 +4,3 @@ include test-requirements.txt
 include consul-requirements.txt
 include dynamodb-requirements.txt
 include redis-requirements.txt
-include python2.6-requirements.txt

Diff for: README.md

@@ -8,12 +8,12 @@
 ## LaunchDarkly overview
 
 [LaunchDarkly](https://www.launchdarkly.com) is a feature management platform that serves over 100 billion feature flags daily to help teams build better software, faster. [Get started](https://docs.launchdarkly.com/docs/getting-started) using LaunchDarkly today!
- 
+
 [![Twitter Follow](https://img.shields.io/twitter/follow/launchdarkly.svg?style=social&label=Follow&maxAge=2592000)](https://twitter.com/intent/follow?screen_name=launchdarkly)
 
 ## Supported Python versions
 
-This version of the LaunchDarkly SDK is compatible with Python 2.7 and 3.3 through 3.7. It is tested with the most recent patch releases of those versions. Python 2.6 is no longer supported.
+This version of the LaunchDarkly SDK is compatible with Python 3.5 through 3.9. It is tested with the most recent patch releases of those versions. Python versions 2.7 to 3.4 are no longer supported.
 
 ## Getting started
 

Diff for: demo/demo.py

@@ -13,7 +13,7 @@ help:
 	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
 install:
-	pip install -r requirements.txt
+	pip3 install -r requirements.txt
 
 html: install
 	@$(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

Diff for: docs/Makefile

@@ -5,7 +5,7 @@ ldclient module
 ---------------
 
 .. automodule:: ldclient
-    :members: get,set_config,set_sdk_key
+    :members: get,set_config
 
 ldclient.client module
 ----------------------

Diff for: docs/api-main.rst

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#
+# type: ignore
 # Configuration file for the Sphinx documentation builder.
 #
 # This file does only contain a selection of the most common options. For a
@@ -46,6 +46,7 @@
 # ones.
 extensions = [
     'sphinx.ext.autodoc',
+    'sphinx_autodoc_typehints',
     'sphinx.ext.coverage',
     'sphinx.ext.viewcode',
 ]

Diff for: docs/conf.py

@@ -1,10 +1,10 @@
-sphinx<2.0
+sphinx
 sphinx_rtd_theme
+sphinx-autodoc-typehints
 
 backoff>=1.4.3
 certifi>=2018.4.16
 expiringdict>=1.1.4
-six>=1.10.0
 pyRFC3339>=1.0
 jsonpickle==0.9.3
 semver>=2.7.9

Diff for: docs/requirements.txt

@@ -2,8 +2,6 @@
 The ldclient module contains the most common top-level entry points for the SDK.
 """
 
-import logging
-
 from ldclient.rwlock import ReadWriteLock
 from ldclient.version import VERSION
 from .client import *
@@ -20,27 +18,27 @@
 start_wait = 5
 
 __client = None
-__config = Config()
+__config = None
 __lock = ReadWriteLock()
 
 
-def set_config(config):
+def set_config(config: Config):
     """Sets the configuration for the shared SDK client instance.
 
     If this is called prior to :func:`ldclient.get()`, it stores the configuration that will be used when the
     client is initialized. If it is called after the client has already been initialized, the client will be
     re-initialized with the new configuration (this will result in the next call to :func:`ldclient.get()`
     returning a new client instance).
 
-    :param ldclient.config.Config config: the client configuration
+    :param config: the client configuration
     """
     global __config
     global __client
     global __lock
     try:
         __lock.lock()
         if __client:
-            log.info("Reinitializing LaunchDarkly Client " + version.VERSION + " with new config")
+            log.info("Reinitializing LaunchDarkly Client " + VERSION + " with new config")
             new_client = LDClient(config=config, start_wait=start_wait)
             old_client = __client
             __client = new_client
@@ -50,57 +48,15 @@ def set_config(config):
         __lock.unlock()
 
 
-def set_sdk_key(sdk_key):
-    """Sets the SDK key for the shared SDK client instance.
-
-    If this is called prior to :func:`ldclient.get()`, it stores the SDK key that will be used when the client is
-    initialized. If it is called after the client has already been initialized, the client will be
-    re-initialized with the new SDK key (this will result in the next call to :func:`ldclient.get()` returning a
-    new client instance).
-
-    If you need to set any configuration options other than the SDK key, use :func:`ldclient.set_config()` instead.
-
-    :param string sdk_key: the new SDK key
-    """
-    global __config
-    global __client
-    global __lock
-    sdk_key_changed = False
-    try:
-        __lock.rlock()
-        if sdk_key == __config.sdk_key:
-            log.info("New sdk_key is the same as the existing one. doing nothing.")
-        else:
-            sdk_key_changed = True
-    finally:
-        __lock.runlock()
-
-    if sdk_key_changed:
-        try:
-            __lock.lock()
-            __config = __config.copy_with_new_sdk_key(new_sdk_key=sdk_key)
-            if __client:
-                log.info("Reinitializing LaunchDarkly Client " + version.VERSION + " with new sdk key")
-                new_client = LDClient(config=__config, start_wait=start_wait)
-                old_client = __client
-                __client = new_client
-                old_client.close()
-        finally:
-            __lock.unlock()
-
-
-def get():
+def get() -> LDClient:
     """Returns the shared SDK client instance, using the current global configuration.
 
-    To use the SDK as a singleton, first make sure you have called :func:`ldclient.set_sdk_key()` or
-    :func:`ldclient.set_config()` at startup time. Then ``get()`` will return the same shared
-    :class:`ldclient.client.LDClient` instance each time. The client will be initialized if it has
-    not been already.
+    To use the SDK as a singleton, first make sure you have called :func:`ldclient.set_config()`
+    at startup time. Then ``get()`` will return the same shared :class:`ldclient.client.LDClient`
+    instance each time. The client will be initialized if it has not been already.
 
     If you need to create multiple client instances with different configurations, instead of this
     singleton approach you can call the :class:`ldclient.client.LDClient` constructor directly instead.
-
-    :rtype: ldclient.client.LDClient
     """
     global __config
     global __client
@@ -109,13 +65,15 @@ def get():
         __lock.rlock()
         if __client:
             return __client
+        if __config is None:
+            raise Exception("set_config was not called")
     finally:
         __lock.runlock()
 
     try:
         __lock.lock()
         if not __client:
-            log.info("Initializing LaunchDarkly Client " + version.VERSION)
+            log.info("Initializing LaunchDarkly Client " + VERSION)
             __client = LDClient(config=__config, start_wait=start_wait)
         return __client
     finally:
@@ -136,27 +94,4 @@ def _reset_client():
         c.close()
 
 
-# currently hidden from documentation - see docs/README.md
-class NullHandler(logging.Handler):
-    """A :class:`logging.Handler` implementation that does nothing.
-
-    .. deprecated:: 6.0.0
-      You should not need to use this class. It was originally used in order to support Python 2.6,
-      which requires that at least one logging handler must always be configured. However, the SDK
-      no longer supports Python 2.6.
-    """
-    def emit(self, record):
-        pass
-
-
-if not log.handlers:
-    log.addHandler(NullHandler())
-
-try:
-    # noinspection PyUnresolvedReferences
-    unicode
-except NameError:
-    __BASE_TYPES__ = (str, float, int, bool)
-else:
-    # noinspection PyUnresolvedReferences
-    __BASE_TYPES__ = (str, float, int, bool, unicode)
+__BASE_TYPES__ = (str, float, int, bool)