Resolve merge conflict by incorporating both suggestions

Author: Gonza10V

.github/workflows/python-package.yml

@@ -0,0 +1,41 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
+
+name: Python package
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * *'  # every day at midnight
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.9", "3.10", "3.11"]
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install flake8 pytest
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with unittest
+      run: |
+        python -m unittest discover -s tests

README.md

@@ -1,7 +1,3 @@
-# Xperimental Data Connector
+# Xperimental-data-convertor
 
-
-<img src="https://github.com/SynBioDex/Xperimental-Data-Connector/blob/Gonza10V-patch-1/images/xdc%20logo.png" alt="XDC logo" width="250"/>
-
-
-The Xperimental Data Connector (XDC) is a Python package that links excel2sbol and excel2flapjack, interlink the resulting data, and upload it to synbiohub and flapjack.
+This is a utility to link excel2sbol and excel to flapjack converter, interlink the resulting data, and upload it to synbiohub and flapjack.

images/xdc logo.png

@@ -1,6 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
 from setuptools import find_packages, setup
 
 setup(name='xperimental-data-conv',

setup.py

@@ -0,0 +1 @@
+from .main import *

src/xperimental_data_converter/__init__.py

@@ -8,8 +8,7 @@
 import pandas as pd
 from openpyxl import load_workbook
 import numpy as np
-import re
-
+import re      
 
 class XDC:
 
@@ -477,5 +476,3 @@ def writeToMeasurements(self, XDC_file_name, final_dataframe):
         book.close()
 
         return
-
-