Pythonic requirements

.envrc

@@ -0,0 +1,2 @@
+use asdf
+layout python3

.gitignore

@@ -4,9 +4,20 @@
 sdl92.tokens
 install.record
 
+.direnv/
+.idea/
+.fleet/
+
 antlr-3.1.3.tar.bz2
 antlr-3.1.3/
 
+antlr3_python3_runtime_3.4/
+
+
+build
+opengeode/icons.py
+opengeode.egg-info
+
 test_c
 
 tests/**/*.stg

.tool-versions

@@ -0,0 +1 @@
+python 3.7.16

.venv

@@ -0,0 +1 @@
+.direnv/python-3.7.16/

Makefile

@@ -48,22 +48,50 @@ compile-all:
 update:
 	git pull
 
-dependencies:
-	sudo apt install -y python3 python3-pip libgl1 gnat python3-pexpect
-	# installing pyside6 through pip because of bugs with QML in the Debian bullseye release
-	python3 -m pip install --user --upgrade pyside6
-	# python3-antlr3 runtime is not available in any official repo, taking in from TASTE
-	cd /tmp ; wget -q -O - https://download.tuxfamily.org/taste/antlr3_python3_runtime_3.4.tar.bz2 | tar jxpvf - ; cd antlr3_python3_runtime_3.4 ; python3 -m pip install --user --upgrade .
-	sudo apt install -y python3-pygraphviz
-	sudo apt install -y python3-stringtemplate3
-	sudo apt install -y python3-singledispatch
-	# install ASN1SCC in ~/.local/bin
-	mkdir -p ~/.local/bin
-	cd ~/.local ; wget -q -O - https://github.com/ttsiodras/asn1scc/releases/download/4.5.0.0/asn1scc-bin-4.5.0.0.tar.bz2 | tar jxpvf - ; cd bin ; ln -s ../asn1scc/* .
-	echo [-] IMPORTANT: Make sure that ~/.local/bin is in your PATH
-
-install:
-	PATH=~/.local/bin:"${PATH}" pyside6-rcc opengeode.qrc -o opengeode/icons.py && python3 -m pip install --user --upgrade .
+
+check-venv:
+	@if [ -z "$(VIRTUAL_ENV)" ]; then \
+		echo "No virtual environment is active."; \
+		exit 127; \
+	fi
+
+antlr3_python3_runtime_3.4:
+	wget -q -O - https://download.tuxfamily.org/taste/antlr3_python3_runtime_3.4.tar.bz2 | tar jxpvf -
+
+
+requirements.txt: requirements.in system-dependencies
+	$(MAKE) check-venv
+	pip install pip-tools
+	pip-compile requirements.in
+	# as soon as we have a requirement.txt, we install everything... can we do better ?
+	pip-sync
+
+opengeode/icons.py: opengeode.qrc
+	pyside6-rcc opengeode.qrc -o opengeode/icons.py
+
+
+system-dependencies: antlr3_python3_runtime_3.4
+	sudo apt install graphviz graphviz-dev
+
+#dependencies:
+#	sudo apt install -y python3 python3-pip libgl1 gnat python3-pexpect
+#	# installing pyside6 through pip because of bugs with QML in the Debian bullseye release
+#	python3 -m pip install --user --upgrade pyside6
+#	# python3-antlr3 runtime is not available in any official repo, taking in from TASTE
+#	cd /tmp ; wget -q -O - https://download.tuxfamily.org/taste/antlr3_python3_runtime_3.4.tar.bz2 | tar jxpvf - ; cd antlr3_python3_runtime_3.4 ; python3 -m pip install --user --upgrade .
+#	sudo apt install -y python3-pygraphviz
+#	sudo apt install -y python3-stringtemplate3
+#	sudo apt install -y python3-singledispatch
+#	# install ASN1SCC in ~/.local/bin
+#	mkdir -p ~/.local/bin
+#	cd ~/.local ; wget -q -O - https://github.com/ttsiodras/asn1scc/releases/download/4.5.0.0/asn1scc-bin-4.5.0.0.tar.bz2 | tar jxpvf - ; cd bin ; ln -s ../asn1scc/* .
+#	echo [-] IMPORTANT: Make sure that ~/.local/bin is in your PATH
+
+pyinstall: requirements.txt opengeode/icons.py
+	@python3 -m pip install --edit .
+
+#install:
+#	PATH=~/.local/bin:"${PATH}" pyside6-rcc opengeode.qrc -o opengeode/icons.py && python3 -m pip install --user --upgrade .
 
 full-install: update
 	$(MAKE) dependencies

requirements.in

@@ -0,0 +1,4 @@
+pip-tools
+-e antlr3_python3_runtime_3.4
+pyside6
+pygraphviz

requirements.txt

@@ -0,0 +1,54 @@
+#
+# This file is autogenerated by pip-compile with Python 3.7
+# by the following command:
+#
+#    pip-compile requirements.in
+#
+-e file:///opt/Projects/opengeode/antlr3_python3_runtime_3.4
+    # via -r requirements.in
+build==0.9.0
+    # via pip-tools
+click==8.1.3
+    # via pip-tools
+importlib-metadata==5.1.0
+    # via
+    #   build
+    #   click
+    #   pep517
+packaging==22.0
+    # via build
+pep517==0.13.0
+    # via build
+pip-tools==6.11.0
+    # via -r requirements.in
+pygraphviz==1.7
+    # via -r requirements.in
+pyside6==6.4.1
+    # via -r requirements.in
+pyside6-addons==6.4.1
+    # via pyside6
+pyside6-essentials==6.4.1
+    # via
+    #   pyside6
+    #   pyside6-addons
+shiboken6==6.4.1
+    # via
+    #   pyside6
+    #   pyside6-addons
+    #   pyside6-essentials
+tomli==2.0.1
+    # via
+    #   build
+    #   pep517
+typing-extensions==4.4.0
+    # via importlib-metadata
+wheel==0.38.4
+    # via pip-tools
+zipp==3.11.0
+    # via
+    #   importlib-metadata
+    #   pep517
+
+# The following packages are considered to be unsafe in a requirements file:
+# pip
+# setuptools