Skip to content
This repository has been archived by the owner on May 15, 2023. It is now read-only.

Avamb new #3

Open
wants to merge 59 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
440d754
aamb integration on vamb framework
Dec 23, 2022
ac70099
Update snakemake config file
Dec 23, 2022
d5e0feb
dependencies conflict with CheckM2
Jan 10, 2023
3975413
Updated README
Paupiera Jan 23, 2023
cbc8092
Updated README
Paupiera Jan 23, 2023
84d1865
Updated README workflow
Paupiera Jan 23, 2023
c136a53
Updated snakemake avamb
Paupiera Jan 23, 2023
7157807
Updated snakemake avamb
Paupiera Jan 23, 2023
fabbe84
Updated snakemake avamb
Paupiera Jan 23, 2023
f3d87b8
Update workflow Readme
Jan 24, 2023
b7da992
Upadre Readme Workflow avamb
Jan 24, 2023
36ad323
Upadte workflow_avamb README
Jan 24, 2023
c3637db
Update README workflow_avamb
Jan 24, 2023
1dd04ca
Update workflow_avamb README
Jan 30, 2023
4c0398d
Update README
Feb 1, 2023
ed3ced7
Update workflow_avamb
Feb 1, 2023
f8f0a46
Update workflow_avamb
Feb 1, 2023
b74512c
Begin review
jakobnissen Feb 1, 2023
555929f
Format with Black formatter
jakobnissen Feb 1, 2023
40294b3
Clean up manual_drep_JN script
jakobnissen Feb 1, 2023
34a818e
Script create_cluster_scores_bin_path: Add type hints
jakobnissen Feb 1, 2023
31da654
Script mv_bins_from_mdrep_clusters: Clean up
jakobnissen Feb 1, 2023
f6028f6
Script: Rip bins: Clean up
jakobnissen Feb 1, 2023
0e4146c
Delete unused code in aamb/aamb_encode.py
jakobnissen Feb 2, 2023
ae586b5
Script: Update cluster...: Minor tweaks
jakobnissen Feb 2, 2023
9a0e5dc
Merge pull request #1 from jakobnissen/comments
Paupiera Feb 2, 2023
d272ed4
Remove duplicated scripts in vamb/src and vamb/workflow_avamb/src
Paupiera Feb 2, 2023
0d89e1f
Move aamb_encode.py to vamb/aamb_encode.py
Paupiera Feb 2, 2023
654d567
some python functions are imported, environments updated
Paupiera Feb 2, 2023
b31f57f
avamb.yaml environment updated and renamed with dereplication.yaml
Paupiera Feb 2, 2023
2bb36ef
No changes
Paupiera Feb 2, 2023
c3f16c2
aggregation of some functions
Paupiera Feb 2, 2023
d68a96d
aamb_encode is now imported from vamb folder
Paupiera Feb 2, 2023
cc42786
add pycoverm into the installation_requirements
Paupiera Feb 2, 2023
5ff1943
remove .snakemake files
Paupiera Feb 2, 2023
2495b42
remove .snakemake files
Paupiera Feb 2, 2023
dd5fc0e
update installation explanation
Feb 2, 2023
172045a
Add snakemake
Feb 2, 2023
d231939
includea all forward inputs
Feb 2, 2023
2ecf090
workflow updates and fixes
Feb 2, 2023
8700d6b
add vamb as dependency
Feb 2, 2023
b1dc73e
updates
Feb 2, 2023
a93c2cf
Delete unnecesary files
Feb 2, 2023
91087a4
Delete various extraneous files
jakobnissen Feb 3, 2023
fab4bdf
Also delete the autogenerated C file
jakobnissen Feb 3, 2023
e85afea
remove dere.yaml
Paupiera Feb 3, 2023
18821aa
Update installation
Paupiera Feb 3, 2023
8fd8069
concatenate.py from ../src
Paupiera Feb 3, 2023
bc73627
remove snakemake
Paupiera Feb 3, 2023
1945d15
remove swp reade
Paupiera Feb 3, 2023
6cb45a9
Merge pull request #2 from RasmussenLab/delete_aamb_files
Paupiera Feb 3, 2023
592726b
add dependency
Paupiera Feb 3, 2023
1ee4cd4
add dependency
Paupiera Feb 3, 2023
15f882f
Update installation
Feb 3, 2023
7236dc4
add log.e and log.o
Feb 3, 2023
47cdfca
Neutral input files
Feb 3, 2023
37b7def
log qsub files
Feb 4, 2023
bacd873
Update packaging metadata to v4
jakobnissen Feb 9, 2023
859fa48
Update license to 2023
jakobnissen Feb 9, 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
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018 Technical University of Denmark
Copyright (c) 2023 University of Copenhagen

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include vamb/kernel.npz
143 changes: 62 additions & 81 deletions README.md

Large diffs are not rendered by default.

26 changes: 26 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[project]
name = "vamb"
dynamic = ["version"]
dependencies = [
"numpy ~= 1.20",
"torch ~= 1.13",
"pycoverm ~= 0.6"
]
# Currently pycoverm does not have binaries for Python > 3.11.
# The dependency resolver, will not error on Python 3.11, but attempt
# to build pycoverm from source, but will not get the deps required for that.
requires-python = "<3.12.*,>=3.9.0"
scripts = {vamb = "vamb.__main__:main"}

[metadata]
author = "Pau Piera and Jakob Nybo Nissen"
author_email = "[email protected]"
url = "https://github.com/RasmussenLab/vamb"
description = "Variational and Adversarial autoencoders for Metagenomic Binning"
license = "MIT"
[tool.setuptools.dynamic]
version = {attr = "vamb.__version__"}

[build-system]
requires = ["setuptools ~= 63.0", "Cython ~= 0.29"]
build-backend = "setuptools.build_meta"
5 changes: 3 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
[metadata]
description-file = README.md
[options]
packages = find:
include_package_data = True
36 changes: 2 additions & 34 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,35 +1,3 @@
import sys
from setuptools import setup, find_packages
from setuptools import Extension
import os
from setuptools import Extension, setup

SETUP_METADATA = \
{
"name": "vamb",
"description": "Variational autoencoder for metagenomic binning",
"url": "https://github.com/RasmussenLab/vamb",
"author": "Jakob Nybo Nissen and Simon Rasmussen",
"author_email": "[email protected]",
"version": "3.0.9",
"license": "MIT",
"packages": find_packages(),
"package_data": {"vamb": ["kernel.npz"]},
"entry_points": {'console_scripts': [
'vamb = vamb.__main__:main'
]
},
"scripts": ['src/concatenate.py'],
"ext_modules": [Extension("vamb._vambtools",
sources=["src/_vambtools.pyx"],
language="c")],
"install_requires": ["numpy>=1.20", "torch>=1.13", "pysam>=0.14"],
"setup_requires": ['Cython>=0.29', "setuptools>=58.0"],
"python_requires": ">=3.5",
"classifiers":[
"Programming Language :: Python :: 3",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
],
}

setup(**SETUP_METADATA)
setup(ext_modules=[Extension(name="vamb._vambtools", sources=["src/_vambtools.pyx"])])
Loading