Trying to fix version pins

setup.py

@@ -10,16 +10,13 @@
     version = '0.0.1',
     python_requires='>=3.10',
     install_requires=[
-        #defined to stop us using numpy 2 that CQ-cli isn't compatible with
         'numpy~=1.26',
-        #Stop whatever requires nlopt pulling in 2.8 which requires numpy v2.0.0
-        'nlopt<2.8.0',
-        'cadquery @ git+https://github.com/CadQuery/cadquery.git',
-        'cadquery-png-plugin @ git+https://github.com/jmwright/cadquery-png-plugin.git',
+        'cadquery',
+        'cadquery_png_plugin',
         'cadscript>=0.5.2',
         'exsource-tools',
-        'cq-cli @ git+https://github.com/CadQuery/cq-cli.git',
-        'cq-annotate @ git+https://github.com/jmwright/cq-annotate.git',
+        'cq-cli @ git+https://github.com/CadQuery/cq-cli.git@v2.4.0#egg=cq-cli',
+        'cq_annotate',
         'cq_warehouse @ git+https://github.com/gumyr/cq_warehouse.git',
         'cadorchestrator>=0.1.0'
     ],