Merge pull request #90 from realratchet/master

New attempt of packaging
root-11 · Oct 5, 2023 · ac7e086 · ac7e086
2 parents 18700d6 + eae98ee
commit ac7e086
Show file tree

Hide file tree

Showing 24 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Set Environment Variables
         uses: allenevans/set-env@v2.0.0
         with:
-          NIMLITE_DIR:  '_nimlite'
+          NIMLITE_DIR:  'tablite/_nimlite'
           NIM_PACKAGE_NAME: 'nimlite'
           TABLITE_PACKAGE_NAME: 'tablite'
           NIMC_FLAGS: '--app:lib --threads:on -d:release -d:danger'

diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml
@@ -35,7 +35,7 @@ jobs:
     - name: Set Environment Variables
       uses: allenevans/set-env@v2.0.0
       with:
-        NIMLITE_DIR:  '_nimlite'
+        NIMLITE_DIR:  'tablite/_nimlite'
         NIM_PACKAGE_NAME: 'nimlite'
         TABLITE_PACKAGE_NAME: 'tablite'
         NIMC_FLAGS: '--app:lib --threads:on -d:release -d:danger'
@@ -51,16 +51,16 @@ jobs:
         nim c ${{ env.NIMC_FLAGS }} --out:${{ env.NIMLITE_DIR }}/${{ env.NIM_PACKAGE_NAME }}.so  ${{ env.NIMLITE_DIR }}/${{ env.NIM_PACKAGE_NAME }}.nim
         # check if compiled successfully
         python -c "print(__import__('${{ env.TABLITE_PACKAGE_NAME }}.${{ env.NIM_PACKAGE_NAME }}').__file__)"
-    - name: MSVC
-      if: runner.os == 'Windows'
-      uses: TheMrMilchmann/setup-msvc-dev@v3
-      with:
-        arch: x64
+    # - name: MSVC
+    #   if: runner.os == 'Windows'
+    #   uses: TheMrMilchmann/setup-msvc-dev@v3
+    #   with:
+    #     arch: x64
     - name: Compile Debug & import (Windows)
       if: runner.os == 'Windows'
       run: |
         # compile the nimlite
-        nim c ${{ env.NIMC_FLAGS }} --tlsEmulation:off --passL:-static --out:${{ env.NIMLITE_DIR }}/${{ env.NIM_PACKAGE_NAME }}.exe ${{ env.NIMLITE_DIR }}/${{ env.NIM_PACKAGE_NAME }}.nim
+        nim c ${{ env.NIMC_FLAGS }} --tlsEmulation:off --passL:-static --out:${{ env.NIMLITE_DIR }}/${{ env.NIM_PACKAGE_NAME }}.pyd ${{ env.NIMLITE_DIR }}/${{ env.NIM_PACKAGE_NAME }}.nim
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names

diff --git a/setup.py b/setup.py
@@ -99,9 +99,9 @@
     long_description=long_description,
     long_description_content_type="text/markdown",
     keywords=keywords,
-    packages=["tablite", "_nimlite"],
+    packages=["tablite", "tablite/_nimlite"],
     package_data={
-        "_nimlite": ["**/*.so", "**/*.pyd", "**/*.nim"], # pack builds and nim source
+        "tablite": ["**/_nimlite/nimlite.so", "**/_nimlite/nimlite.pyd", "**/*.pyi"], # pack builds
     },
     python_requires=">=3.8",
     include_package_data=True,

diff --git a/tablite/_nimlite/__init__.py b/tablite/_nimlite/__init__.py
diff --git a/_nimlite/cli.nim → tablite/_nimlite/cli.nim b/_nimlite/cli.nim → tablite/_nimlite/cli.nim
diff --git a/_nimlite/csvparse.nim → tablite/_nimlite/csvparse.nim b/_nimlite/csvparse.nim → tablite/_nimlite/csvparse.nim
diff --git a/_nimlite/encfile.nim → tablite/_nimlite/encfile.nim b/_nimlite/encfile.nim → tablite/_nimlite/encfile.nim
diff --git a/_nimlite/infertypes.nim → tablite/_nimlite/infertypes.nim b/_nimlite/infertypes.nim → tablite/_nimlite/infertypes.nim
diff --git a/_nimlite/insertsort.nim → tablite/_nimlite/insertsort.nim b/_nimlite/insertsort.nim → tablite/_nimlite/insertsort.nim
diff --git a/tablite/_nimlite/nimlite b/tablite/_nimlite/nimlite
diff --git a/_nimlite/nimlite.nim → tablite/_nimlite/nimlite.nim b/_nimlite/nimlite.nim → tablite/_nimlite/nimlite.nim
diff --git a/_nimlite/nimlite.pyi → tablite/_nimlite/nimlite.pyi b/_nimlite/nimlite.pyi → tablite/_nimlite/nimlite.pyi
diff --git a/tablite/_nimlite/nimlite.so b/tablite/_nimlite/nimlite.so
diff --git a/_nimlite/numpy.nim → tablite/_nimlite/numpy.nim b/_nimlite/numpy.nim → tablite/_nimlite/numpy.nim
diff --git a/_nimlite/paging.nim → tablite/_nimlite/paging.nim b/_nimlite/paging.nim → tablite/_nimlite/paging.nim
diff --git a/_nimlite/pickling.nim → tablite/_nimlite/pickling.nim b/_nimlite/pickling.nim → tablite/_nimlite/pickling.nim
diff --git a/_nimlite/pylayer.nim → tablite/_nimlite/pylayer.nim b/_nimlite/pylayer.nim → tablite/_nimlite/pylayer.nim
diff --git a/_nimlite/ranking.nim → tablite/_nimlite/ranking.nim b/_nimlite/ranking.nim → tablite/_nimlite/ranking.nim
diff --git a/_nimlite/table.nim → tablite/_nimlite/table.nim b/_nimlite/table.nim → tablite/_nimlite/table.nim
diff --git a/_nimlite/taskargs.nim → tablite/_nimlite/taskargs.nim b/_nimlite/taskargs.nim → tablite/_nimlite/taskargs.nim
diff --git a/_nimlite/textreader.nim → tablite/_nimlite/textreader.nim b/_nimlite/textreader.nim → tablite/_nimlite/textreader.nim
diff --git a/_nimlite/utils.nim → tablite/_nimlite/utils.nim b/_nimlite/utils.nim → tablite/_nimlite/utils.nim
diff --git a/tablite/nimlite.py b/tablite/nimlite.py
@@ -14,15 +14,15 @@
 IS_WINDOWS = platform.system() == "Windows"
 USE_CLI_BACKEND = IS_WINDOWS
 
-CLI_BACKEND_PATH = Path(__file__).parent.parent / f"_nimlite/nimlite{'.exe' if IS_WINDOWS else ''}"
+CLI_BACKEND_PATH = Path(__file__).parent / f"_nimlite/nimlite{'.exe' if IS_WINDOWS else ''}"
 
 if not USE_CLI_BACKEND:
     paths = sys.argv[:]
     if Config.USE_NIMPORTER:
         import nimporter
 
         nimporter.Nimporter.IGNORE_CACHE = True
-    import _nimlite.nimlite as nl
+    import tablite._nimlite.nimlite as nl
 
     sys.argv.clear()
     sys.argv.extend(paths)  # importing nim module messes with pythons launch arguments!!!

diff --git a/tablite/version.py b/tablite/version.py
@@ -1,3 +1,3 @@
-major, minor, patch = 2023, 8, "dev1"
+major, minor, patch = 2023, 8, "dev2"
 __version_info__ = (major, minor, patch)
 __version__ = ".".join(str(i) for i in __version_info__)