Merge pull request #20 from stackql/feature/refactor

Feature/refactor

Author: jeffreyaven

.github/workflows/async_server_tests.yaml.disabled

@@ -0,0 +1,82 @@
+name: 'Run Async Server Tests'
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  run-tests:
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+          # - windows-latest
+          # - macos-latest
+        python-version:
+          - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+        exclude:
+          - os: windows-latest
+            python-version: "3.12"
+    runs-on: ${{matrix.os}}
+    name: 'Run Tests on ${{matrix.os}} with Python ${{matrix.python-version}}'
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies from requirements.txt
+        shell: bash
+        run: |
+          python3 -m pip install --upgrade pip
+          pip install -r requirements.txt
+
+      - name: Install psycopg2 for non-Windows OS
+        if: matrix.os != 'windows-latest'
+        run: |
+          pip install psycopg2
+
+      # Windows specific
+      # whl files downloaded from https://www.lfd.uci.edu/~gohlke/pythonlibs/#psycopg
+      - name: Install psycopg2-binary for Windows using local wheel
+        if: matrix.os == 'windows-latest'
+        run: |
+          # Determine the wheel filename based on the Python version
+          $wheelFilename = switch ("${{ matrix.python-version }}") {
+            "3.7" { "psycopg2-2.9.3-cp37-cp37m-win_amd64.whl" }
+            "3.8" { "psycopg2-2.9.3-cp38-cp38-win_amd64.whl" }
+            "3.9" { "psycopg2-2.9.3-cp39-cp39-win_amd64.whl" }
+            "3.10" { "psycopg2-2.9.3-cp310-cp310-win_amd64.whl" }
+            "3.11" { "psycopg2-2.9.3-cp311-cp311-win_amd64.whl" }
+          }
+
+          # Print the wheel filename for debugging
+          Write-Host "Determined wheel filename: $wheelFilename"
+
+          # Install the wheel
+          pip install ./tests/whls/$wheelFilename
+        shell: powershell
+      # End Windows specific
+
+      - name: Install pystackql
+        run: |
+          pip install .
+
+      - name: Run tests
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}
+          AWS_REGIONS: ${{ vars.AWS_REGIONS }}
+          GCP_PROJECT: ${{ vars.GCP_PROJECT }}
+          GCP_ZONE: ${{ vars.GCP_ZONE }}          
+        run: |
+          python3 -m tests.pystackql_async_server_tests

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v3.1.1 (2023-10-16)
+
+### Updates
+
+ * updated class parameters
+ * added additional tests
+
 ## v3.0.0 (2023-10-11)
 
 ### Updates

README.rst

@@ -193,4 +193,4 @@ To publish the package to PyPI, run the following command:
 
 ::
 
-    twine upload dist/pystackql-3.0.0.tar.gz
+    twine upload dist/pystackql-3.1.1.tar.gz

docs/source/conf.py

@@ -26,7 +26,7 @@
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-release = '3.0.0'
+release = '3.1.1'
 
 
 # -- General configuration ---------------------------------------------------

pystackql/_util.py

@@ -1,11 +1,3 @@
-# import subprocess, platform, json, site, os, requests, zipfile, pkg_resources
-
-# def _get_package_version(package_name):
-#     try:
-#         return pkg_resources.get_distribution(package_name).version
-#     except pkg_resources.DistributionNotFound:
-#         return None
-
 import subprocess, platform, json, site, os, requests, zipfile
 
 # Conditional import for package metadata retrieval
@@ -143,6 +135,3 @@ def _format_auth(auth):
 		error_message = e.args[0]
 		print("ERROR: [_format_auth] %s" % (error_message))
 		exit(1)
-
-def _execute_queries_in_parallel(stackql_instance, queries):
-    return [stackql_instance.execute(query) for query in queries]