Merge pull request #35 from goodwillpunning/publishInitPyPiRelease

Update project packaging for PyPI
goodwillpunning · Aug 17, 2023 · f3c77db · f3c77db
2 parents bcce39f + 5f6838b
commit f3c77db
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,6 @@ select *
 """
 hf = HyperFile(name="transaction_history", sql=query, is_dbfs_enabled=True)
 
-
 # Step 2: Publish Hyper File to a Tableau Server
 hf.publish(tableau_server_url,
            username,
@@ -61,7 +60,7 @@ Support, questions, and feature requests can be submitted through the Issues pag
 Please understand that issues with the use of this code will not be answered or investigated by Databricks Support.  
 
 ## Core Contribution team
-* Lead Developer: [Will Girten](https://www.linkedin.com/in/willgirten/), RSA, Databricks
+* Lead Developer: [Will Girten](https://www.linkedin.com/in/willgirten/), Lead SSA @Databricks
 * Puru Shrestha, Sr. BI Developer
 
 ## Project Support
@@ -77,7 +76,7 @@ They will be reviewed as time permits, but there are no formal SLAs for support.
 ## Building the Project
 To build the project: <br>
 ```
-python setup.py bdist_egg
+python3 -m build
 ```
 
 ## Running Pytests

diff --git a/dist/hyperleaup-0.1.0-py3-none-any.whl b/dist/hyperleaup-0.1.0-py3-none-any.whl
diff --git a/dist/hyperleaup-0.1.0-py3.8.egg b/dist/hyperleaup-0.1.0-py3.8.egg
diff --git a/dist/hyperleaup-0.1.0.tar.gz b/dist/hyperleaup-0.1.0.tar.gz
diff --git a/hyperleaup/__init__.py b/hyperleaup/__init__.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,30 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "hyperleaup"
+version = "0.1.0"
+authors = [
+    { name="Will Girten", email="[email protected]" },
+]
+description = "Create and publish Tableau Hyper files from Apache Spark DataFrames and Spark SQL."
+readme = "README.md"
+requires-python = ">=3.6"
+keywords = ["Spark", "Tableau", "extract", "hyper"]
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: Apache Software License",
+    "Operating System :: OS Independent",
+]
+dependencies = [
+    "pyspark",
+    "tableauhyperapi",
+    "requests",
+    "tableauserverclient",
+    "urllib3"
+]
+
+[project.urls]
+"Homepage" = "https://github.com/goodwillpunning/hyperleaup"
+"Bug Tracker" = "https://github.com/goodwillpunning/hyperleaup/issues"
diff --git a/src/hyperleaup/__init__.py b/src/hyperleaup/__init__.py
@@ -0,0 +1 @@
+from .hyper_file import HyperFile
diff --git a/hyperleaup/creation_mode.py → src/hyperleaup/creation_mode.py b/hyperleaup/creation_mode.py → src/hyperleaup/creation_mode.py
diff --git a/hyperleaup/creator.py → src/hyperleaup/creator.py b/hyperleaup/creator.py → src/hyperleaup/creator.py
diff --git a/hyperleaup/hyper_file.py → src/hyperleaup/hyper_file.py b/hyperleaup/hyper_file.py → src/hyperleaup/hyper_file.py
@@ -3,12 +3,12 @@
 from shutil import copyfile
 
 from pyspark.sql import DataFrame
-from tableauhyperapi import HyperProcess, Telemetry, Connection, CreateMode, Inserter
+from tableauhyperapi import HyperProcess, TableName, Telemetry, Connection, CreateMode, Inserter
+
 from hyperleaup.creation_mode import CreationMode
 from hyperleaup.creator import Creator
 from hyperleaup.hyper_utils import HyperUtils
 from hyperleaup.publisher import Publisher
-from tableauhyperapi import TableName
 from hyperleaup.spark_fixture import get_spark_session
 
 

diff --git a/hyperleaup/hyper_utils.py → src/hyperleaup/hyper_utils.py b/hyperleaup/hyper_utils.py → src/hyperleaup/hyper_utils.py
diff --git a/hyperleaup/publisher.py → src/hyperleaup/publisher.py b/hyperleaup/publisher.py → src/hyperleaup/publisher.py
diff --git a/hyperleaup/spark_fixture.py → src/hyperleaup/spark_fixture.py b/hyperleaup/spark_fixture.py → src/hyperleaup/spark_fixture.py
diff --git a/tests/test_creator.py b/tests/test_creator.py
@@ -1,11 +1,11 @@
-from pyspark.sql.functions import current_date, current_timestamp, to_date
+from pyspark.sql.functions import current_date, current_timestamp
 from tableauhyperapi import SqlType, NOT_NULLABLE, NULLABLE, TableDefinition, TableName
 from tableauhyperapi import Name
 
-from hyperleaup.creator import convert_struct_field, get_table_def, get_rows, insert_data_into_hyper_file, Creator, \
-    write_csv_to_local_file_system, write_parquet_to_local_file_system
 from pyspark.sql.types import *
 
+from hyperleaup import convert_struct_field, get_table_def, get_rows, insert_data_into_hyper_file, Creator, \
+    write_csv_to_local_file_system, write_parquet_to_local_file_system
 from hyperleaup.spark_fixture import get_spark_session
 
 from tests.test_utils import TestUtils

diff --git a/tests/test_hyper_file.py b/tests/test_hyper_file.py
@@ -1,4 +1,5 @@
 import os
+
 from hyperleaup import HyperFile
 from hyperleaup.spark_fixture import get_spark_session