diff --git a/README.md b/README.md index 23b6fc7dc522f17a07cf550f10f376104afc04b6..9c5a78f4e06b29b666feba16371d8fb0f4f104a7 100644 --- a/README.md +++ b/README.md @@ -115,6 +115,7 @@ Next change the version in the following places: # Release Notes +* 0.19.0 Ensure requirements.txt are installed when using pip install * 0.18.3 Many configuration fixes in tango device configs, Fixed APS & EC device port mapping, fixed variable initialization in several devices, Fixed XST device going into fault state, prevent UDP packet loss and verify UDP buffer size for XSTs, diff --git a/bin/start-ds.sh b/bin/start-ds.sh index e05e25beebd09ba043a89f8ccb9421956eadc371..723a8d9d76741b9e375deaab2996bbc1e00d1ca2 100755 --- a/bin/start-ds.sh +++ b/bin/start-ds.sh @@ -41,7 +41,7 @@ else # DO NOT PUT SPACES IN THE EXCLUDE LIST! rsync -av --progress --exclude={".tox","*.egg-info","dist","build",".git","*.pyc","cover",".stestr",".coverage*",".pytest_cache","htmlcov"} /opt/lofar/tango/tangostationcontrol /tmp/ cd /tmp/tangostationcontrol || exit 1 - pip -vvv install --upgrade --force-reinstall ./ + pip -vvv install --no-deps --force-reinstall ./ fi # Return to the stored the directory, this preserves the working_dir argument in diff --git a/sbin/run_integration_test.sh b/sbin/run_integration_test.sh index c166b35b4700f254b560ebd7111c0e90cacdbf10..101e79e3d4c2728a4e7ede548bb7d8516883d04c 100755 --- a/sbin/run_integration_test.sh +++ b/sbin/run_integration_test.sh @@ -98,7 +98,7 @@ make start logstash http-json-schemas object-storage init-object-storage # Update the dsconfig # Do not remove `bash`, otherwise statement ignored by gitlab ci shell! -bash "${LOFAR20_DIR}"/sbin/update_ConfigDb.sh "${LOFAR20_DIR}"/CDB/LOFAR_ConfigDb.json +bash "${LOFAR20_DIR}"/sbin/load_ConfigDb.sh "${LOFAR20_DIR}"/CDB/LOFAR_ConfigDb.json bash "${LOFAR20_DIR}"/sbin/update_ConfigDb.sh "${LOFAR20_DIR}"/CDB/test_environment_ConfigDb.json bash "${LOFAR20_DIR}"/sbin/update_ConfigDb.sh "${LOFAR20_DIR}"/CDB/stations/simulators_ConfigDb.json bash "${LOFAR20_DIR}"/sbin/update_ConfigDb.sh "${LOFAR20_DIR}"/CDB/stations/dummy_positions_ConfigDb.json diff --git a/tangostationcontrol/VERSION b/tangostationcontrol/VERSION index 267d7e011feae65732d5714726d601dbf9032289..1cf0537c34385c81dd797cc51be2a589e17118e9 100644 --- a/tangostationcontrol/VERSION +++ b/tangostationcontrol/VERSION @@ -1 +1 @@ -0.18.3 +0.19.0 diff --git a/tangostationcontrol/pyproject.toml b/tangostationcontrol/pyproject.toml index 3588ce52b18906626e85093548e7e323c81f0cf3..63f09a96268a6e5f9e8829c758d9e208a1b8bb97 100644 --- a/tangostationcontrol/pyproject.toml +++ b/tangostationcontrol/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ['setuptools>=42', 'wheel'] +requires = ['setuptools>=62.6', 'wheel'] build-backend = 'setuptools.build_meta' diff --git a/tangostationcontrol/setup.cfg b/tangostationcontrol/setup.cfg index 0cc8fd1336aa8a297b5cc6322664890ef5c16d33..11f69814ceb864875cb806b9c2866c967febb782 100644 --- a/tangostationcontrol/setup.cfg +++ b/tangostationcontrol/setup.cfg @@ -24,8 +24,7 @@ classifier = include_package_data = true packages = find: python_requires = >3.10 -install_requires = - pip>=1.5 +install_requires = file: requirements.txt [options.packages.find] where = .