PYROS-IRAP / pyros

Commit f49b70783c7f67be36bf039f8267027068bfe469

Authored by Etienne Pallier
1 parent 7ca51dda
Exists in dev

Bugfix tests and new version format 

- Bugfix tests (now all pass)
- Global Version number is now in src/__init__.py (idem for each pyros
application)
- NEW versionning plan : YYYYMMDD.M.mmm.b
    - YYYYMMDD = Day (UTC)
    - M = Major version number
    - mmm = Minor version number
    - b = Bugfix number
Showing 7 changed files with 46 additions and 12 deletions   Show diff stats
Inline Side-by-side
.settings/org.eclipse.core.resources.prefs
  Diff comments   View file @f49b707
... ... @@ -2,3 +2,4 @@ eclipse.preferences.version=1
2 2 encoding//private/venv_py3_pyros/lib/python3.6/site-packages/celery/app/task.py=utf-8
3 3 encoding//private/venv_py3_pyros/lib/python3.6/site-packages/celery/signals.py=utf-8
4 4 encoding//private/venv_py3_pyros/lib/python3.6/site-packages/celery/task/base.py=utf-8
  5 +encoding//src/utils/celme/setup.py=utf-8
... ...
README.md
  Diff comments   View file @f49b707
... ... @@ -67,20 +67,19 @@ This software has been tested and validated with the following configurations :
67 67 --------------------------------------------------------------------------------------------
68 68 ## LAST VERSION
69 69  
70   -Date: 10/10/18
  70 +Date: 15/10/2018
71 71  
72 72 By: E. Pallier
73 73  
74   -VERSION: 2018.0.011.0
  74 +VERSION: 20181015.0.011.1 (bugfix)
75 75  
76   -- NEW versionning plan : YYYY.M.mmm.b
77   - - YYYY = Year
  76 +- NEW versionning plan : YYYYMMDD.M.mmm.b
  77 + - YYYYMMDD = Day (UTC)
78 78 - M = Major version number
79 79 - mmm = Minor version number
80 80 - b = Bugfix number
81   -- new devices_channel/ folder containing the new DeviceControllerAbstract and ClientChannelAbstract classes (independant from pyros for the moment, but will soon be integrated)
82   -- new src/utils/celme (celestial mecanics) library from Alain Klotz (more and more used inside pyros)
83   -- better README.md formatted file
  81 +- Global Version number is now in src/__init__.py (idem for each pyros application)
  82 +- Bugfix tests
84 83  
85 84 --------------------------------------------------------------------------------------------
86 85 - TECHNICAL DOC: tinyurl/pyros-colibri
... ... @@ -100,8 +99,8 @@ VERSION: 2018.0.011.0
100 99 Full list of commits: https://gitlab.irap.omp.eu/epallier/pyros/commits/master
101 100  
102 101 **10/10/18 : Version 2018.0.011 (E. Pallier)**
103   -- NEW versionning plan : YYYY.M.mmm.b
104   - - YYYY = Year
  102 +- NEW versionning plan : YYYYMMDD.M.mmm.b
  103 + - YYYYMMDD = Day (UTC)
105 104 - M = Major version number
106 105 - mmm = Minor version number
107 106 - b = Bugfix number
... ... @@ -189,3 +188,21 @@ Full list of commits: https://gitlab.irap.omp.eu/epallier/pyros/commits/master
189 188 https://projects.irap.omp.eu/versions/87
190 189  
191 190 04/04/16 Installable version (install script)
  191 +
  192 +
  193 +--------------------------------------------------------------------------------------------
  194 +## TODO LIST (URGENT)
  195 +
  196 +DEMO:
  197 +- SIMULATOR:
  198 + - (AC) réserver cette page à un login superuser sinon n'importe qui pourra faire n'importe quoi à distance...
  199 + - 1) PLC :
  200 + - ajouter boutons "START" et "STOP"
  201 + - implémenter weather et site OK/KO
  202 + - 2) TELE : implémenter "start" et "stop"
  203 + - 3) General : implement set to night/day
  204 +
  205 +
  206 +
  207 +
  208 +
... ...
devices_channel/src_device/client/device_controller_abstract.py
  Diff comments   View file @f49b707
... ... @@ -80,8 +80,8 @@ abstract class DeviceControllerAbstract {
80 80 class GenericResult
81 81 --
82 82 {abstract} connect_to_device()
83   - {abstract} format_data_to_send()
84   - {abstract} unformat_received_data()
  83 + {abstract} _format_data_to_send()
  84 + {abstract} _unformat_received_data()
85 85 available_commands()
86 86 execute()
87 87 execute_generic_cmd()
... ...
src/__init__.py
  Diff comments   View file @f49b707
... ... @@ -0,0 +1,8 @@
  1 +
  2 +# S'inspirer de django.utils.version.py => get_version()
  3 +#VERSION = (2, 0, 5, 'final', 0)
  4 +#__version__ = get_version(VERSION)
  5 +
  6 +# See https://packaging.python.org/guides/single-sourcing-package-version
  7 +
  8 +__version__ = '20181015.0.011.1'
... ...
src/majordome/tests.py
  Diff comments   View file @f49b707
... ... @@ -113,6 +113,9 @@ class MajordomeTests(TestCase):
113 113 print("hello3")
114 114 time.sleep(5)
115 115 print("hello4")
  116 +
  117 + # (EP) !!! VERY IMPORTANT, because otherwise the other tests won't pass as they are expecting to run from src/ !!!
  118 + os.chdir('..')
116 119  
117 120 self.tearDown()
118 121 #thread_majordome.join()
... ...
src/routine_manager/tests.py
  Diff comments   View file @f49b707
... ... @@ -6,9 +6,11 @@ SAVED_REQUESTS_FOLDER = "misc/saved_requests/"
6 6  
7 7 class TestRoutineManager(TestCase):
8 8  
9   - fixtures = ["tests/routine_mgr_test.json"]
  9 + fixtures = ['tests/routine_mgr_test.json']
  10 +
10 11  
11 12 def setUp(self):
  13 + #print("Routine Manager test")
12 14 pass
13 15  
14 16 def test_import_fake_file(self):
... ...
src/scheduler/tests.py
  Diff comments   View file @f49b707
... ... @@ -3,6 +3,8 @@ from scheduler.Scheduler import Scheduler
3 3 from common.models import *
4 4 from scheduler.simulator import Simulator
5 5  
  6 +import os
  7 +
6 8 SIMULATION_FILE = 'file:./scheduler/sequences_cador.html'
7 9  
8 10  
... ... @@ -662,4 +664,5 @@ class SchedulerTest(TestCase):
662 664 print("\n===== TEST_SIMULATION =====\n")
663 665  
664 666 simulator = Simulator()
  667 + print("current dir is", os.getcwd())
665 668 simulator.simulate(SIMULATION_FILE)
... ...