use pysqlcipher3static

carderne · Aug 1, 2024 · c3b4c19 · c3b4c19
1 parent e0373c7
commit c3b4c19
Show file tree

Hide file tree

Showing 44 changed files with 20 additions and 280,694 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,65 +4,14 @@ on:
   push:
     tags:
       - '*'
-    branches: [ main ]
-  workflow_dispatch:
 
 jobs:
-  build:
-    name: build ${{ matrix.os }} ${{ matrix.py }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: ["ubuntu-latest", "macos-latest"]
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: build
-        run: |
-          pip install build
-          export LDFLAGS="-L/opt/homebrew/opt/openssl@3/lib"
-          export CPPFLAGS="-I/opt/homebrew/opt/openssl@3/include"
-          python -m build
-          cd dist
-          echo "WHEEL_NAME=$(ls *.whl)" >> $GITHUB_ENV
-          echo "SDIST_NAME=$(ls *.tar.gz)" >> $GITHUB_ENV
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.WHEEL_NAME }}
-          path: "dist/*.whl"
-
-      - uses: actions/upload-artifact@v4
-        # only do this once
-        if: matrix.os == 'ubuntu-latest'
-        with:
-          name: ${{ env.SDIST_NAME }}
-          path: "dist/*.tar.gz"
-
-      - name: test
-        run: |
-          pip install dist/*.whl pytest
-          pytest
-
-
-  upload:
-    needs: [build]
-    if: startsWith(github.ref, 'refs/tags/')
+  release:
     runs-on: ubuntu-latest
+    environment: release
+    permissions:
+      id-token: write
     steps:
-    - uses: actions/download-artifact@v4
-      with:
-        merge-multiple: true
-
-    - name: Copy artifacts to dist/ folder
-      run: |
-        mkdir -p dist/
-        mv *.tar.gz dist/
-        mv *.whl dist/
-
-    - name: Upload
-      uses: pypa/[email protected]
-      with:
-        password: ${{ secrets.PYPI_API_TOKEN }}
-        skip_existing: true
+      - uses: actions/checkout@v4
+      - run: pipx run build --sdist
+      - uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/pyproject.toml b/pyproject.toml
@@ -35,20 +35,18 @@ dependencies = [
     "Markdown ~= 3.4",
     "typer[all] ~= 0.7",
     "pycryptodome ~= 3.20",
+    "pysqlcipher3static ~= 2.0"
 ]
 
 [tool.rye]
 managed = true
 generate-hashes = false
 dev-dependencies = [
     "pyright",
-    "pre-commit",
     "pytest",
     "pytest-cov",
     "types-Markdown",
     "types-emoji",
-    "setuptools-scm~=8.1.0",
-    "build~=1.2.1",
 ]
 
 [project.urls]
@@ -59,17 +57,18 @@ repository = "https://github.com/carderne/signal-export"
 sigexport = "sigexport.main:cli"
 
 [build-system]
-requires = ["setuptools>=64", "setuptools_scm>=8"]
-build-backend = "setuptools.build_meta"
+requires = ["pdm-backend"]
+build-backend = "pdm.backend"
 
-[tool.setuptools]
-package-dir = {"" = "src"}
+[tool.pdm.build]
+includes = ["sigexport/"]
 
-[tool.setuptools_scm]
+[tool.pdm.version]
+source = "scm"
 
 [tool.ruff]
 target-version = "py39"
-exclude = ["tests", "src/pysqlcipher3"]
+exclude = ["tests"]
 
 [tool.ruff.lint]
 select = [
@@ -92,8 +91,7 @@ known-first-party = ["sigexport"]
 [tool.pyright]
 venvPath = "."
 venv = ".venv"
-include = ["src/sigexport", "tests"]
-ignore = ["src/pysqlcipher3"]
+include = ["sigexport", "tests"]
 reportMissingImports = true
 reportMissingParameterType = true
 reportUnnecessaryTypeIgnoreComment = true

diff --git a/requirements-dev.lock b/requirements-dev.lock
@@ -12,23 +12,14 @@
 -e file:.
 beautifulsoup4==4.12.3
     # via signal-export
-build==1.2.1
-cfgv==3.4.0
-    # via pre-commit
 click==8.1.7
     # via typer
 colorama==0.4.6
     # via typer
 coverage==7.4.4
     # via pytest-cov
-distlib==0.3.8
-    # via virtualenv
 emoji==2.10.1
     # via signal-export
-filelock==3.13.1
-    # via virtualenv
-identify==2.5.35
-    # via pre-commit
 iniconfig==2.0.0
     # via pytest
 markdown==3.6
@@ -38,35 +29,25 @@ markdown-it-py==3.0.0
 mdurl==0.1.2
     # via markdown-it-py
 nodeenv==1.8.0
-    # via pre-commit
     # via pyright
 packaging==24.0
-    # via build
     # via pytest
-    # via setuptools-scm
-platformdirs==4.2.0
-    # via virtualenv
 pluggy==1.4.0
     # via pytest
-pre-commit==3.6.2
 pycryptodome==3.20.0
     # via signal-export
 pygments==2.17.2
     # via rich
-pyproject-hooks==1.1.0
-    # via build
 pyright==1.1.354
+pysqlcipher3static==2.0.0
+    # via signal-export
 pytest==8.1.1
     # via pytest-cov
 pytest-cov==4.1.0
-pyyaml==6.0.1
-    # via pre-commit
 rich==13.7.1
     # via typer
 setuptools==69.2.0
     # via nodeenv
-    # via setuptools-scm
-setuptools-scm==8.1.0
 shellingham==1.5.4
     # via typer
 soupsieve==2.5
@@ -77,5 +58,3 @@ types-emoji==2.1.0.3
 types-markdown==3.6.0.20240316
 typing-extensions==4.10.0
     # via typer
-virtualenv==20.25.1
-    # via pre-commit
diff --git a/requirements.lock b/requirements.lock
@@ -28,6 +28,8 @@ pycryptodome==3.20.0
     # via signal-export
 pygments==2.17.2
     # via rich
+pysqlcipher3static==2.0.0
+    # via signal-export
 rich==13.7.1
     # via typer
 shellingham==1.5.4

diff --git a/setup.py b/setup.py
diff --git a/src/sigexport/__init__.py → sigexport/__init__.py b/src/sigexport/__init__.py → sigexport/__init__.py
diff --git a/src/sigexport/__main__.py → sigexport/__main__.py b/src/sigexport/__main__.py → sigexport/__main__.py
diff --git a/src/sigexport/create.py → sigexport/create.py b/src/sigexport/create.py → sigexport/create.py
diff --git a/src/sigexport/crypto.py → sigexport/crypto.py b/src/sigexport/crypto.py → sigexport/crypto.py
diff --git a/src/sigexport/data.py → sigexport/data.py b/src/sigexport/data.py → sigexport/data.py
diff --git a/src/sigexport/files.py → sigexport/files.py b/src/sigexport/files.py → sigexport/files.py
diff --git a/src/sigexport/html.py → sigexport/html.py b/src/sigexport/html.py → sigexport/html.py
diff --git a/src/sigexport/logging.py → sigexport/logging.py b/src/sigexport/logging.py → sigexport/logging.py
diff --git a/src/sigexport/main.py → sigexport/main.py b/src/sigexport/main.py → sigexport/main.py
diff --git a/src/sigexport/merge.py → sigexport/merge.py b/src/sigexport/merge.py → sigexport/merge.py
diff --git a/src/sigexport/models.py → sigexport/models.py b/src/sigexport/models.py → sigexport/models.py
diff --git a/src/sigexport/style.css → sigexport/style.css b/src/sigexport/style.css → sigexport/style.css
diff --git a/src/sigexport/templates.py → sigexport/templates.py b/src/sigexport/templates.py → sigexport/templates.py
diff --git a/src/sigexport/utils.py → sigexport/utils.py b/src/sigexport/utils.py → sigexport/utils.py
diff --git a/src/pysqlcipher3/README.md b/src/pysqlcipher3/README.md
diff --git a/src/pysqlcipher3/__init__.py b/src/pysqlcipher3/__init__.py