diff --git a/Makefile b/Makefile index b57a915906ac5de1214c641e1e4ffb0525ad520a..b7b7b38997b1e3094d25e9498c4d91c38fb0811f 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,19 @@ install-confignator: @echo "+---------------------------------------+" @echo "| installing confignator Python package |" @echo "+---------------------------------------+" - $(MAKE) reinstall -C $(CURDIR)/Tst/confignator + $(MAKE) build -C $(CURDIR)/Tst/confignator + pip install -U $(CURDIR)/Tst/confignator/dist/*.whl + @echo "+--------------------------------------+" + @echo "| installed confignator Python package |" + @echo "+--------------------------------------+" + @echo + +install-confignator-userspace: + @echo "+---------------------------------------+" + @echo "| installing confignator Python package |" + @echo "+---------------------------------------+" + $(MAKE) build -C $(CURDIR)/Tst/confignator + pip install --user -U $(CURDIR)/Tst/confignator/dist/*.whl @echo "+--------------------------------------+" @echo "| installed confignator Python package |" @echo "+--------------------------------------+" @@ -42,7 +54,17 @@ install-python-env: @echo "+-----------------------------+" @echo "| installing Python modules |" @echo "+-----------------------------+" - python -m pip install --user --upgrade numpy scipy matplotlib cairocffi mysqlclient sqlalchemy wheel sphinx sphinx_rtd_theme astropy crcmod psutil + python -m pip install --user --upgrade numpy scipy matplotlib cairocffi mysqlclient sqlalchemy wheel sphinx sphinx_rtd_theme astropy crcmod psutil + @echo "+-----------------------------+" + @echo "| installed Python modules |" + @echo "+-----------------------------+" + @echo + +install-python-requirements: + @echo "+-----------------------------+" + @echo "| installing Python modules |" + @echo "+-----------------------------+" + pip install -U -r $(CURDIR)/requirements.txt @echo "+-----------------------------+" @echo "| installed Python modules |" @echo "+-----------------------------+" diff --git a/README b/README index 318c9ca4c4c84997cec684198a6e574b62b082f4..c50ccbc8dca17c649e83cf91d5921656f2fc98ad 100644 --- a/README +++ b/README @@ -19,11 +19,11 @@ manjaro-xfce-21.0.5 linux5.10 3) install packages/devtools - gtksourceview3 [<=3.24.11-1] - - ipython [<=7.31] + - ipython [<=7.*] - python-pip - make -4) install python modules (to install the modules with pip in ~/.local, you can run 'make install-python-env' in the CCS base directory) +4) install python modules (to install the modules with pip in ~/.local, you can run 'make install-python-env' in the CCS base directory or use 'pip install [--user] -r requirements.txt') - python-numpy - python-scipy - python-matplotlib diff --git a/Tst/confignator/Makefile b/Tst/confignator/Makefile index 5a6bdb92256c9c7304215f7bc88555590659e58b..28b5a7e74cbd447d17a8f71324b6649169a67126 100644 --- a/Tst/confignator/Makefile +++ b/Tst/confignator/Makefile @@ -17,7 +17,7 @@ clean: clean-build clean-doc-build reinstall: clean uninstall build install -build: +build: clean @echo "\e[1m=====================================\e[0m" @echo "\e[1m building confignator Python package \e[0m" @echo "\e[1m=====================================\e[0m" diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000000000000000000000000000000000000..400825231dffd1d59306f97e0cb49090b124d296 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,19 @@ +# requirements for running CCS/TST +# markupsafe < 2.1.0 +wheel +ipython >= 7, < 8 +numpy +scipy +matplotlib +cairocffi +mysqlclient +sqlalchemy +sphinx +sphinx_rtd_theme +astropy +crcmod +psutil + +# for TASTE, which also needs libdbus-1-dev, gir1.2-notify-0.7, libgirepository1.0-dev, libgtk-3-dev +# pygobject +# dbus-python