Merge pull request #95 from sanders41/testing

Add setuptools to CI tests

Author: sanders41

.github/workflows/testing.yml

@@ -48,7 +48,7 @@ jobs:
       uses: Swatinem/[email protected]
     - name: Run cargo test
       run: cargo test --locked
-  pure-python-linting:
+  poetry-linting:
     strategy:
       fail-fast: false
       matrix:
@@ -61,38 +61,21 @@ jobs:
         curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
     - name: Cache Rust dependencies
       uses: Swatinem/[email protected]
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: "${{ env.MIN_PYTHON_VERSION }}"
-    - name: Get full Python version
-      id: full-python-version
-      run: echo version=$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))") >> $GITHUB_OUTPUT
     - name: Install Poetry
-      run: |
-        pip install -U pip
-        pip install pipx
-        pipx install poetry
+      run: pipx install poetry
     - name: Configure poetry
       run: |
         poetry config virtualenvs.create true
         poetry config virtualenvs.in-project true
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: "${{ env.MIN_PYTHON_VERSION }}"
     - name: Build package
       run: cargo build --release
     - name: Run creation
       run: |
         ./scripts/ci_run.sh ${{ matrix.project_type }} 1
-    - name: Cache poetry venv
-      uses: actions/cache@v3
-      id: poetry-cache
-      with:
-        path: my-project/.venv
-        key: venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('**/poetry.lock') }}
-    - name: Ensure cache is healthy
-      working-directory: ${{ env.WORKING_DIR }}
-      if: steps.poetry-cache.outputs.cache-hit == 'true'
-      shell: bash
-      run: timeout 10s poetry run pip --version || rm -rf .venv
     - name: Install Dependencies
       working-directory: ${{ env.WORKING_DIR }}
       run: poetry install
@@ -102,7 +85,7 @@ jobs:
     - name: ruff
       working-directory: ${{ env.WORKING_DIR }}
       run: poetry run ruff check .
-  pure-python-test:
+  poetry-test:
     strategy:
       fail-fast: false
       matrix:
@@ -116,38 +99,21 @@ jobs:
         curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
     - name: Cache Rust dependencies
       uses: Swatinem/[email protected]
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.11"
-    - name: Get full Python version
-      id: full-python-version
-      run: echo version=$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))") >> $GITHUB_OUTPUT
     - name: Install Poetry
-      run: |
-        pip install -U pip
-        pip install pipx
-        pipx install poetry
+      run: pipx install poetry
     - name: Configure poetry
       run: |
         poetry config virtualenvs.create true
         poetry config virtualenvs.in-project true
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.11"
     - name: Build package
       run: cargo build --release
     - name: Run creation
       run: |
         ./scripts/ci_run.sh ${{ matrix.project_type }} 1
-    - name: Cache poetry venv
-      uses: actions/cache@v3
-      id: poetry-cache
-      with:
-        path: my-project/.venv
-        key: venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('**/poetry.lock') }}
-    - name: Ensure cache is healthy
-      working-directory: ${{ env.WORKING_DIR }}
-      if: steps.poetry-cache.outputs.cache-hit == 'true'
-      shell: bash
-      run: timeout 10s poetry run pip --version || rm -rf .venv
     - name: Install Dependencies
       working-directory: ${{ env.WORKING_DIR }}
       run: poetry install
@@ -183,11 +149,11 @@ jobs:
     - name: Install Dependencies
       working-directory: ${{ env.WORKING_DIR }}
       run: |
-        pip install -U pip
-        pip install -r requirements-dev.txt
-        pip install -e .
+        python -m pip install -U pip
+        python -m pip install -r requirements-dev.txt
+        python -m pip install -e .
         maturin build --out dist
-        pip install --no-index --find-links=dist/ my-project
+        python -m pip install --no-index --find-links=dist/ my-project
     - name: MyPy
       working-directory: ${{ env.WORKING_DIR }}
       run: just mypy
@@ -225,11 +191,78 @@ jobs:
     - name: Install Dependencies
       working-directory: ${{ env.WORKING_DIR }}
       run: |
-        pip install -U pip
-        pip install -r requirements-dev.txt
-        pip install -e .
+        python -m pip install -U pip
+        python -m pip install -r requirements-dev.txt
+        python -m pip install -e .
         maturin build --out dist
-        pip install --no-index --find-links=dist/ my-project
+        python -m pip install --no-index --find-links=dist/ my-project
+    - name: Pre-commit install
+      working-directory: ${{ env.WORKING_DIR }}
+      run: pre-commit install
+    - name: Test with pytest
+      working-directory: ${{ env.WORKING_DIR }}
+      run: pytest
+  setuptools-linting:
+    strategy:
+      fail-fast: false
+      matrix:
+        project_type: ["application", "lib"]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Rust
+      run: |
+        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+    - name: Cache Rust dependencies
+      uses: Swatinem/[email protected]
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: "${{ env.MIN_PYTHON_VERSION }}"
+    - name: Build package
+      run: cargo build --release
+    - name: Run creation
+      run: |
+        ./scripts/ci_run.sh ${{ matrix.project_type }} 3
+    - name: Install Dependencies
+      working-directory: ${{ env.WORKING_DIR }}
+      run: |
+        python -m pip install -U pip
+        python -m pip install -r requirements-dev.txt
+    - name: MyPy
+      working-directory: ${{ env.WORKING_DIR }}
+      run: mypy .
+    - name: ruff
+      working-directory: ${{ env.WORKING_DIR }}
+      run: ruff check .
+  setuptools-test:
+    strategy:
+      fail-fast: false
+      matrix:
+        project_type: ["application", "lib"]
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Rust
+      run: |
+        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+    - name: Cache Rust dependencies
+      uses: Swatinem/[email protected]
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.11"
+    - name: Build package
+      run: cargo build --release
+    - name: Run creation
+      run: |
+        ./scripts/ci_run.sh ${{ matrix.project_type }} 3
+    - name: Install Dependencies
+      working-directory: ${{ env.WORKING_DIR }}
+      run: |
+        python -m pip install -U pip
+        python -m pip install -r requirements-dev.txt
     - name: Pre-commit install
       working-directory: ${{ env.WORKING_DIR }}
       run: pre-commit install

scripts/ci_run.sh

@@ -17,7 +17,7 @@ project_manager="1"
 
 # Check for user provided project manager input
 if [ $# -gt 1 ]; then
-  if [ $2 -lt 1 ] || [ $2 -gt 2 ]; then
+  if [ $2 -lt 1 ] || [ $2 -gt 3 ]; then
     echo "Invalid project_manager value"
     exit 1
   else

src/python_files.rs

@@ -190,7 +190,7 @@ fn save_version_file(project_info: &ProjectInfo) -> Result<()> {
     Ok(())
 }
 
-fn create_version_test_file(source_dir: &str, project_manager: &ProjectManager) -> Option<String> {
+fn create_version_test_file(source_dir: &str, project_manager: &ProjectManager) -> String {
     let version_test: &str = match project_manager {
         ProjectManager::Maturin => {
             r#"def test_versions_match():
@@ -210,10 +210,17 @@ fn create_version_test_file(source_dir: &str, project_manager: &ProjectManager)
 
     assert VERSION == pyproject_version"#
         }
-        ProjectManager::Setuptools => return None,
+        ProjectManager::Setuptools => {
+            return format!(
+                r#"from {source_dir}._version import VERSION
+
+def test_versions_match():
+    assert VERSION == "0.1.0""#
+            )
+        }
     };
 
-    Some(format!(
+    format!(
         r#"import sys
 from pathlib import Path
 
@@ -227,16 +234,13 @@ else:
 
 {version_test}
 "#
-    ))
+    )
 }
 
 fn save_version_test_file(project_info: &ProjectInfo) -> Result<()> {
-    if let Some(content) =
-        create_version_test_file(&project_info.source_dir, &project_info.project_manager)
-    {
-        let file_path = project_info.base_dir().join("tests/test_version.py");
-        save_file_with_content(&file_path, &content)?;
-    };
+    let file_path = project_info.base_dir().join("tests/test_version.py");
+    let content = create_version_test_file(&project_info.source_dir, &project_info.project_manager);
+    save_file_with_content(&file_path, &content)?;
 
     Ok(())
 }