Merge pull request #10 from drone/ci_workflow

CI workflow

Author: enver-bisevac

.github/ci.yml renamed to .github/workflows/ci.yml

@@ -24,13 +24,13 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install flake8 pytest
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+        if [ -f requirements_dev.txt ]; then pip install -r requirements_dev.txt; fi
+    - name: Format
+      run: |
+        make fmt
     - name: Lint with flake8
       run: |
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+        make lint
     - name: Test with pytest
       run: |
-        pytest
+        make test

featureflags/client.py

@@ -109,27 +109,33 @@ def map_segments_from_cache(self, fc: FeatureConfig) -> None:
         if self._config.cache:
             segments = fc.get_segment_identifiers()
             for identifier in segments:
-                segment = self._config.cache.get(f'segments/{identifier}')
-                if fc.segments is None:
-                    fc.segments = Segments({})
-                fc.segments[identifier] = segment
+                try:
+                    segment = self._config.cache.get(f'segments/{identifier}')
+                    if fc.segments is None:
+                        fc.segments = Segments({})
+                    fc.segments[identifier] = segment
+                except KeyError:
+                    log.warn("segment %s not found in cache", identifier)
 
     def _variation(self, fn: str, identifier: str, target: Target,
                    default: Any) -> Any:
         if self._config.cache:
-            fc = self._config.cache.get(f'flags/{identifier}')
-            if fc:
-                self.map_segments_from_cache(fc)
-                method = getattr(fc, fn, None)
-                if method:
-                    variation = method(target)
-                    if variation is None:
-                        log.debug('No variation found')
-                        return default
-                    self._analytics.enqueue(target, fc, variation)
-                    return variation.bool()
-                else:
-                    log.error("Wrong method name %s", fn)
+            try:
+                fc = self._config.cache.get(f'flags/{identifier}')
+                if fc:
+                    self.map_segments_from_cache(fc)
+                    method = getattr(fc, fn, None)
+                    if method:
+                        variation = method(target)
+                        if variation is None:
+                            log.debug('No variation found')
+                            return default
+                        self._analytics.enqueue(target, fc, variation)
+                        return variation.bool()
+                    else:
+                        log.error("Wrong method name %s", fn)
+            except KeyError:
+                log.warn("flag %s not found in cache", identifier)
         return default
 
     def bool_variation(self, identifier: str, target: Target,

featureflags/lru_cache.py

@@ -34,8 +34,7 @@ def set(self, key: str, value: Any) -> None:
 
     def get(self, key: str) -> Any:
         val = self.cache.get(key)
-        if val:
-            self.cache.move_to_end(key)
+        self.cache.move_to_end(key)
         return val
 
     def remove(self, keys: List[str]) -> None:

requirements_dev.txt

@@ -2,11 +2,13 @@ pip==19.2.3
 bump2version==0.5.11
 wheel==0.33.6
 watchdog==0.9.0
-flake8==3.7.8
+flake8==3.9.2
+autopep8==1.5.7
+isort==5.8.0
 mypy==0.812
 tox==3.14.0
 coverage==4.5.4
-Sphinx==1.8.5
+Sphinx==4.1.2
 twine==3.4.1
 
 pytest==5.1
@@ -18,5 +20,7 @@ attrs~=21.2.0
 
 pyjwt==2.0.1
 
-openapi-python-client~=0.9.2
-requests==2.25.1
+openapi-python-client~=0.10.3
+requests==2.25.1
+
+mmh3