Skip to content

Commit 48ea5b5

Browse files
authored
Merge pull request #7 from shenwei356/master
fix the ambiguity problem of package name "recycle" and script "recycle.py"
2 parents d45ef37 + 3e643ef commit 48ea5b5

File tree

10 files changed

+9
-6
lines changed

10 files changed

+9
-6
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
test/*bam
22
test/*bam.bai
3+
*.pyc
4+
*.directory

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
[![install with bioconda](https://img.shields.io/badge/install%20with-bioconda-brightgreen.svg?style=flat-square)](http://bioconda.github.io/recipes/recycler/README.html)
22

33
# Getting Recycler
4-
You can download Recycler [here](https://github.com/Shamir-Lab/Recycler/releases/download/v0.61/Recycler-v0.61.zip) or clone it via the link below. In case you download the zip, unzip the file before following the instructions below (ignoring the 'git clone' line)
4+
You can download Recycler [here](https://github.com/Shamir-Lab/Recycler/releases/) or clone it via the link below. In case you download the zip, unzip the file before following the instructions below (ignoring the 'git clone' line)
55

66
# Installation
77
To install Recycler and scripts follow the following instructions.
88

99
git clone https://github.com/rozovr/Recycler.git
10-
python setup.py install
10+
cd Recycler
11+
python setup.py install --user
1112

1213

1314
# Quick start

bin/make_fasta_from_fastg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python
22
import re, argparse, os
3-
from recycle.utils import readfq
3+
from recyclelib.utils import readfq
44

55
def parse_user_input():
66
parser = argparse.ArgumentParser(

bin/recycle.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
22

33
import argparse, os
4-
from recycle import *
4+
from recyclelib.utils import *
55
import pysam
66

77
def parse_user_input():

recycle/__init__.pyc

-144 Bytes
Binary file not shown.

recycle/run.pyc

-460 Bytes
Binary file not shown.

recycle/utils.pyc

-12.4 KB
Binary file not shown.
File renamed without changes.
File renamed without changes.

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
from setuptools import setup
22

33
setup(name='recycler',
4-
version='0.6',
4+
version='0.62',
55
description='Recycler: an algorithm for detecting plasmids from de novo assembly graphs',
66
url='https://github.com/Shamir-Lab/Recycler',
77
author='Roye Rozov',
88
author_email = '',
99
license='BSD-3-Clause',
1010
scripts = ['bin/recycle.py', 'bin/make_fasta_from_fastg.py', 'bin/get_simple_cycs.py'],
11-
packages = ['recycle'],
11+
packages = ['recyclelib'],
1212
requires=['python (<3.0)'],
1313
install_requires=[
1414
'networkx',

0 commit comments

Comments
 (0)