scdata 1.5.2__tar.gz → 1.5.4__tar.gz

{scdata-1.5.2/scdata.egg-info → scdata-1.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scdata
-Version: 1.5.2
+Version: 1.5.4
 Summary: Analysis of sensors and time series data
 Home-page: https://github.com/fablabbcn/smartcitizen-data
 Author: oscgonfer
@@ -28,8 +28,8 @@ Requires-Dist: requests
 Requires-Dist: scipy
 Requires-Dist: scikit-learn
 Requires-Dist: seaborn
-Requires-Dist: smartcitizen-connector>=1.5.1
-Requires-Dist: timezonefinder~=6.1.9
+Requires-Dist: smartcitizen-connector>=1.5.2
+Requires-Dist: timezonefinder<10,>=6.5
 Provides-Extra: plotting
 Requires-Dist: bokeh; extra == "plotting"
 Requires-Dist: panel; extra == "plotting"

{scdata-1.5.2 → scdata-1.5.4}/requirements.txt

@@ -8,5 +8,5 @@ requests
 scipy
 scikit-learn
 seaborn
-smartcitizen-connector>=1.5.1
-timezonefinder~=6.1.9
+smartcitizen-connector>=1.5.2
+timezonefinder>=6.5,<10

{scdata-1.5.2 → scdata-1.5.4}/scdata/__init__.py

@@ -3,4 +3,4 @@ from .device import Device
 from .test import Test
 from .models import Source, TestOptions, DeviceOptions, APIParams, FileParams, CSVParams
 
-__version__ = '1.5.2'
+__version__ = '1.5.4'

{scdata-1.5.2 → scdata-1.5.4}/scdata/_config/config.py

@@ -76,7 +76,11 @@ class Config(object):
     ### -------------SMART CITIZEN-------------
     ### ---------------------------------------
     # # Urls
-    _base_postprocessing_url = 'https://raw.githubusercontent.com/fablabbcn/smartcitizen-data/master/'
+    # Blueprints and calibrations are read from BASE_POSTPROCESSING_URL, the same variable as
+    # smartcitizen-connector (e.g. flows: https://flows.smartcitizen.me/api/v1/). By default,
+    # the smartcitizen-data repository. These urls are not saved in config.yaml
+    _base_postprocessing_url = environ.get('BASE_POSTPROCESSING_URL',
+        'https://raw.githubusercontent.com/fablabbcn/smartcitizen-data/master/').rstrip('/') + '/'
     _default_file_type = 'json'
 
     calibrations_urls = [
@@ -107,6 +111,9 @@ class Config(object):
     #     f'{_base_postprocessing_url}connectors/nilu.{_default_file_type}'
     # ]
 
+    # Not saved in config.yaml, derived from _base_postprocessing_url
+    _derived_settings = ['blueprints_urls', 'calibrations_urls', 'names_urls']
+
     names_urls = [
         # Revert to base postprocessing url
         # f'{_base_postprocessing_url}names/SCDevice.json'
@@ -743,6 +750,8 @@ class Config(object):
                 saved_config = yaml.load(cf, Loader = yaml.SafeLoader)
 
             for k, v in saved_config.items():
+                # Urls come from BASE_POSTPROCESSING_URL: ignore those saved by older versions
+                if k in self._derived_settings: continue
 
                 try:
                     self.__setattr__(k, v)
@@ -757,7 +766,7 @@ class Config(object):
         """ Save current config to file. """
         c = dict()
         for setting in self:
-            if not setting.startswith('_') and not callable(self.__getitem__(setting)) and setting not in ['blueprints', 'names', 'calibrations']:
+            if not setting.startswith('_') and not callable(self.__getitem__(setting)) and setting not in ['blueprints', 'names', 'calibrations'] + self._derived_settings:
                 c[setting] = self[setting]
 
         _sccpath = join(self.paths['config'], 'config.yaml')

{scdata-1.5.2 → scdata-1.5.4/scdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scdata
-Version: 1.5.2
+Version: 1.5.4
 Summary: Analysis of sensors and time series data
 Home-page: https://github.com/fablabbcn/smartcitizen-data
 Author: oscgonfer
@@ -28,8 +28,8 @@ Requires-Dist: requests
 Requires-Dist: scipy
 Requires-Dist: scikit-learn
 Requires-Dist: seaborn
-Requires-Dist: smartcitizen-connector>=1.5.1
-Requires-Dist: timezonefinder~=6.1.9
+Requires-Dist: smartcitizen-connector>=1.5.2
+Requires-Dist: timezonefinder<10,>=6.5
 Provides-Extra: plotting
 Requires-Dist: bokeh; extra == "plotting"
 Requires-Dist: panel; extra == "plotting"

{scdata-1.5.2 → scdata-1.5.4}/scdata.egg-info/requires.txt

@@ -8,8 +8,8 @@ requests
 scipy
 scikit-learn
 seaborn
-smartcitizen-connector>=1.5.1
-timezonefinder~=6.1.9
+smartcitizen-connector>=1.5.2
+timezonefinder<10,>=6.5
 
 [dev]
 pytest

{scdata-1.5.2 → scdata-1.5.4}/setup.py

@@ -19,7 +19,7 @@ REQUIREMENTS = [i.strip() for i in open("requirements.txt").readlines()]
 
 setup(
     name='scdata',
-    version='1.5.2',
+    version='1.5.4',
     description='Analysis of sensors and time series data',
     author='oscgonfer',
     license='GNU-GPL3.0',