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

🎨🐛 Add mock import of modules and link to contribution guidelines (fixes #22) #70

Merged
merged 159 commits into from
May 6, 2020
Merged
Show file tree
Hide file tree
Changes from 158 commits
Commits
Show all changes
159 commits
Select commit Hold shift + click to select a range
97d3d0f
initial commit of documentation for readthedocs format
evanroyrees Mar 13, 2020
c936532
first commit
Sidduppal Mar 19, 2020
02c8fde
Commiting all files in Scripts folder
Sidduppal Mar 19, 2020
b55d480
Modification to COPYRIGHT and config.py
Sidduppal Mar 19, 2020
2db1629
stable build
Sidduppal Mar 20, 2020
e7f71f8
Removed scripts_2, can now be fetched and run by any user
Sidduppal Mar 23, 2020
d4c2cf4
Create README.md
Sidduppal Mar 25, 2020
025dec5
Update README.md
Sidduppal Mar 25, 2020
ad624d2
Update README.md
Sidduppal Mar 25, 2020
241dd7a
Update README.md
Sidduppal Mar 25, 2020
a876c33
Update README.md
Sidduppal Mar 25, 2020
8e18f9c
Update README.md
Sidduppal Mar 26, 2020
7b71bbe
automatic argparse, autosummary, automatic copyright update, last upd…
Sidduppal Mar 26, 2020
903e04c
Merge branch 'documentation' of https://github.com/Sidduppal/Autometa…
Sidduppal Mar 26, 2020
60cf464
Update README.md
Sidduppal Mar 26, 2020
f603dd9
Update README.md
Sidduppal Mar 26, 2020
9946922
modified all copyrights added usage and autodoc for all scripts
Sidduppal Mar 31, 2020
25422b3
Merge branch 'documentation' of https://github.com/Sidduppal/Autometa…
Sidduppal Mar 31, 2020
7f8cd8b
changed autometa to run_autometa
Sidduppal Mar 31, 2020
6f639f0
initial commit of documentation for readthedocs format
evanroyrees Mar 13, 2020
c5bc237
first commit
Sidduppal Mar 19, 2020
bdab032
Commiting all files in Scripts folder
Sidduppal Mar 19, 2020
068ec49
Modification to COPYRIGHT and config.py
Sidduppal Mar 19, 2020
2c155c5
stable build
Sidduppal Mar 20, 2020
9d0a8fc
Removed scripts_2, can now be fetched and run by any user
Sidduppal Mar 23, 2020
edc58ca
Create README.md
Sidduppal Mar 25, 2020
0e1757d
Update README.md
Sidduppal Mar 25, 2020
8b3b283
Update README.md
Sidduppal Mar 25, 2020
12c3d01
Update README.md
Sidduppal Mar 25, 2020
8fc2c69
Update README.md
Sidduppal Mar 25, 2020
976420a
Update README.md
Sidduppal Mar 26, 2020
c189649
automatic argparse, autosummary, automatic copyright update, last upd…
Sidduppal Mar 26, 2020
4859440
Update README.md
Sidduppal Mar 26, 2020
1b9ab8d
Update README.md
Sidduppal Mar 26, 2020
9cf7bc4
modified all copyrights added usage and autodoc for all scripts
Sidduppal Mar 31, 2020
a20ecef
changed autometa to run_autometa
Sidduppal Mar 31, 2020
6941c85
Merge branch 'documentation' of https://github.com/Sidduppal/Autometa…
Sidduppal Mar 31, 2020
0fb0178
Applied changes to scripts and docs source files to remove warnings e…
evanroyrees Mar 31, 2020
46923be
Merge branch 'dev' of https://github.com/WiscEvan/Autometa into docum…
evanroyrees Mar 31, 2020
aaa83da
Merge branch 'Sidduppal-documentation' into documentation
evanroyrees Mar 31, 2020
e52c707
fixes PR Review comments Sidduppal/Autometa#1
evanroyrees Apr 1, 2020
68bec2b
environment.yaml and .readthedocs.yaml files for readthedocs integration
evanroyrees Apr 1, 2020
22eb064
attempt to reduce memory consumption in readthedocs.org. Removed pack…
evanroyrees Apr 1, 2020
db0d3c4
removed most dependencies from conda env and have moved to docs/requi…
evanroyrees Apr 1, 2020
1faf667
changed conda file to conda environment.
evanroyrees Apr 1, 2020
df572d8
added pip in environment.yaml dependencies.
evanroyrees Apr 1, 2020
794b469
removed numba from docs/requirements.txt
evanroyrees Apr 1, 2020
081d25e
fixes Sidduppal/documentation#1. minor changes in template.py to refl…
evanroyrees Apr 2, 2020
77150a6
Merge pull request #1 from WiscEvan/documentation
Sidduppal Apr 2, 2020
255d882
addressed Jason's comments for merge to dev
Sidduppal Apr 2, 2020
de08e73
todo box added, function to automatically input modules, sidebar, and…
Sidduppal Apr 3, 2020
51964c7
Updated markers docstring (fixed incorrect f-string) to allow paramet…
evanroyrees Apr 3, 2020
27797f1
Merge pull request #2 from WiscEvan/markers-docstring
Sidduppal Apr 3, 2020
b899010
addressed Jason's comments for merge to dev
Sidduppal Apr 2, 2020
4ef34db
todo box added, function to automatically input modules, sidebar, and…
Sidduppal Apr 3, 2020
f0ccdff
Merge branch 'documentation' of https://github.com/Sidduppal/Autometa…
Sidduppal Apr 3, 2020
01b10e8
final changes, added Ian to copyright, removed hardcoded copyright
Sidduppal Apr 3, 2020
a9fca2c
added reference for todo.py
Sidduppal Apr 3, 2020
d806fe9
added parse_argparse_2.py, every argparse can now be added automatica…
Sidduppal Apr 10, 2020
debc22c
resolving conflict due to merge
Sidduppal Apr 10, 2020
9c9538c
added start_parsing and end_parsing tag in all of autometa scripts (e…
Sidduppal Apr 10, 2020
abeaca6
deleted validation adn Scripts folder
Sidduppal Apr 10, 2020
6db2972
fixed automatic documentation. removed project.rst
Sidduppal Apr 10, 2020
7c593d8
Update conf.py
Sidduppal Apr 10, 2020
7f396ca
Update environment.yaml
Sidduppal Apr 10, 2020
1854792
Update environment.yaml
Sidduppal Apr 10, 2020
55b9129
Update requirements.txt
Sidduppal Apr 10, 2020
7c3c53e
Update environment.yaml
Sidduppal Apr 10, 2020
adbca48
Update environment.yaml
Sidduppal Apr 10, 2020
04d87d9
Update requirements.txt
Sidduppal Apr 10, 2020
42cbf2f
Update conf.py
Sidduppal Apr 10, 2020
db89735
Update conf.py
Sidduppal Apr 10, 2020
bfa7b82
Update conf.py
Sidduppal Apr 10, 2020
7e1883b
Update contribution-guidelines.rst
Sidduppal Apr 10, 2020
653409a
Update examining-results.rst
Sidduppal Apr 10, 2020
04f4326
removed #start_parsing and #end_parsing tags, no project.rst
Sidduppal Apr 10, 2020
db7f04e
Merge branch 'documentation' of https://github.com/Sidduppal/Autometa…
Sidduppal Apr 10, 2020
8ef0a2f
Update environment.yaml
Sidduppal Apr 10, 2020
532560f
Update environment.yaml
Sidduppal Apr 10, 2020
b127778
Update environment.yaml
Sidduppal Apr 10, 2020
65f5473
Update requirements.txt
Sidduppal Apr 11, 2020
863be09
Update environment.yaml
Sidduppal Apr 11, 2020
30a0d77
Update environment.yaml
Sidduppal Apr 11, 2020
5c46af7
Update environment.yaml
Sidduppal Apr 11, 2020
c6802f4
Update environment.yaml
Sidduppal Apr 11, 2020
ad5b315
Update environment.yaml
Sidduppal Apr 11, 2020
222db04
Update .readthedocs.yaml
Sidduppal Apr 11, 2020
a688d78
Update environment.yaml
Sidduppal Apr 11, 2020
a400c97
resolved merge conflicts with upstream dev
Sidduppal Apr 13, 2020
eca137d
Update README.md
Sidduppal Apr 13, 2020
25e58d7
Update requirements.txt
Sidduppal Apr 13, 2020
007ae14
Update README.md
Sidduppal Apr 13, 2020
94a4ef3
Update requirements.txt
Sidduppal Apr 13, 2020
3f6d56f
restored validation, deleted scripts_2, deleted _build
Sidduppal Apr 13, 2020
4d90a04
Update README.md
Sidduppal Apr 15, 2020
a692827
Update requirements.txt
Sidduppal Apr 15, 2020
eee65cf
Update requirements.txt
Sidduppal Apr 15, 2020
3c9fd3a
renamed scripts_2/scripts_main to Scrits/Usage, shortened .readthedoc…
Sidduppal Apr 15, 2020
6bbecff
Update .gitignore
Sidduppal Apr 20, 2020
f9429c4
made edits and refactored parse_argparse.py
Sidduppal Apr 20, 2020
e281f58
additions to autometa scripts so they work with parse_argparse.py
Sidduppal Apr 20, 2020
ea5afd0
removed programoutput extension from README.md and environment.yaml
Sidduppal Apr 20, 2020
70689b0
added sphinx-apidoc to run automatically when building, added the fol…
Sidduppal Apr 20, 2020
fa4bebb
Update README.md
Sidduppal Apr 23, 2020
ef47d16
Delete bhsne.py
Sidduppal Apr 23, 2020
5d082bb
Adressed the changes in Pull request, made a function in conf.py to r…
Sidduppal Apr 24, 2020
08acf9a
removed the lists from parse_argparse.py and modefied the script to h…
Sidduppal Apr 25, 2020
afa36da
changed the variable name that captues th regex from x to cap_str
Sidduppal Apr 25, 2020
c76ad97
modified parse_argparse.py as per Evan's comments, 3rd review. Made m…
Sidduppal Apr 29, 2020
149fba9
removed the string interpolation of DEFAULT in help text
Sidduppal May 1, 2020
1312887
able to run parse_argparse.py as a modulea
Sidduppal May 1, 2020
5c4ee9a
linking of sub-dir and scripts with the toc tree of parent directory …
Sidduppal May 1, 2020
84de78a
modified such that parse_argparse.py can be imported by anyone
Sidduppal May 1, 2020
b53aebe
removed write_main_file function, and renamed link_main to write_main…
Sidduppal May 4, 2020
1cd8016
renamed `pkg_scripts_fpath` to `pkg_scripts_search_fpath`
Sidduppal May 4, 2020
565bc1b
`pkg_scripts_fpath` to `pkg_scripts_search_fpath`
Sidduppal May 4, 2020
2fa3754
variable name changes
Sidduppal May 4, 2020
0c0fd17
Merge branch 'documentation' of https://github.com/Sidduppal/Autometa…
Sidduppal May 4, 2020
bb2a9e7
removed extra white spaces
Sidduppal May 4, 2020
7f529f4
Update requirements.txt
Sidduppal May 4, 2020
ea0245d
Update requirements.txt
Sidduppal May 4, 2020
f458ef4
Update environment.yaml
Sidduppal May 4, 2020
cd70b1f
Update environment.yaml
Sidduppal May 4, 2020
2937ab1
Update requirements.txt
Sidduppal May 4, 2020
750a21c
Fix permission issue with build
Sidduppal May 4, 2020
5ad1fe2
Merge branch 'documentation' of https://github.com/Sidduppal/Autometa…
Sidduppal May 4, 2020
7fa655e
added comments explaining the need to get the autometa index from rev…
Sidduppal May 4, 2020
f0f845b
Added space between Dr. and Jason
Sidduppal May 6, 2020
48065f8
Update environment.yaml
Sidduppal May 6, 2020
d59ba10
Update environment.yaml
Sidduppal May 6, 2020
dc23d8f
Update index.rst
Sidduppal May 6, 2020
876a226
Update environment.yaml
Sidduppal May 6, 2020
bd0530d
Update .readthedocs.yaml
Sidduppal May 6, 2020
6681214
Update .readthedocs.yaml
Sidduppal May 6, 2020
f69fbdf
Update environment.yaml
Sidduppal May 6, 2020
d6ea639
Update .readthedocs.yaml
Sidduppal May 6, 2020
04fe8ef
Update .readthedocs.yaml
Sidduppal May 6, 2020
3d82383
Update index.rst
Sidduppal May 6, 2020
2ee0987
Delete requirements.txt
Sidduppal May 6, 2020
115529f
Delete environment.yaml
Sidduppal May 6, 2020
70cd446
Update conf.py
Sidduppal May 6, 2020
515f862
Update conf.py
Sidduppal May 6, 2020
ac5f55e
Update conf.py
Sidduppal May 6, 2020
5e2084b
Update conf.py
Sidduppal May 6, 2020
617b060
Create requirements.txt
Sidduppal May 6, 2020
48c98c6
Update .readthedocs.yaml
Sidduppal May 6, 2020
c395987
Update conf.py
Sidduppal May 6, 2020
711ea9c
Update requirements.txt
Sidduppal May 6, 2020
b754f67
Merge branch 'dev' of https://github.com/KwanLab/Autometa into docume…
Sidduppal May 6, 2020
d7c7251
Merge branch 'documentation' of https://github.com/Sidduppal/Autometa…
Sidduppal May 6, 2020
8df315e
removed HEAD from the file
Sidduppal May 6, 2020
b7e3ddf
Merge branch 'dev' of https://github.com/KwanLab/Autometa into docume…
Sidduppal May 6, 2020
f59abcf
added autodoc_mock_imports = [tsne]
Sidduppal May 6, 2020
589f912
Adding mock imports to satisfy dependencies
Sidduppal May 6, 2020
627ffb0
Delete requirements.txt
Sidduppal May 6, 2020
64cdeaf
Update .readthedocs.yaml
Sidduppal May 6, 2020
4ec109c
Update conf.py
Sidduppal May 6, 2020
ce2c149
added link to contribution guidelines on KwanLab repo
Sidduppal May 6, 2020
f0cba2c
Added `formatter_class=argparse.ArgumentDefaultsHelpFormatter)`
Sidduppal May 6, 2020
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
8 changes: 1 addition & 7 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,5 @@ sphinx:

# Optionally build your docs in additional formats such as PDF and ePub
formats: all

python:
version: 3.7
install:
- requirements: docs/requirements.txt




16 changes: 8 additions & 8 deletions autometa/common/markers.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,18 +255,18 @@ def main():
datefmt='%m/%d/%Y %I:%M:%S %p',
level=logger.DEBUG)
parser = argparse.ArgumentParser(
description='Annotate ORFs with kingdom-marker information',
formatter_class=argparse.ArgumentDefaultsHelpFormatter)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The formatter_class should not be deleted.

description='Annotate ORFs with kingdom-marker information')
Sidduppal marked this conversation as resolved.
Show resolved Hide resolved
parser.add_argument('orfs',
help='Path to a fasta file containing amino acid sequences of open reading frames')
help='Path to a fasta file containing amino acid sequences of open reading frames')
parser.add_argument('--kingdom', help='kingdom to search for markers',
choices=['bacteria', 'archaea'], default='bacteria')
choices=['bacteria', 'archaea'], default='bacteria')
parser.add_argument('--dbdir',
help='Path to directory containing the single-copy marker HMM databases.',
default=MARKERS_DIR)
args=parser.parse_args()
help='Path to directory containing the single-copy marker HMM databases.',
default=MARKERS_DIR)
args = parser.parse_args()

markers=Markers(orfs_fpath=args.orfs, kingdom=args.kingdom, dbdir=args.dbdir)
markers = Markers(orfs_fpath=args.orfs,
kingdom=args.kingdom, dbdir=args.dbdir)

markers.get()

Expand Down
5 changes: 0 additions & 5 deletions docs/requirements.txt

This file was deleted.

4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

for dirpath, dirnames, filenames in os.walk('../../', topdown=True):
sys.path.insert(0, os.path.abspath(dirpath))
#autodoc_mock_imports = ["Bio","hdbscan", "sklearn","umap", "tqdm"]

autodoc_mock_imports = ["Bio", "hdbscan", "tsne", "sklearn", "umap", "tqdm"]

import parse_argparse # nopep8

Expand Down
6 changes: 4 additions & 2 deletions docs/source/contribution-guidelines.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
=======================
Contribution Guidelines
Contributing Guidelines
=======================

.. todo:: Guidelines about how to contribute
"Autometa is an open-source project developed on
GitHub. If you would like to help develop Autometa or
have ideas for new features please see our `contributing guidelines <https://github.com/KwanLab/Autometa/blob/master/.github/CONTRIBUTING.md>`__