diff --git a/.gitignore b/.gitignore index 13bb2a0..48dee28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ # Mac .DS_Store - +# api key +api_key +# temporary files +tmp/* # IDEs .idea .vscode diff --git a/__init__.py b/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/eln_packages_common b/eln_packages_common index 938595a..917aa15 160000 --- a/eln_packages_common +++ b/eln_packages_common @@ -1 +1 @@ -Subproject commit 938595a08bb56cf940be8f58d9578c839894d11b +Subproject commit 917aa15ba51f969667c19f49c1f482593e98f373 diff --git a/input_process.py b/input_process.py index 2fe88ae..6a67cda 100644 --- a/input_process.py +++ b/input_process.py @@ -1,5 +1,5 @@ import json -from resourcemanage import Resource_Manager +from eln_packages_common.resourcemanage import Resource_Manager import webbrowser import print_handling diff --git a/print_handling.py b/print_handling.py index d66448b..1ddefef 100644 --- a/print_handling.py +++ b/print_handling.py @@ -1,12 +1,12 @@ -import resourcemanage +from eln_packages_common.resourcemanage import Resource_Manager from pypdf import PdfMerger import io import os from pathlib import Path -rm = resourcemanage.Resource_Manager() +rm = Resource_Manager() current_dir = Path(__file__).parent -temp_path = str(current_dir.parent / "tmp" / "printerqueue.pdf") +temp_path = str(current_dir / "tmp" / "printerqueue.pdf") def add_item(id: int): diff --git a/setup.py b/setup.py deleted file mode 100644 index 19f201b..0000000 --- a/setup.py +++ /dev/null @@ -1,10 +0,0 @@ -from setuptools import setup, find_packages - -setup( - name="ddomlab_eln_packages_frontend", - version="0.1.0", - packages=find_packages(), - author="Kyle Hollars", - author_email="kmhollar@ncsu.edu", - python_requires=">=3.11", -) \ No newline at end of file