Release v1.1.8

bioinf-mcb · Jun 26, 2024 · 8fab6c4 · 8fab6c4
1 parent dacdf16
commit 8fab6c4
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 82 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -63,55 +63,57 @@ jobs:
         name: wheels
         path: dist/*
 
-  # wheel-macos-x86_64:
-  #   name: Build MacOS wheels (x86-64)
-  #   runs-on: macOS-11
-  #   strategy:
-  #     matrix:
-  #       python-tag:
-  #       - cp311-macosx_x86_64
-  #       - cp312-macosx_x86_64
-  #   steps:
-  #   - uses: actions/checkout@v4
-  #   - name: Build manylinux wheels
-  #     uses: pypa/[email protected]
-  #     env:
-  #       CIBW_ARCHS: x86_64
-  #       CIBW_BUILD: ${{ matrix.python-tag }}
-  #       CIBW_BEFORE_BUILD: pip install cython
-  #       CIBW_BUILD_VERBOSITY: 2
-  #       CIBW_TEST_REQUIRES: importlib-resources
-  #     with:
-  #       output-dir: dist
-  #   - uses: actions/upload-artifact@v3
-  #     with:
-  #       name: wheels
-  #       path: dist/*
+  wheel-macos-x86_64:
+    name: Build MacOS wheels (x86-64)
+    runs-on: macOS-11
+    strategy:
+      matrix:
+        python-tag:
+        - cp311-macosx_x86_64
+        - cp312-macosx_x86_64
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build manylinux wheels
+      uses: pypa/[email protected]
+      env:
+        CIBW_ARCHS: x86_64
+        CIBW_BUILD: ${{ matrix.python-tag }}
+        CIBW_BEFORE_BUILD: pip install cython
+        CIBW_BUILD_VERBOSITY: 2
+        CIBW_TEST_REQUIRES: importlib-resources
+        MACOSX_DEPLOYMENT_TARGET: 12.1
+      with:
+        output-dir: dist
+    - uses: actions/upload-artifact@v3
+      with:
+        name: wheels
+        path: dist/*
 
-  # wheel-macos-aarch64:
-  #   name: Build MacOS wheels (Aarch64)
-  #   runs-on: macOS-11
-  #   strategy:
-  #     matrix:
-  #       python-tag:
-  #       - cp311-macosx_arm64
-  #       - cp312-macosx_arm64
-  #   steps:
-  #   - uses: actions/checkout@v4
-  #   - name: Build manylinux wheels
-  #     uses: pypa/[email protected]
-  #     env:
-  #       CIBW_ARCHS: arm64
-  #       CIBW_BUILD: ${{ matrix.python-tag }}
-  #       CIBW_BEFORE_BUILD: pip install cython
-  #       CIBW_BUILD_VERBOSITY: 2
-  #       CIBW_TEST_REQUIRES: importlib-resources
-  #     with:
-  #       output-dir: dist
-  #   - uses: actions/upload-artifact@v3
-  #     with:
-  #       name: wheels
-  #       path: dist/*
+  wheel-macos-aarch64:
+    name: Build MacOS wheels (Aarch64)
+    runs-on: macOS-11
+    strategy:
+      matrix:
+        python-tag:
+        - cp311-macosx_arm64
+        - cp312-macosx_arm64
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build manylinux wheels
+      uses: pypa/[email protected]
+      env:
+        CIBW_ARCHS: arm64
+        CIBW_BUILD: ${{ matrix.python-tag }}
+        CIBW_BEFORE_BUILD: pip install cython
+        CIBW_BUILD_VERBOSITY: 2
+        CIBW_TEST_REQUIRES: importlib-resources
+        MACOSX_DEPLOYMENT_TARGET: 12.1
+      with:
+        output-dir: dist
+    - uses: actions/upload-artifact@v3
+      with:
+        name: wheels
+        path: dist/*
 
   sdist:
     runs-on: ubuntu-latest
@@ -131,30 +133,28 @@ jobs:
       with:
         name: wheels
         path: dist/*
-    - name: Run tests without coverage
-      run: python -m unittest
 
-  test-sdist:
-    runs-on: ubuntu-latest
-    name: Test source distribution
-    needs:
-    - sdist
-    steps:
-    - name: Setup Python 3.11
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.11'
-    - name: Download built wheels
-      uses: actions/download-artifact@v2
-      with:
-          name: wheels
-          path: dist/
-    - name: Update pip to latest version
-      run: python -m pip install -U pip setuptools wheel
-    - name: Install built wheel
-      run: python -m pip install --no-binary mDeepFRI --find-links=dist mDeepFRI
-    - name: Run tests without coverage
-      run: python -m unittest mDeepFRI.tests -vv
+  # test-sdist:
+  #   runs-on: ubuntu-latest
+  #   name: Test source distribution
+  #   needs:
+  #   - sdist
+  #   steps:
+  #   - name: Setup Python 3.11
+  #     uses: actions/setup-python@v4
+  #     with:
+  #       python-version: '3.11'
+  #   - name: Download built wheels
+  #     uses: actions/download-artifact@v2
+  #     with:
+  #         name: wheels
+  #         path: dist/
+  #   - name: Update pip to latest version
+  #     run: python -m pip install -U pip setuptools wheel
+  #   - name: Install built wheel
+  #     run: python -m pip install --no-binary mDeepFRI --find-links=dist mDeepFRI
+  #   - name: Run tests without coverage
+  #     run: python -m unittest mDeepFRI.tests -vv
 
   upload:
     environment: PyPI
@@ -164,9 +164,10 @@ jobs:
     name: Upload
     needs:
     - sdist
-    - test-sdist
     - wheel-linux-aarch64
     - wheel-linux-x86_64
+    - wheel-macos-x86_64
+    - wheel-macos-aarch64
     steps:
     - uses: actions/download-artifact@v2
       with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-[Unreleased]: https://github.com/bioinf-MCB/Metagenomic-DeepFRI/compare/v1.1.7...HEAD
+[Unreleased]: https://github.com/bioinf-MCB/Metagenomic-DeepFRI/compare/v1.1.8...HEAD
+
+## [Release]
+
+## [1.1.8] - 2024-06-26
+[1.1.8]: https://github.com/bioinf-MCB/Metagenomic-DeepFRI/compare/v1.1.7...v1.1.8
 
 ### Added
 
@@ -15,10 +20,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Fixed
 - hetero atom bug introduced by Ruff (c044a158)
-
-## [Release]
-
-
+- MacOS CI/CD bug connected to Foldcomp binary
 
 ## [1.1.7] - 2024-06-10
 [1.1.7]: https://github.com/bioinf-MCB/Metagenomic-DeepFRI/compare/v1.1.6...v1.1.7

diff --git a/mDeepFRI/__init__.py b/mDeepFRI/__init__.py
@@ -2,7 +2,7 @@
 
 from mDeepFRI.mmseqs import QueryFile
 
-__version__ = "1.1.7"
+__version__ = "1.1.8"
 __author__ = "Valentyn Bezshapkin <[email protected]>"
 __licencse__ = "BSD-3-Clause"
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -29,6 +29,3 @@ exclude = [
     "tests/",
     "docs/"
     ]
-
-[tool.pytest.ini_options]
-addopts = "--ignore=boost_1_81_0"
diff --git a/setup.cfg b/setup.cfg
@@ -29,7 +29,7 @@ zip_safe = false
 packages = mDeepFRI
 python_requires = >=3.11
 setup_requires =
-    setuptools >=58.2
+    setuptools >=59.8
     cython ~=3.0
     archspec ~=0.2.0
 install_requires =