scdata 1.3.0__tar.gz → 1.4.0__tar.gz

{scdata-1.3.0/scdata.egg-info → scdata-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scdata
-Version: 1.3.0
+Version: 1.4.0
 Summary: Analysis of sensors and time series data
 Home-page: https://github.com/fablabbcn/smartcitizen-data
 Author: oscgonfer
@@ -18,15 +18,11 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: branca~=0.4.0
-Requires-Dist: Flask~=2.2.2
-Requires-Dist: folium~=0.12.1
 Requires-Dist: geopy~=1.21.0
 Requires-Dist: Jinja2~=3.1.2
 Requires-Dist: matplotlib
 Requires-Dist: pandas~=2.2.2
 Requires-Dist: pydantic
-Requires-Dist: pytest
 Requires-Dist: PyYAML~=6.0.1
 Requires-Dist: requests
 Requires-Dist: scipy
@@ -34,11 +30,22 @@ Requires-Dist: scikit-learn
 Requires-Dist: seaborn
 Requires-Dist: smartcitizen-connector
 Requires-Dist: termcolor==1.1.0
-Requires-Dist: tqdm~=4.50.2
 Requires-Dist: timezonefinder~=6.1.9
 Requires-Dist: urllib3
-Requires-Dist: boto3
-Requires-Dist: awswrangler
+Requires-Dist: Flask~=2.2.2
+Provides-Extra: plotting
+Requires-Dist: bokeh; extra == "plotting"
+Requires-Dist: panel; extra == "plotting"
+Requires-Dist: branca~=0.4.0; extra == "plotting"
+Requires-Dist: folium~=0.12.1; extra == "plotting"
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: bokeh; extra == "dev"
+Requires-Dist: panel; extra == "dev"
+Requires-Dist: branca~=0.4.0; extra == "dev"
+Requires-Dist: folium~=0.12.1; extra == "dev"
+Requires-Dist: awswrangler; extra == "dev"
+Requires-Dist: boto3; extra == "dev"
 Dynamic: author
 Dynamic: classifier
 Dynamic: description
@@ -48,6 +55,7 @@ Dynamic: keywords
 Dynamic: license
 Dynamic: license-file
 Dynamic: project-url
+Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{scdata-1.3.0 → scdata-1.4.0}/requirements.txt

@@ -1,17 +1,10 @@
 # TODO To be updated?
-branca~=0.4.0
-# TODO Add once finished with file reports
-Flask~=2.2.2
-# TODO To be updated?
-folium~=0.12.1
-# TODO To be updated?
 geopy~=1.21.0
 # TODO To be updated?
 Jinja2~=3.1.2
 matplotlib
 pandas~=2.2.2
 pydantic
-pytest
 # TODO To be updated?
 PyYAML~=6.0.1
 requests
@@ -20,8 +13,6 @@ scikit-learn
 seaborn
 smartcitizen-connector
 termcolor==1.1.0
-tqdm~=4.50.2
 timezonefinder~=6.1.9
 urllib3
-boto3
-awswrangler
+Flask~=2.2.2

{scdata-1.3.0 → scdata-1.4.0}/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.3.0'
+__version__ = '1.4.0'

{scdata-1.3.0 → scdata-1.4.0}/scdata/_config/config.py

@@ -29,10 +29,6 @@ class Config(object):
 
     # Framework option
     # For renderer plots and config files
-    # Options:
-    # - 'script': no plots in jupyter, updates config
-    # - 'jupyterlab': for plots, updates config
-    # - 'chupiflow': no plots in jupyter, does not update config
     framework = 'script'
 
     if 'IPython' in sys.modules: _ipython_avail = True
@@ -42,9 +38,6 @@ class Config(object):
     _timeout = 3
     _max_http_retries = 2
 
-    # Max concurrent requests
-    _max_concurrent_requests = 30
-
     ### ---------------------------------------
     ### -----------------DATA------------------
     ### ---------------------------------------
@@ -121,7 +114,6 @@ class Config(object):
         'https://raw.githubusercontent.com/fablabbcn/smartcitizen-data/master/names/SCDevice.json'
     ]
 
-
     ### ---------------------------------------
     ### -------------METRICS DATA--------------
     ### ---------------------------------------
@@ -425,7 +417,7 @@ class Config(object):
         'SCD30_HUM': 1,
         'SCD30_TEMP': 1,
         'SD-card': 1,
-        'ST LPS33 - Barometric Pressure': 1,
+        'LPS33_PRESS': 1,
         'PRESS': 1,
         'PMS5003_PM_1': 5,
         'PMS5003_PM_25': 5,
@@ -466,7 +458,12 @@ class Config(object):
         'TEMP': 1,
         'RSSI': 1,
         'NO2': 1,
-        'O3': 1
+        'O3': 1,
+        'AS_TEMP': 1,
+        'AS_PH': 1,
+        'AS_COND': 1,
+        'AS_DO_SAT': 1,
+        'AS_DO': 1
     }
 
     _default_unplausible_values = {
@@ -474,7 +471,8 @@ class Config(object):
         'SCD30_CO2': [300, 2000],
         'SCD30_HUM': [20, 99],
         'SCD30_TEMP': [-20, 50],
-        'ST LPS33 - Barometric Pressure': [50, 110],
+        'BATT': [0, 100],
+        'LPS33_PRESS': [50, 110],
         'PRESS': [50, 110],
         'PMS5003_PM_1': [0, 500],
         'PMS5003_PM_25': [0, 500],
@@ -499,7 +497,12 @@ class Config(object):
         'HUM': [20, 99],
         'TEMP': [-20, 50],
         'NO2': [0, 1000],
-        'O3': [0, 1000]
+        'O3': [0, 1000],
+        'AS_TEMP': [-20, 50],
+        'AS_PH': [0, 14],
+        'AS_COND': [0, 100000],
+        'AS_DO_SAT': [0, 100],
+        'AS_DO': [0, 15]
     }
 
     def __init__(self):
@@ -508,7 +511,6 @@ class Config(object):
         self.load()
         self.get_meta_data()
 
-
     def __getattr__(self, name):
         try:
             return self[name]