Skip to content

Commit

Permalink
Merge pull request #72 from valentynbez/main
Browse files Browse the repository at this point in the history
fix: compilation
  • Loading branch information
valentynbez authored Feb 23, 2024
2 parents 0e8dc88 + fd2b5e8 commit 68de1b4
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 46 deletions.
90 changes: 45 additions & 45 deletions .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
# This workflow automatically generates the Sphinx documentation required for
# GitHub pages. Executed when main is pushed to.
name: Documentation update
on:
push:
branches: main
workflow_dispatch:
# # This workflow automatically generates the Sphinx documentation required for
# # GitHub pages. Executed when main is pushed to.
# name: Documentation update
# on:
# push:
# branches: main
# workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-python@v2
with:
python-version: '3.8'
# jobs:
# build:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/setup-python@v2
# with:
# python-version: '3.8'

# Checkout the main branch (docs will be built from this)
- uses: actions/checkout@v2
with:
path: main
# Checkout the documentation branch (docs will be pushed to this)
- uses: actions/checkout@v2
with:
ref: gh-pages
path: gh-pages
# # Checkout the main branch (docs will be built from this)
# - uses: actions/checkout@v2
# with:
# path: main
# # Checkout the documentation branch (docs will be pushed to this)
# - uses: actions/checkout@v2
# with:
# ref: gh-pages
# path: gh-pages

- name: Install Sphinx requirements
working-directory: ${{ github.workspace }}/main/docs
run: |
sudo apt-get update -y
sudo apt-get install -y pandoc
python -m pip install --upgrade pip
python -m pip install -r requirements.txt
- name: Build documentation
working-directory: ${{ github.workspace }}/main/docs
run: make html
# - name: Install Sphinx requirements
# working-directory: ${{ github.workspace }}/main/docs
# run: |
# sudo apt-get update -y
# sudo apt-get install -y pandoc
# python -m pip install --upgrade pip
# python -m pip install -r requirements.txt
# - name: Build documentation
# working-directory: ${{ github.workspace }}/main/docs
# run: make html

- name: Move documentation
run: |
touch main/docs/build/html/.nojekyll
cp -a main/docs/build/html/. gh-pages/
- name: Upload documentation
working-directory: ${{ github.workspace }}/gh-pages
run: |
git config --local user.email "[email protected]"
git config --local user.name "GitHub Action"
git add --all
git diff-index --quiet HEAD || git commit -m "docs update" -a
git push
# - name: Move documentation
# run: |
# touch main/docs/build/html/.nojekyll
# cp -a main/docs/build/html/. gh-pages/
# - name: Upload documentation
# working-directory: ${{ github.workspace }}/gh-pages
# run: |
# git config --local user.email "[email protected]"
# git config --local user.name "GitHub Action"
# git add --all
# git diff-index --quiet HEAD || git commit -m "docs update" -a
# git push
2 changes: 2 additions & 0 deletions mDeepFRI/alignment_utils.pyx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# distutils: define_macros=NPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION

cimport cython

import numpy as np
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def run(self):
sources=[SRC_DIR + "/alignment_utils.pyx"],
language="c++",
libraries=["stdc++"],
extra_compile_args=extra_compile_args.extend("-w")),
extra_compile_args=extra_compile_args),
]

extras = {}
Expand Down

0 comments on commit 68de1b4

Please sign in to comment.