add sample material column and rewrite inosticID column

2023-11-21 07:36:56 -05:00
parent 1b0e44a302
commit 3d2f3fdf2f
5 changed files with 58 additions and 0 deletions
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 [metadata]
 name = qubittool
 version = 0.1.0
@@ -12,4 +13,20 @@ install_requires =
    pandas

 [options.package_data]
+=======
+[metadata]
+name = qubittool
+version = 0.1.0
+
+[options]
+packages = find:
+zip_safe = True
+include_package_data = True
+install_requires = 
+    PySimpleGUI >= 4.60
+    openpyxl >= 3.1
+    pandas
+
+[options.package_data]
+>>>>>>> d07459290f0590ab07c6c3fdca43ff95ec80057a
 * = README.md