Update depricated Bio.Applications from Biopython

.github/workflows/Compile_paper.yml

@@ -6,15 +6,15 @@ jobs:
     name: Paper Draft
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Build draft PDF
         uses: openjournals/openjournals-draft-action@master
         with:
           journal: joss
           # This should be the path to the paper within your repo.
           paper-path: paper/paper.md
       - name: Upload
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: paper
           # This is the output path where Pandoc will write the compiled

.github/workflows/build_n_publish.yml

@@ -7,31 +7,18 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@main
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v1
+    - uses: actions/checkout@v4
+    - name: Set up Python 3.13
+      uses: actions/setup-python@v6
       with:
-        python-version: 3.9
+        python-version: '3.13'
+        cache: 'pip'
     - name: Install pypa/build
-      run: >-
-        python -m
-        pip install
-        build
-        --user
-    - name: Build a binary wheel and a source tarball
-      run: >-
-        python -m
-        build
-        --sdist
-        --wheel
-        --outdir dist/
-#    - name: Publish distribution 📦 to Test PyPI
-#      uses: pypa/gh-action-pypi-publish@master
-#      with:
-#        password: ${{ secrets.TEST_PYPI_TOKEN_CICD }}
-#        repository_url: https://test.pypi.org/legacy/
+      run: python -m pip install build --user
+    - name: Publish distribution 📦 to Test PyPI
+      run: python -m build --sdist --wheel --outdir dist/
     - name: Publish distribution 📦 to PyPI
       if: startsWith(github.ref, 'refs/tags')
-      uses: pypa/gh-action-pypi-publish@master
+      uses: pypa/gh-action-pypi-publish@release/v1
       with:
         password: ${{ secrets.PYPI_API_TOKEN_SECRET }}

.github/workflows/test.yml

@@ -1,17 +1,54 @@
-name: 'Test'
+name: Test
+
 on:
   push:
+    branches: [main, dev]
   pull_request:
-    branches:
-      - main
+    branches: [main]
+
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ['3.9', '3.10', '3.11', '3.12']
+
     steps:
-      - uses: actions/checkout@v2
-      - name: 'Build Docker image'
-        run: docker build -t magphi .
-      - name: 'Run unit tests'
-        run: docker run --entrypoint /Magphi/.travis/unit-test.sh magphi
-      - name: 'Run functional tests'
-        run: docker run --entrypoint /Magphi/functional_tests/Magphi-test.sh magphi -p Magphi -d /Magphi/functional_tests/test_data -v
+      - uses: actions/checkout@v5
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y bedtools samtools ncbi-blast+
+
+      - name: Install Python dependencies
+        run: |
+          pip install --upgrade pip
+          pip install setuptools
+          pip install .
+          pip install -r requirements-dev.txt
+
+      - name: Verify installation
+        run: |
+          which Magphi
+          Magphi --check
+          blastn -version
+          samtools --version | head -1
+          bedtools --version
+
+      - name: Run unit tests
+        working-directory: unit_tests
+        run: python Magphi_test.py
+
+      - name: Run pylint
+        run: pylint -E Magphi/*.py
+
+      - name: Run functional tests
+        run: bash functional_tests/Magphi-test.sh -p Magphi -d functional_tests/test_data -v

.gitignore

@@ -7,3 +7,6 @@ code_to_transfer/
 extractor.yml
 functional_tests/test_data/test_folder/
 venv/
+CLAUDE.md
+build/
+Magphi.egg-info/

Magphi/.gitignore

@@ -1 +1 @@
-*.pyc
+*.pyc

Magphi/__main__.py

@@ -16,9 +16,9 @@
 import logging
 from sys import argv
 from math import ceil
-import pkg_resources
 import concurrent.futures
 from tempfile import TemporaryDirectory
+from importlib.metadata import version, PackageNotFoundError
 
 try:
     from Magphi.commandline_interface import get_commandline_arguments
@@ -79,8 +79,8 @@
 
 
 try:
-    PROGRAM_VERSION = pkg_resources.require(PROGRAM_NAME)[0].version
-except pkg_resources.DistributionNotFound:
+    PROGRAM_VERSION = version(PROGRAM_NAME)
+except PackageNotFoundError:
     PROGRAM_VERSION = "undefined_version"
 
 

Magphi/check_depencies.py

@@ -2,6 +2,8 @@
 import warnings
 import sys
 
+from packaging.version import Version
+
 try:
     from Magphi.exit_with_error import exit_with_error
 except ModuleNotFoundError:
@@ -20,10 +22,10 @@ def check_for_biopython(verbose):
         if verbose:
             print("Biopython was successfully found")
 
-        if float(Bio.__version__) >= 1.78:
+        if Version(Bio.__version__) >= Version('1.78'):
             if verbose:
                 print("Biopython version is valid")
-            return float(Bio.__version__)
+            return Bio.__version__
 
         warnings.warn('Biopython seems to be an untested version! Make sure it is version = 1.78 or above.')
         return False
@@ -44,7 +46,7 @@ def check_for_pybedtools(verbose):
         if verbose:
             print("pybedtools was successfully found")
 
-        if pybedtools.__version__ >= '0.8.2':
+        if Version(pybedtools.__version__) >= Version('0.8.2'):
             if verbose:
                 print("pybedtools version is valid")
             return pybedtools.__version__
@@ -71,8 +73,8 @@ def check_for_bedtools(verbose):
                 print("Bedtools was successfully found")
 
             cmd_return = subprocess.run(['bedtools', '-version'], capture_output=True)
-            version = cmd_return.stdout.decode().rsplit('v', 1)[-1]
-            if version >= '2.29.2':
+            version = cmd_return.stdout.decode('utf-8', errors='ignore').rsplit('v', 1)[-1]
+            if Version(version) >= Version('2.29.2'):
                 if verbose:
                     print("Bedtools version is valid")
                 return version
@@ -108,10 +110,10 @@ def check_for_samtools(verbose):
 
             cmd_return = subprocess.run(['samtools', '--version'], capture_output=True)
             # Isolate version tag
-            version = cmd_return.stdout.decode().split(' ', 1)[-1]
+            version = cmd_return.stdout.decode('utf-8', errors='ignore').split(' ', 1)[-1]
             version = version.split('\n', 1)[0]
 
-            if version >= '1.11':
+            if Version(version) >= Version('1.11'):
                 if verbose:
                     print("Samtools version is valid")
                 return version
@@ -145,11 +147,11 @@ def check_for_blast_plus(verbose=False):
                 print("Blast+ was successfully found")
 
             # Isolate version tag
-            version = cmd_return.stdout.decode().split('\n')[1]
+            version = cmd_return.stdout.decode('utf-8', errors='ignore').split('\n')[1]
             version = version.split(' ')[3]
             version = version.rsplit(',', 1)[0]
 
-            if version == '2.6.0' or version >= '2.11.0':
+            if Version(version) == Version('2.6.0') or Version(version) >= Version('2.11.0'):
                 if verbose:
                     print("Blast+ version is valid")
                 return version