Browse Source

ci and various scripts: point to new commands

Vincent A 2 months ago
parent
commit
707b177949

+ 1
- 1
.gitlab-ci.yml View File

@@ -27,7 +27,7 @@ load-modules:3:
27 27
   image: "python:3"
28 28
   stage: "test"
29 29
   script:
30
-    - "./tools/local_run.sh woob-config update"
30
+    - "./tools/local_run.sh woob config update"
31 31
 
32 32
 unittests:3:
33 33
   image: "python:3"

+ 1
- 1
tools/local_install.py View File

@@ -47,7 +47,7 @@ subprocess.check_call(
47 47
         'install', '--user', '--install-scripts=%s' % dest] + sys.argv[2:],
48 48
     cwd=os.path.join(os.path.dirname(__file__), os.pardir))
49 49
 
50
-subprocess.call([sys.executable, os.path.join(dest, 'woob-config'), 'update'])
50
+subprocess.call([sys.executable, os.path.join(dest, 'woob'), 'config', 'update'])
51 51
 
52 52
 print()
53 53
 print("Installation done. Applications are available in ‘%s’." % dest)

+ 2
- 2
tools/local_run.py View File

@@ -65,9 +65,9 @@ run_quiet([
65 65
 run_quiet([
66 66
     venv_exe, '-m', 'pip', 'install', '--no-deps', '--editable', project,
67 67
 ])
68
-run_quiet([os.path.join(venv, 'bin', 'woob-config'), 'update', '-d'])
68
+run_quiet([os.path.join(venv, 'bin', 'woob'), 'config', 'update', '-d'])
69 69
 
70
-if os.path.exists(script):
70
+if os.path.isfile(script):
71 71
     spath = script
72 72
 else:
73 73
     spath = os.path.join(venv, 'bin', script)

+ 2
- 2
tools/make_man.sh View File

@@ -27,8 +27,8 @@ export WEBOOB_WORKDIR="${WEBOOB_TMPDIR}"
27 27
 export WEBOOB_DATADIR="${WEBOOB_TMPDIR}"
28 28
 export PYTHONPATH="${WEBOOB_DIR}"
29 29
 # TODO can we require weboob to be installed before being able to run run_tests.sh?
30
-# if we can, then woob-config is present in PATH (virtualenv or whatever)
31
-${PYTHON} -c "import sys; sys.argv='woob-config update'.split(); from weboob.applications.weboobcfg import WeboobCfg; WeboobCfg.run()"
30
+# if we can, then woob config is present in PATH (virtualenv or whatever)
31
+${PYTHON} -c "import sys; sys.argv='woob config update'.split(); from weboob.applications.weboobcfg import WeboobCfg; WeboobCfg.run()"
32 32
 
33 33
 $PYTHON "${WEBOOB_DIR}/tools/make_man.py"
34 34
 

+ 2
- 2
tools/run_tests.sh View File

@@ -113,8 +113,8 @@ export NOSE_NOPATH="1"
113 113
 
114 114
 if [[ ($TEST_MODULES = 1) || (-n "${BACKEND}") ]]; then
115 115
     # TODO can we require weboob to be installed before being able to run run_tests.sh?
116
-    # if we can, then woob-config is present in PATH (virtualenv or whatever)
117
-    ${PYTHON} -c "import sys; sys.argv='woob-config update'.split(); from weboob.applications.weboobcfg import WeboobCfg; WeboobCfg.run()"
116
+    # if we can, then woob config is present in PATH (virtualenv or whatever)
117
+    ${PYTHON} -c "import sys; sys.argv='woob config update'.split(); from weboob.applications.weboobcfg import WeboobCfg; WeboobCfg.run()"
118 118
 fi
119 119
 
120 120
 # allow failing commands past this point

+ 1
- 1
tools/setup-virtualenv.sh View File

@@ -73,4 +73,4 @@ then
73 73
     echo "You can add file://$SRC/modules into $VDIR/workdir/sources.list to use local modules instead of downloading modules."
74 74
 fi
75 75
 
76
-./bin/woob-config update
76
+./bin/woob config update

+ 2
- 2
tools/weboob_lint.sh View File

@@ -22,8 +22,8 @@ export WEBOOB_DATADIR="${WEBOOB_TMPDIR}"
22 22
 export PYTHONPATH="${WEBOOB_DIR}"
23 23
 set +e
24 24
 # TODO can we require weboob to be installed before being able to run run_tests.sh?
25
-# if we can, then woob-config is present in PATH (virtualenv or whatever)
26
-${PYTHON} -c "import sys; sys.argv='woob-config update'.split(); from weboob.applications.weboobcfg import WeboobCfg; WeboobCfg.run()"
25
+# if we can, then woob config is present in PATH (virtualenv or whatever)
26
+${PYTHON} -c "import sys; sys.argv='woob config update'.split(); from weboob.applications.weboobcfg import WeboobCfg; WeboobCfg.run()"
27 27
 
28 28
 $PYTHON "${WEBOOB_DIR}/tools/weboob_lint.py"
29 29
 

+ 1
- 1
weboob/core/modules.py View File

@@ -159,7 +159,7 @@ class ModulesLoader(object):
159 159
             raise ModuleLoadError(module_name, e)
160 160
 
161 161
         if module.version != self.version:
162
-            raise ModuleLoadError(module_name, "Module requires Weboob %s, but you use Weboob %s. Hint: use 'woob-config update'"
162
+            raise ModuleLoadError(module_name, "Module requires Weboob %s, but you use Weboob %s. Hint: use 'woob config update'"
163 163
                                                % (module.version, self.version))
164 164
 
165 165
         self.loaded[module_name] = module

+ 1
- 1
weboob/core/ouiboube.py View File

@@ -454,7 +454,7 @@ class Weboob(WebNip):
454 454
 
455 455
         if not self.repositories.check_repositories():
456 456
             self.logger.error(u'Repositories are not consistent with the sources.list')
457
-            raise VersionsMismatchError(u'Versions mismatch, please run "woob-config update"')
457
+            raise VersionsMismatchError(u'Versions mismatch, please run "woob config update"')
458 458
 
459 459
         for backend_name, module_name, params in self.backends_config.iter_backends():
460 460
             if '_enabled' in params and not params['_enabled'].lower() in ('1', 'y', 'true', 'on', 'yes') or \