From b5a7146adf382e2c9afc51b9dac5bb94d0eca90c Mon Sep 17 00:00:00 2001 From: Peter Kraus Date: Wed, 6 Nov 2024 13:35:42 +0100 Subject: [PATCH] Prepare tag 1.0rc2 (#101) --- README.md | 14 +++++++++++--- pyproject.toml | 9 ++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0142ca5a..e3807b65 100644 --- a/README.md +++ b/README.md @@ -5,17 +5,25 @@ ![Github link](https://badgen.net/github/tag/dgbowl/tomato/?icon=github) ![Github status](https://badgen.net/github/checks/dgbowl/tomato/?icon=github) -`tomato` is the instrument automation package developed at the [ConCat lab](https://tu.berlin/en/concat). Currently supported hardware is: +`tomato` is the instrument automation package developed at the [ConCat lab at TU Berlin](https://tu.berlin/en/concat). Currently supported hardware is: -- `example_counter`: an example device for testing purposes. +- [`tomato-example-counter`](https://github.com/dgbowl/tomato-example-counter): an example device for testing purposes. +- [`tomato-psutil`](https://github.com/dgbowl/tomato-psutil): an interface to the `psutil` library for CPU and memory usage statistics +- [`tomato-bronkhorst`](https://github.com/dgbowl/tomato-bronkhorst): an interface to the `bronkhorst-propar` library for control of Bronkhorst MFCs and PCs See the [Documentation](https://dgbowl.github.io/tomato) for more detailed info. ## Contributors: - [Peter Kraus](http://github.com/PeterKraus) +- [Alexandre Gbocho](https://github.com/AlexN7-Shepard) - [Loris Ercole](http://github.com/lorisercole) - [Graham Kimbell](http://github.com/g-kimbell) ## Acknowledgements -This project has received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No 957189. The project is part of BATTERY 2030+, the large-scale European research initiative for inventing the sustainable batteries of the future. +This project has received funding from: +- the European Union’s Horizon 2020 research and innovation programme under grant agreement No 957189. +- the Emmy Noether Programme of the Deutsche Forschungsgemeinschaft (DFG) under project No 490703766. +- the Priority Programme (SPP) 2419 HyCAM of the Deutsche Forschungsemeinschaft (DFG) under project No 523873650. + +The project is part of BATTERY 2030+, the large-scale European research initiative for inventing the sustainable batteries of the future. diff --git a/pyproject.toml b/pyproject.toml index 977c055f..e4babc86 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,8 +39,8 @@ dependencies = [ [project.optional-dependencies] testing = [ "pytest", - "tomato-example-counter @ git+https://github.com/dgbowl/tomato-example-counter.git", - "tomato-psutil @ git+https://github.com/dgbowl/tomato-psutil.git", + "tomato-example-counter >= 1.0.0", + "tomato-psutil >= 1.0.0", ] docs = [ "sphinx ~= 7.2", @@ -61,7 +61,6 @@ tomato-job = "tomato.daemon.job:tomato_job" tomato-driver = "tomato.daemon.driver:tomato_driver" tomato-daemon = "tomato.daemon:tomato_daemon" - [tool.setuptools-git-versioning] enabled = true dev_template = "{tag}.dev{ccount}" @@ -70,5 +69,5 @@ dirty_template = "{tag}.dev{ccount}" [tool.ruff] [tool.pytest.ini_options] -log_cli = true -log_cli_level = "DEBUG" \ No newline at end of file +# log_cli = true +# log_cli_level = "DEBUG" \ No newline at end of file