From 9c1d14b3105a1d1bc5368f1ff39344a499cf2fd5 Mon Sep 17 00:00:00 2001
From: thepineapplepirate <braubeno@uno.edu>
Date: Fri, 24 May 2024 14:15:11 -0500
Subject: [PATCH 1/2] new edits and now using a docker image with qiskit1.0

---
 ...nteractivetool_qiskit_jupyter_notebook.xml | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/tools/interactive/interactivetool_qiskit_jupyter_notebook.xml b/tools/interactive/interactivetool_qiskit_jupyter_notebook.xml
index 1b0ca237364a..6e48678419c6 100644
--- a/tools/interactive/interactivetool_qiskit_jupyter_notebook.xml
+++ b/tools/interactive/interactivetool_qiskit_jupyter_notebook.xml
@@ -1,8 +1,7 @@
 <tool id="interactive_tool_qiskit_jupyter_notebook" tool_type="interactive" name="Qiskit Jupyter notebook" version="0.0.1" profile="22.01">
     <description>interactive tool</description>
     <requirements>
-        <container type="docker">thepineapplepirate/qiskit_galaxy:1.0.0</container>
-     	<!-- files for this docker image can be found at https://github.com/thepineapplepirate/qiskit-jupyter-galaxy_docker.git -->
+        <container type="docker">thepineapplepirate/qiskit_galaxy:1.1.0</container>
     </requirements>
     <entry_points>
         <entry_point name="Qiskit Jupyter Notebook" requires_domain="True">
@@ -99,13 +98,16 @@ except FileNotFoundError:
     GALAXY_INPUTS = {}
         ]]>
     </configfile>
-    <configfile name="qiskitrc"><![CDATA[
-[ibmq]
-token = $__user__.extra_preferences.get('ibmq_account|token', "TOKEN_NOT_SET")
-url = $__user__.extra_preferences.get('ibmq_account|url', "https://auth.quantum-computing.ibm.com/api")
-verify = True
-                ]]>
-            </configfile>
+        <configfile name="qiskitjson"><![CDATA[
+            {
+            "default-ibm-quantum": {
+                "channel": "ibm_quantum",
+                "token": "$__user__.extra_preferences.get('ibmq_account|token', "TOKEN_NOT_SET")",
+                "url": "https://auth.quantum-computing.ibm.com/api",
+                "verify": true
+            }}
+        ]]>
+        </configfile>
     </configfiles>
     <command><![CDATA[
         python staging_script.py &&
@@ -119,7 +121,7 @@ verify = True
         export PATH=/home/jovyan/.local/bin:\$PATH &&
         cp '${galaxy_input_startup_script}' /home/jovyan/.ipython/profile_default/startup/01-load.py &&
 
-        mkdir -p /home/jovyan/.qiskit && cp '${qiskitrc}' /home/jovyan/.qiskit/qiskitrc &&
+        mkdir -p /home/jovyan/.qiskit && cp '${qiskitjson}' /home/jovyan/.qiskit/qiskit-ibm.json &&
         mkdir -p Qiskit_Resources &&
         ln -s /home/jovyan/qiskit Qiskit_Resources/ &&
 
@@ -283,7 +285,7 @@ verify = True
     Welcome to the **Qiskit JupyTool**! This tool incorporates the entire Qiskit stack, including tutorials and supplemental resources. This tool is an extension
     of the standard **JupyTool**, so a full functionality of Jupyter lab is also included. You can create, run, and share custom Galaxy tools based upon Jupyter Notebooks.
 
-    Qiskit is a python based, open-source software stack for quantum computing on IBM quantum systems. When run, the Jupyter lab instance includes directories
+    Qiskit is a Python based, open-source software stack for quantum computing on IBM quantum systems. When run, the Jupyter lab instance includes directories
     for many resources and relevant tutorials, including the introductory materials for building quantum circuits, to using quantum algorithms like Variational Quantum Eigensolvers (VQE), 
     Quantum Approximate Optimization Algorithm (QAOA), as well as Grover's algorithm. The associated docker image contains most relevant Qiskit modules including:
     qiskit-aer, qiskit-dynamics, qiskit-experiments, qiskit-finance, qiskit-ibm-experiment, qiskit-ibm-provider, qiskit-ibm-runtime, qiskit-ibmq-provider,

From c320b3f9178b74b283f6715383ad69361a76b3f0 Mon Sep 17 00:00:00 2001
From: thepineapplepirate <braubeno@uno.edu>
Date: Fri, 24 May 2024 14:41:07 -0500
Subject: [PATCH 2/2] bumped up version

---
 .../interactive/interactivetool_qiskit_jupyter_notebook.xml  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/interactive/interactivetool_qiskit_jupyter_notebook.xml b/tools/interactive/interactivetool_qiskit_jupyter_notebook.xml
index 6e48678419c6..7a66e83f606f 100644
--- a/tools/interactive/interactivetool_qiskit_jupyter_notebook.xml
+++ b/tools/interactive/interactivetool_qiskit_jupyter_notebook.xml
@@ -1,5 +1,8 @@
-<tool id="interactive_tool_qiskit_jupyter_notebook" tool_type="interactive" name="Qiskit Jupyter notebook" version="0.0.1" profile="22.01">
+<tool id="interactive_tool_qiskit_jupyter_notebook" tool_type="interactive" name="Qiskit Jupyter notebook" version="@VERSION@" profile="22.01">
     <description>interactive tool</description>
+    <macros>
+        <token name="@VERSION@">0.2</token>
+    </macros>
     <requirements>
         <container type="docker">thepineapplepirate/qiskit_galaxy:1.1.0</container>
     </requirements>