arangoml · aMahanna · Aug 14, 2024 · Aug 14, 2024 · Aug 14, 2024 · Aug 14, 2024
diff --git a/.cargo/config.toml b/.cargo/config.toml
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -21,36 +21,13 @@ workflows:
             parameters:
               db-mode: ["single", "cluster"]
               db-version: ["3.10", "3.11", "3.12"]
-  release_package:
-    jobs:
-      - publish:
-          context: agml-pypi
-          filters:
-            tags:
-              only:
-                - /^v.*/
-            branches:
-              ignore: /.*/
-
-commands:
-  setup_ssh:
-    steps:
-      - add_ssh_keys:
-          fingerprints:
-            - "SHA256:XsmQvjXDygXfd3z0ynvv6lcOEHjO4iJBGHFtZkk753Q"
-      - run:
-          name: Add GitHub to known_hosts
-          command: |
-            mkdir -p ~/.ssh
-            ssh-keyscan github.com >> ~/.ssh/known_hosts
 
 jobs:
   lint-python:
     docker:
       - image: cimg/python:3.10
     steps:
       - checkout
-      - setup_ssh
       - restore_cache:
           key: py_lint_cache
       - run: |
@@ -77,7 +54,6 @@ jobs:
       - image: cimg/rust:1.75
     steps:
       - checkout
-      - setup_ssh
       - run:
           name: Install clippy
           command: rustup component add clippy
@@ -94,7 +70,6 @@ jobs:
     executor: generate-executor
     steps:
       - checkout
-      - setup_ssh
       - run:
           name: Build builder image
           command: docker build -t phenolrs-builder:latest -f Dockerfile-build .
@@ -111,7 +86,6 @@ jobs:
       - image: cimg/rust:1.75
     steps:
       - checkout
-      - setup_ssh
       - run:
           name: Setup lib
           command: |
@@ -131,7 +105,6 @@ jobs:
     executor: generate-executor
     steps:
       - checkout
-      - setup_ssh
       - attach_workspace:
           at: ~/project/target
       - run:
@@ -172,23 +145,3 @@ jobs:
             conda activate phenolrs
             export RUST_BACKTRACE=1
             pytest --url http://172.28.0.1:8529 python/tests
-  publish:
-    executor: generate-executor
-    steps:
-      - checkout
-      - setup_ssh
-      - run:
-          name: Build builder image
-          command: docker build -t phenolrs-builder:latest -f Dockerfile-build .
-      - run:
-          name: Build package
-          command: docker run --rm -v $(pwd):/io phenolrs-builder:latest build --release --interpreter python3.10 python3.11 python3.12 --sdist
-      - run:
-          name: Install release packages
-          command: pip install twine
-      - run:
-          name: Setup SA
-          command: ./setup_sa.sh "${PYTHON_REPO_ID}" "${PYTHON_REPO_URL}" "${PYPI_ACCOUNT_USER}" "${PYPI_ACCOUNT_KEY}" "${PYTHON_INDEX_URL}"
-      - run:
-          name: Publish Package
-          command: twine upload --verbose --repository "${PYTHON_REPO_ID}" target/wheels/*
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,117 @@
+name: Release Phenolrs
+
+on:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+jobs:
+  release-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libssl-dev
+          pip install build maturin twine
+
+      - name: Build builder image
+        run: docker build -t phenolrs-builder:latest -f Dockerfile-build .
+
+      - name: Build the package
+        run: docker run --rm -v $(pwd):/io phenolrs-builder:latest build --out dist --release  --sdist --interpreter python3.10 python3.11 python3.12
+
+      - name: ls
+        run: ls dist/*
+
+      - name: Publish to Test PyPi
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD_TEST }}
+        run: twine upload --verbose --repository testpypi dist/*.whl
+
+      - name: Publish to PyPi
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+        run: twine upload --verbose --repository pypi dist/*.whl
+
+  release-windows:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Install dependencies
+        run: pip install build maturin twine
+
+      - name: Build the package
+        run: maturin build --out dist --release --sdist --interpreter python3.10 python3.11 python3.12 
+
+      - name: ls
+        run: ls dist/*
+
+      - name: Publish to Test PyPi
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD_TEST }}
+        run: twine upload --verbose --repository testpypi dist\*.whl
+
+      - name: Publish to PyPi
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+        run: twine upload --verbose --repository pypi dist\*.whl
+
+  release-macos:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest, macos-13]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Install dependencies
+        run: |
+          brew install openssl
+          pip install build maturin twine
+
+      - name: Build the package
+        run: |
+          if [[ "${{ matrix.os }}" == "macos-13" ]]; then
+            maturin build --out dist --release --sdist --target x86_64-apple-darwin --interpreter python3.10 python3.11 python3.12 
+          elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then
+            maturin build --out dist --release --sdist --target aarch64-apple-darwin --interpreter python3.10 python3.11 python3.12
+          fi
+
+      - name: ls
+        run: ls dist/*
+
+      - name: Publish to Test PyPi
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD_TEST }}
+        run: twine upload --verbose --repository testpypi dist/*.whl
+
+      - name: Publish to PyPi
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+        run: twine upload --verbose --repository pypi dist/*.whl
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "phenolrs"
-version = "0.4.2"
+version = "0.5.4"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/Dockerfile b/Dockerfile
diff --git a/benchmarks/adb_cloud.py b/benchmarks/adb_cloud.py
diff --git a/benchmarks/local.py b/benchmarks/local.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,11 +4,16 @@ build-backend = "maturin"
 
 [project]
 name = "phenolrs"
-requires-python = ">=3.8"
+version = "0.5.4"
+requires-python = ">=3.10"
 classifiers = [
     "Programming Language :: Rust",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Typing :: Typed",
 ]
 dependencies = [
     "numpy~=1.26",

diff --git a/setup_sa.sh b/setup_sa.sh