Fix packaging (#18)

Author: grzegorz8

.github/workflows/pr_opened.yml

@@ -31,7 +31,7 @@ jobs:
 
       - name: Test pre-commit hooks
         run: |
-          pip install -r ./deployment-scripts/jobs-deployment/tests/requirements.txt
+          pip install -r ./tests/requirements.txt
           pip freeze
           pipdeptree
           pre-commit run --all-files

MANIFEST.in

@@ -1,3 +1,5 @@
+include LICENSE
 include *.md
 include requirements.txt
-include deployment-scripts/jobs-deployment/requirements.txt
+
+graft flink_sql_runner/runner

README.md

@@ -31,8 +31,8 @@ Jobs lifecycle is managed by the framework.
 
 The module has the following structure:
 
-- `/deployment-scripts/` - contains deployment scripts.
-- `/python/` - contains Flink job runners.
+- `/flink_sql_runner/` - contains deployment scripts.
+- `/flink_sql_runner/runner/` - contains Flink job runners.
 
 Future improvements:
 
@@ -190,10 +190,10 @@ _Decision_: Flink jobs are deployed on a shared Flink Session Cluster.
 Sample command to trigger deployment of all queries on YARN:
 
 ```bash
-python3 flink-sql-runner/deployment-scripts/jobs-deployment/deploy.py \
+python3 flink_sql_runner/deploy.py \
     --path /some/path/to/sql/queries/ \
     --template-file flink-sql-runner/deployment-scripts/job-template.yaml \
-    --pyflink-runner-dir flink-sql-runner/python/ \
+    --pyflink-runner-dir flink_sql_runner/runner/ \
     --pyexec-path /home/hadoop/flink-sql-runner/venv/bin/python3 \
     --external-job-config-bucket some-s3-bucket \
     --external-job-config-prefix flink-sql-runner/manifests/ \
@@ -205,9 +205,9 @@ python3 flink-sql-runner/deployment-scripts/jobs-deployment/deploy.py \
 Sample command to trigger deployment of a single query:
 
 ```bash
-python3 flink-sql-runner/deployment-scripts/jobs-deployment/deploy_job.py \
+python3 flink_sql_runner/deploy_job.py \
     --job-config-path some/path/some-query-name.yaml \
-    --pyflink-runner-dir flink-sql-runner/python/ \
+    --pyflink-runner-dir flink_sql_runner/runner/ \
     --pyexec-path /home/hadoop/flink-sql-runner/venv/bin/python3 \
     --external-job-config-bucket some-s3-bucket \
     --external-job-config-prefix flink-sql-runner/manifests/ \

deployment-scripts/jobs-deployment/requirements.txt

@@ -6,8 +6,10 @@
 from typing import List
 
 import yaml
-from deploy_job import EmrJobRunner, JinjaTemplateResolver
-from flink_clients import FlinkStandaloneClusterRunner, FlinkYarnRunner
+
+from flink_sql_runner.deploy_job import EmrJobRunner, JinjaTemplateResolver
+from flink_sql_runner.flink_clients import (FlinkStandaloneClusterRunner,
+                                            FlinkYarnRunner)
 
 logging.basicConfig(level=logging.INFO, format="%(asctime)s %(message)s")
 

…cripts/jobs-deployment/tests/__init__.py flink_sql_runner/__init__.pydeployment-scripts/jobs-deployment/tests/__init__.py renamed to flink_sql_runner/__init__.py deployment-scripts/jobs-deployment/tests/__init__.py renamed to flink_sql_runner/__init__.py

@@ -9,11 +9,13 @@
 from typing import Any, Dict, List, Optional, Tuple
 
 import yaml
-from flink_clients import (FlinkCli, FlinkStandaloneClusterRunner,
-                           FlinkYarnRunner)
 from jinja2 import Environment, FileSystemLoader
-from job_configuration import JobConfiguration
-from s3 import get_content, get_latest_object, upload_content
+
+from flink_sql_runner.flink_clients import (FlinkCli,
+                                            FlinkStandaloneClusterRunner,
+                                            FlinkYarnRunner)
+from flink_sql_runner.job_configuration import JobConfiguration
+from flink_sql_runner.s3 import get_content, get_latest_object, upload_content
 
 logging.basicConfig(level=logging.INFO, format="%(asctime)s %(message)s")
 

…ent-scripts/jobs-deployment/cmd_utils.py flink_sql_runner/cmd_utils.pydeployment-scripts/jobs-deployment/cmd_utils.py renamed to flink_sql_runner/cmd_utils.py deployment-scripts/jobs-deployment/cmd_utils.py renamed to flink_sql_runner/cmd_utils.py

@@ -3,7 +3,7 @@
 from abc import ABC, abstractmethod
 from typing import Any, Dict, List
 
-from cmd_utils import run_cmd
+from flink_sql_runner.cmd_utils import run_cmd
 
 
 class FlinkCli(ABC):