Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
20c1fad
remove fcc as submodule
rvhonorato Sep 10, 2024
6dc8a51
delete fcc submodule
rvhonorato Sep 10, 2024
41d0e10
add `fcc` code here
rvhonorato Sep 10, 2024
e733592
update `setup.py`
rvhonorato Sep 10, 2024
7a6054e
refactor `defaults.py` to find new cns binary location
rvhonorato Sep 10, 2024
1297e88
tweak `setup.py`
rvhonorato Sep 10, 2024
e404507
typo
rvhonorato Sep 10, 2024
120e8e3
remove unused fcc scripts
rvhonorato Sep 10, 2024
41d6ff0
remove `main` from fcc scripts
rvhonorato Sep 10, 2024
7ebba33
handle errors in custom install class
rvhonorato Sep 11, 2024
b3c8f5f
add cli_check_install
rvhonorato Sep 11, 2024
e0efeb5
refactor binary paths [wip]
rvhonorato Sep 11, 2024
ff21e0b
add c++/c code
rvhonorato Sep 16, 2024
9559364
remove submodules
rvhonorato Sep 16, 2024
c283105
update install script
rvhonorato Sep 16, 2024
949d7c5
remove unused script
rvhonorato Sep 16, 2024
67fb9b0
use `Extensions`
rvhonorato Sep 16, 2024
d117524
Update repository things
rvhonorato Sep 16, 2024
95d6ed6
Add new paths to the binaries
rvhonorato Sep 16, 2024
79b4ab0
update `tests.yml`
rvhonorato Sep 16, 2024
e684c1f
Merge branch 'main' into installation
rvhonorato Sep 16, 2024
bde7fb4
change `cns_exec` [wip]
rvhonorato Sep 16, 2024
c203978
disable type test [temp]
rvhonorato Sep 16, 2024
bd38a49
update `CONTACT_FCC_EXEC` path
rvhonorato Sep 16, 2024
0a75976
add links
rvhonorato Sep 17, 2024
dabff57
Merge branch 'main' into installation
rvhonorato Sep 17, 2024
39086db
Merge branch 'main' into installation
rvhonorato Sep 17, 2024
9e1d9e3
check arch
rvhonorato Sep 17, 2024
362464f
refactor setup.py
rvhonorato Sep 17, 2024
0cde66e
update `tests.yml`
rvhonorato Sep 17, 2024
0392d33
update tests.yml
rvhonorato Sep 17, 2024
40d15aa
tweak tests.yml
rvhonorato Sep 17, 2024
a7e4d87
update ci
rvhonorato Sep 17, 2024
13e3bab
update docs.yml
rvhonorato Sep 17, 2024
0faedba
change python version
rvhonorato Sep 19, 2024
d7350b4
add setuptools as dependency
rvhonorato Sep 19, 2024
840b3cb
update ci.yml
rvhonorato Sep 19, 2024
80ef6b2
fix numpy version
rvhonorato Sep 19, 2024
9fe01e1
revert versions
rvhonorato Sep 19, 2024
97628ac
update minimal python version
rvhonorato Sep 19, 2024
bbf62c6
Merge branch 'main' into installation
rvhonorato Sep 19, 2024
b698684
add disclaimer
rvhonorato Sep 19, 2024
68ae02c
Merge branch 'installation' of github.com:haddocking/haddock3 into in…
rvhonorato Sep 19, 2024
0243172
update ci.yml
rvhonorato Sep 19, 2024
7bd41b6
update ci.yml
rvhonorato Sep 19, 2024
0f9c4b9
update disclaimer format
rvhonorato Sep 19, 2024
3f66ce6
add fallback logic to define `cns_exec`
rvhonorato Sep 19, 2024
c6e8132
typo
rvhonorato Sep 19, 2024
69ce3dc
update `docs.yml`
rvhonorato Sep 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
---
name: ci

on:
push:
branches: [main]
pull_request:

jobs:
ci:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.9", "3.10"]
fail-fast: false

steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: install system dependencies
run: |
sudo apt-get update
sudo apt-get install -y openmpi-bin libopenmpi3 libopenmpi-dev

- name: install test dependencies
run: >-
pip install coverage pytest pytest-cov hypothesis pytest-mock mypy
fastapi==0.110.1 httpx==0.27.0 mpi4py==3.1.6

- name: install haddock3
run: pip install -v .

## Disabled for now until we figure out a good configuration ##
# - name: check types
# run: mypy src/
###############################################################

- name: run unit tests
run: >-
pytest tests/
--cov --cov-report=term-missing --cov-append
--hypothesis-show-statistics

- name: run integration tests
run: >-
pytest integration_tests/
--cov --cov-report=term-missing --cov-append
--hypothesis-show-statistics

- name: generate coverage report
run: |
coverage report
coverage xml

- uses: codacy/codacy-coverage-reporter-action@v1
if: >-
${{ github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name == github.repository }}
with:
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
coverage-reports: ./coverage.xml
15 changes: 6 additions & 9 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,25 @@ on:
push:
branches: [main]
pull_request:
branches: [main]

jobs:
build:
runs-on: ${{ matrix.platform }}
strategy:
matrix:
platform: [ubuntu-latest, macos-latest]
python-version: [3.9]
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
python-version: 3.9

- name: Install dependencies
run: |
python -m pip install pip==23.1.2 setuptools==67.7.2 wheel==0.40.0
pip install virtualenv==20.23.0 tox==4.5.1.1

- name: install haddock3
run: pip install -v .

- name: docs
run: tox -e docs
117 changes: 0 additions & 117 deletions .github/workflows/tests.yml

This file was deleted.

3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,5 @@ docs/haddock.modules.rst
docs/haddock.modules.base_cns_module.rst
docs/setup.rst
docs/clients/*rst
src/fast-rmsdmatrix
src/fcc
src/haddock/bin/
log
7 changes: 0 additions & 7 deletions .gitmodules

This file was deleted.

2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ recursive-include varia *.f
recursive-include varia *.inc
recursive-include varia *.lua
recursive-include varia *.md

include src/haddock/bin/*
Loading