From 38cfe6707a8c0a37b89a1a82282e4b0ff7328e40 Mon Sep 17 00:00:00 2001 From: sameeul Date: Mon, 13 Nov 2023 09:05:33 -0500 Subject: [PATCH] Update mac os runner --- .github/workflows/publish_pypi.yml | 6 ++--- .github/workflows/wheel_build.yml | 6 ++--- .github/workflows/win_build.yml | 40 ------------------------------ setup.py | 2 +- 4 files changed, 7 insertions(+), 47 deletions(-) delete mode 100644 .github/workflows/win_build.yml diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml index 4c85cd2..59e2893 100644 --- a/.github/workflows/publish_pypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -14,7 +14,7 @@ jobs: MACOSX_DEPLOYMENT_TARGET: "10.15" strategy: matrix: - os: [ubuntu-20.04, macos-11, windows-latest] + os: [ubuntu-20.04, macos-12, windows-latest] cibw_archs: ["auto64"] cibw_build: ["cp38-*", "cp39-*", "cp310-*", "cp311-*"] @@ -47,7 +47,7 @@ jobs: CIBW_BUILD_VERBOSITY: 3 CIBW_SKIP: "*musllinux*" CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 - CIBW_BEFORE_ALL_MACOS: brew install llvm libomp nasm && + CIBW_BEFORE_ALL_MACOS: brew install nasm && bash ci-utils/install_prereq_linux.sh && mkdir -p /tmp/argolid_bld && cp -r local_install /tmp/argolid_bld @@ -58,7 +58,7 @@ jobs: cp -r local_install /tmp/argolid_bld CIBW_BEFORE_ALL_WINDOWS: ci-utils\install_prereq_win.bat && xcopy /E /I /y local_install C:\TEMP\argolid_bld\local_install - CIBW_ENVIRONMENT_MACOS: REPAIR_LIBRARY_PATH="/tmp/argolid_bld/local_install/lib:/tmp/argolid_bld/local_install/lib64" ON_GITHUB="TRUE" PATH="$(brew --prefix llvm)/bin:$PATH" COMPILER="/usr/local/opt/llvm/bin/clang++" CFLAGS="-I /usr/local/include -I/usr/local/opt/llvm/include" CXXFLAGS="-I /usr/local/include -I/usr/local/opt/llvm/include" LDFLAGS="-L /usr/local/lib -L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib" CXX="/usr/local/opt/llvm/bin/clang++" CC="/usr/local/opt/llvm/bin/clang" ARGOLID_DEP_DIR="/tmp/argolid_bld/local_install" + CIBW_ENVIRONMENT_MACOS: REPAIR_LIBRARY_PATH="/tmp/argolid_bld/local_install/lib:/tmp/argolid_bld/local_install/lib64" ON_GITHUB="TRUE" ARGOLID_DEP_DIR="/tmp/argolid_bld/local_install" CIBW_ENVIRONMENT_LINUX: LD_LIBRARY_PATH="/tmp/argolid_bld/local_install/lib:/tmp/argolid_bld/local_install/lib64:$LD_LIBRARY_PATH" ON_GITHUB="TRUE" ARGOLID_DEP_DIR="/tmp/argolid_bld/local_install" CIBW_REPAIR_WHEEL_COMMAND_MACOS: DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel} CIBW_ENVIRONMENT_WINDOWS: PATH="$TEMP\\argolid\\bin;$PATH" ON_GITHUB="TRUE" ARGOLID_DEP_DIR="C:\\TEMP\\argolid_bld\\local_install" diff --git a/.github/workflows/wheel_build.yml b/.github/workflows/wheel_build.yml index 139a0f6..779830f 100644 --- a/.github/workflows/wheel_build.yml +++ b/.github/workflows/wheel_build.yml @@ -12,7 +12,7 @@ jobs: MACOSX_DEPLOYMENT_TARGET: "10.15" strategy: matrix: - os: [ubuntu-20.04, macos-11, windows-latest] + os: [ubuntu-20.04, macos-12, windows-latest] cibw_archs: ["auto64"] cibw_build: ["cp38-*", "cp39-*", "cp310-*", "cp311-*"] @@ -45,7 +45,7 @@ jobs: CIBW_BUILD_VERBOSITY: 3 CIBW_SKIP: "*musllinux*" CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 - CIBW_BEFORE_ALL_MACOS: brew install llvm libomp nasm && + CIBW_BEFORE_ALL_MACOS: brew install nasm && bash ci-utils/install_prereq_linux.sh && mkdir -p /tmp/argolid_bld && cp -r local_install /tmp/argolid_bld @@ -56,7 +56,7 @@ jobs: cp -r local_install /tmp/argolid_bld CIBW_BEFORE_ALL_WINDOWS: ci-utils\install_prereq_win.bat && xcopy /E /I /y local_install C:\TEMP\argolid_bld\local_install - CIBW_ENVIRONMENT_MACOS: REPAIR_LIBRARY_PATH="/tmp/argolid_bld/local_install/lib:/tmp/argolid_bld/local_install/lib64" ON_GITHUB="TRUE" PATH="$(brew --prefix llvm)/bin:$PATH" COMPILER="/usr/local/opt/llvm/bin/clang++" CFLAGS="-I /usr/local/include -I/usr/local/opt/llvm/include" CXXFLAGS="-I /usr/local/include -I/usr/local/opt/llvm/include" LDFLAGS="-L /usr/local/lib -L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib" CXX="/usr/local/opt/llvm/bin/clang++" CC="/usr/local/opt/llvm/bin/clang" ARGOLID_DEP_DIR="/tmp/argolid_bld/local_install" + CIBW_ENVIRONMENT_MACOS: REPAIR_LIBRARY_PATH="/tmp/argolid_bld/local_install/lib:/tmp/argolid_bld/local_install/lib64" ON_GITHUB="TRUE" ARGOLID_DEP_DIR="/tmp/argolid_bld/local_install" CIBW_ENVIRONMENT_LINUX: LD_LIBRARY_PATH="/tmp/argolid_bld/local_install/lib:/tmp/argolid_bld/local_install/lib64:$LD_LIBRARY_PATH" ON_GITHUB="TRUE" ARGOLID_DEP_DIR="/tmp/argolid_bld/local_install" CIBW_REPAIR_WHEEL_COMMAND_MACOS: DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel} CIBW_ENVIRONMENT_WINDOWS: PATH="$TEMP\\argolid\\bin;$PATH" ON_GITHUB="TRUE" ARGOLID_DEP_DIR="C:\\TEMP\\argolid_bld\\local_install" diff --git a/.github/workflows/win_build.yml b/.github/workflows/win_build.yml deleted file mode 100644 index a774cb6..0000000 --- a/.github/workflows/win_build.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Build And Run Test on Windows - -on: - workflow_dispatch: - -env: - BUILD_TYPE: Release - -jobs: - - - Build_and_Run_PyTest: - name: Build and Run PyTest - runs-on: windows-latest - defaults: - run: - shell: bash -l {0} - - steps: - - uses: actions/checkout@v3 - with: - submodules: recursive - - - uses: ilammy/msvc-dev-cmd@v1 - name: Add MSVS Path - - - uses: conda-incubator/setup-miniconda@v2 - with: - activate-environment: anaconda-client-env - python-version: 3.8 - channels: conda-forge - auto-activate-base: false - - - name: Install Conda Dependencies - working-directory: ${{github.workspace}} - run: | - conda install cmake nasm perl - - name: Build Library - working-directory: ${{github.workspace}} - run: CMAKE_ARGS="-DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX" python -m pip install . -vv diff --git a/setup.py b/setup.py index 914f23c..3096de5 100644 --- a/setup.py +++ b/setup.py @@ -97,7 +97,7 @@ def build_extension(self, ext): cmdclass=versioneer.get_cmdclass(dict(build_ext=CMakeBuild)), author="Sameeul Bashir Samee", author_email="sameeul.samee@axleinfo.com", - url="https://github.com/sameeul/argolid", + url="https://github.com/PolusAI/argolid", description="Pyramid Generator For OMETiff", long_description=long_description, long_description_content_type="text/markdown",