Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #48

Merged
merged 35 commits into from
Feb 6, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
c81a9d9
Rework readme (#6)
okkevaneck Mar 19, 2021
2bd40ad
Fix import structure (#10)
okkevaneck Mar 22, 2021
dc44f80
Fix visualization helpers (#13)
okkevaneck Mar 22, 2021
937d0ac
Update build_deploy.yml
okkevaneck Mar 22, 2021
4b3cb6e
Fix compressing core and installed pre-commit (#15)
okkevaneck Mar 23, 2021
0cce83d
Fix datasets (#17)
okkevaneck Apr 8, 2021
df9e335
Test for matrix include (#18)
okkevaneck Apr 8, 2021
c0e92d3
Added enter to README
okkevaneck Apr 8, 2021
7cba0f9
Release v0.2a2 (#20)
okkevaneck Apr 9, 2021
c9e21c0
Changed version number
okkevaneck Apr 9, 2021
91dd2de
Add PyTest to repo and CI (#21)
okkevaneck Apr 29, 2021
4e14d09
Add CI caching for python environments (#23)
okkevaneck Apr 30, 2021
ece8b0f
Add documentation to project (#24)
okkevaneck May 21, 2021
39be57a
Started on AminoAcid class (#28)
okkevaneck Sep 28, 2022
bf5461f
Temp commit to switch branch
okkevaneck Oct 3, 2022
c7ccf94
Update core merge (#33)
okkevaneck Oct 3, 2022
f173ceb
Merged develop with update_core
okkevaneck Oct 3, 2022
d3a063a
Solved merge conflicts
okkevaneck Oct 3, 2022
30e5705
Fixed merge conflicts
okkevaneck Oct 6, 2022
8ad32ad
Merge branch 'master' into develop
okkevaneck Nov 10, 2022
0736eff
Merge visualization updates (#41) (#42)
okkevaneck Nov 10, 2022
973733e
Increased version to make new visualizations available
okkevaneck Nov 10, 2022
a2c792e
Merge branch 'master' into develop
okkevaneck Nov 10, 2022
981ff1d
Solved pull merge conflicts
okkevaneck Feb 6, 2023
8c50ef6
Add beam (#47)
okkevaneck Feb 6, 2023
810046f
Added ptests for beam search and naive prune
okkevaneck Feb 6, 2023
72f0a74
Fixed typo for beam search class
okkevaneck Feb 6, 2023
f88c9e2
Trying other pytest approach for mac
okkevaneck Feb 6, 2023
9262863
Trying run-on conditional from matrix
okkevaneck Feb 6, 2023
45628c3
Removed file specifier for pytest
okkevaneck Feb 6, 2023
d946645
Added Windows runner check to linux
okkevaneck Feb 6, 2023
58123c4
Enabled windows runner again
okkevaneck Feb 6, 2023
74fbc26
ALso removed big beam width
okkevaneck Feb 6, 2023
20e7330
Removing dir slash in setuptools for windows buil
okkevaneck Feb 6, 2023
6ec811c
Removed windows due to Pybind11 bug
okkevaneck Feb 6, 2023
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
Prev Previous commit
Next Next commit
Started on AminoAcid class (#28)
* Started on AminoAcid class

* Added comments in core, still bugs to sort out

* Fixed more bugs in the core when adding AminoAcid class

* Moved part of bind

* Integrated AminoAcid class and fixed Protein tests

* Mid way testing for new depth-first approach

* Added local check script and depth_first works for HPPH

* Fixed depth_first search new version

* Fixed depth_first_bnb algorithm using new system

* Fixed small core bugs, working on new logo

* Mid-way of changing bond_value  structure

* Cleaned up bugs from intermediate version. Bumped versions of requirements. Introduced max_weights string for keeping track of possible future scores. Merged bond_semetry model setup with the else model setup. Fixed bug with cur_len of protein always being 1. Fixed getting the weight of a amino bond

* Bumbed python version in github workflow for matplotlib version dependency

* Bumped workflow python version to 3.9 as numpy 1.23 requires so

* Removed h_idxs from prune function. Nothing has been tested

* Fixed Protein signature for pybind build

* Setup for debugging current protein issues

* Introduced core testing code

* Finished test script for amino acids

* Started on Protein core tests

* Fixed protein test compilation

* Fixed first couple protein generation checks

* Added more debug statements for core tests

* Fixed bugs with bond checks

* Fixed generation of weighted amino maps

* Finished all protein generation test

* Added debug options in script to run core tests with gdb

* Added removal of amino tests

* Updated some pytest asserts. Added pytest and core_test asserts for score updates

* Updated reference for black in pre-commit

* Try adding core build in github actions pipeline

* Fixed local algorithm core tests

* Fixed dfs_bnb

* Fixed pybind11 change to providing protein pointers

* Added special compilation case for MacOS

* Changed minimum Python version to 3.9 as 3.11 will release soon

* Changed always build to only build python 3.9 versions

* Changed CIwheel builds to be specific instead of exlcuding based

* Leaving documentation as is and adding issue for the future

* Added more licensing references

* Added config file for rtfd to set python version to 3.9
  • Loading branch information
okkevaneck authored Sep 28, 2022
commit 39be57a8e787803bf49ca33e781b2bfee62c3134
21 changes: 11 additions & 10 deletions .github/workflows/build_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: nelonoel/branch-name@v1.0.1

Expand All @@ -23,7 +23,7 @@ jobs:
name: Check for syntax errors
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Flake8 - Error on syntax errors or undefined names
uses: py-actions/flake8@v1.1.0
Expand All @@ -43,11 +43,11 @@ jobs:
needs: syntax_check
strategy:
matrix:
python-version: [3.6]
python-version: [3.9]
os: [ubuntu-latest, windows-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
Expand All @@ -58,6 +58,7 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install -r requirements.txt
./manage.sh build
python -m pip install -e .

- name: Test with pytest
Expand All @@ -70,19 +71,19 @@ jobs:
matrix: ${{ fromJson(needs.matrix_prep.outputs.matrix) }}
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v2

- name: Build wheels
uses: joerick/cibuildwheel@v1.10.0
uses: pypa/cibuildwheel@v2.10.1
env:
CIBW_BUILD: ${{ matrix.cibw_build }}
CIBW_SKIP: ${{ matrix.cibw_skip }}
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.6"
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.9"

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
path: ./wheelhouse/*.whl

Expand All @@ -91,7 +92,7 @@ jobs:
needs: pytest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup Python
uses: actions/setup-python@v2
Expand All @@ -105,7 +106,7 @@ jobs:
- name: Check metadata
run: twine check dist/*

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
path: dist/*.tar.gz

Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/matrix_includes.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,55 +2,55 @@
{
"runOn": "master",
"os": "ubuntu-latest",
"cibw_skip": "cp27-* cp35-* *-win32 pp27-*",
"cibw_build": ""
"cibw_skip": "",
"cibw_build": "cp39-* cp310-* cp311-* pp37-* pp38-* pp39-*"
},
{
"runOn": "master",
"os": "windows-latest",
"cibw_skip": "cp27-* cp35-* *-win32 pp27-*",
"cibw_build": ""
"cibw_skip": "",
"cibw_build": "cp39-* cp310-* cp311-* pp37-* pp38-* pp39-*"
},
{
"runOn": "master",
"os": "macos-latest",
"cibw_skip": "cp27-* cp35-* *-win32 pp27-*",
"cibw_build": ""
"cibw_skip": "",
"cibw_build": "cp39-* cp310-* cp311-* pp37-* pp38-* pp39-*"
},
{
"runOn": "release-",
"os": "ubuntu-latest",
"cibw_skip": "cp27-* cp35-* *-win32 pp27-*",
"cibw_build": ""
"cibw_skip": "",
"cibw_build": "cp39-* cp310-* cp311-* pp37-* pp38-* pp39-*"
},
{
"runOn": "release-",
"os": "windows-latest",
"cibw_skip": "cp27-* cp35-* *-win32 pp27-*",
"cibw_build": ""
"cibw_skip": "",
"cibw_build": "cp39-* cp310-* cp311-* pp37-* pp38-* pp39-*"
},
{
"runOn": "release-",
"os": "macos-latest",
"cibw_skip": "cp27-* cp35-* *-win32 pp27-*",
"cibw_build": ""
"cibw_skip": "",
"cibw_build": "cp39-* cp310-* cp311-* pp37-* pp38-* pp39-*"
},
{
"runOn": "always",
"os": "ubuntu-latest",
"cibw_skip": "",
"cibw_build": "cp36-manylinux_x86_64"
"cibw_build": "cp39-manylinux_x86_64"
},
{
"runOn": "always",
"os": "windows-latest",
"cibw_skip": "",
"cibw_build": "cp36-win_amd64"
"cibw_build": "cp39-win_amd64"
},
{
"runOn": "always",
"os": "macos-latest",
"cibw_skip": "",
"cibw_build": "cp36-macosx_x86_64"
"cibw_build": "cp39-macosx_x86_64"
}
]
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ repos:
- id: mypy
exclude: ^docs/
- repo: https://github.com/psf/black
rev: 20.8b1
rev: 22.8.0
hooks:
- id: black
language_version: python3.8
language_version: python3.10
- repo: local
hooks:
- id: compress-files
Expand Down
10 changes: 10 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2

build:
os: "ubuntu-20.04"
tools:
python: "3.9"

# Build from the docs/ directory with Sphinx
sphinx:
configuration: docs/source/conf.py
165 changes: 165 additions & 0 deletions COPYING.LESSER
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.


This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.

0. Additional Definitions.

As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
General Public License.

"The Library" refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.

An "Application" is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.

A "Combined Work" is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the "Linked
Version".

The "Minimal Corresponding Source" for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.

The "Corresponding Application Code" for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.

1. Exception to Section 3 of the GNU GPL.

You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.

2. Conveying Modified Versions.

If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:

a) under this License, provided that you make a good faith effort to
ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or

b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.

3. Object Code Incorporating Material from Library Header Files.

The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:

a) Give prominent notice with each copy of the object code that the
Library is used in it and that the Library and its use are
covered by this License.

b) Accompany the object code with a copy of the GNU GPL and this license
document.

4. Combined Works.

You may convey a Combined Work under terms of your choice that,
taken together, effectively do not restrict modification of the
portions of the Library contained in the Combined Work and reverse
engineering for debugging such modifications, if you also do each of
the following:

a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.

b) Accompany the Combined Work with a copy of the GNU GPL and this license
document.

c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.

d) Do one of the following:

0) Convey the Minimal Corresponding Source under the terms of this
License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.

1) Use a suitable shared library mechanism for linking with the
Library. A suitable mechanism is one that (a) uses at run time
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.

e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the
Application with a modified version of the Linked Version. (If
you use option 4d0, the Installation Information must accompany
the Minimal Corresponding Source and Corresponding Application
Code. If you use option 4d1, you must provide the Installation
Information in the manner specified by section 6 of the GNU GPL
for conveying Corresponding Source.)

5. Combined Libraries.

You may place library facilities that are a work based on the
Library side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:

a) Accompany the combined library with a copy of the same work based
on the Library, uncombined with any other library facilities,
conveyed under the terms of this License.

b) Give prominent notice with the combined library that part of it
is a work based on the Library, and explaining where to find the
accompanying uncombined form of the same work.

6. Revised Versions of the GNU Lesser General Public License.

The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.

Each version is given a distinguishing version number. If the
Library as you received it specifies that a certain numbered version
of the GNU Lesser General Public License "or any later version"
applies to it, you have the option of following the terms and
conditions either of that published version or of any later version
published by the Free Software Foundation. If the Library as you
received it does not specify a version number of the GNU Lesser
General Public License, you may choose any version of the GNU Lesser
General Public License ever published by the Free Software Foundation.

If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
Binary file modified archives/prospr_core.tar.gz
Binary file not shown.
Binary file modified archives/prospr_core.zip
Binary file not shown.
Binary file modified archives/prospr_data.tar.gz
Binary file not shown.
Binary file modified archives/prospr_data.zip
Binary file not shown.
Loading