Skip to content

Commit

Permalink
Merge pull request #131 from UC-Davis-molecular-computing/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
dave-doty authored Sep 1, 2020
2 parents fb6828c + 5bec304 commit 653d450
Show file tree
Hide file tree
Showing 6 changed files with 357 additions and 151 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -195,14 +195,16 @@ def create_design():
# whole design
design = sc.Design(helices=helices, strands=[], grid=sc.square)

# for absolute offsets, call method "to"
# left staple
design.strand(1, 8).to(24).cross(0).to(8)

# for relative offsets, call method "move"
# right staple
design.strand(0, 40).to(24).cross(1).to(40).with_modification_5p(mod.biotin_5p)
design.strand(0, 40).move(-16).cross(1).move(16).with_modification_5p(mod.biotin_5p)

# scaffold
design.strand(1, 24).to(8).cross(0).to(40).loopout(1, 3).to(24).as_scaffold()
design.strand(1, 24).move(-16).cross(0).move(32).loopout(1, 3).move(-16).as_scaffold()

# deletions and insertions added to design are added to both strands on a helix
design.add_deletion(helix=1, offset=20)
Expand Down
5 changes: 0 additions & 5 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@
sys.path.insert(0, os.path.abspath('../scadnano'))
# print(sys.path)

# from scadnano.scadnano_version import current_version
# this is ugly, but appears to be standard practice:
# https://stackoverflow.com/questions/17583443/what-is-the-correct-way-to-share-package-version-with-setup-py-and-the-package/17626524#17626524
# __version__ = open("../scadnano/_version.py").readlines()[-1].split()[-1].strip("\"'")

# this is ugly, but appears to be standard practice:
# https://stackoverflow.com/questions/17583443/what-is-the-correct-way-to-share-package-version-with-setup-py-and-the-package/17626524#17626524
def extract_version(filename: str):
Expand Down
6 changes: 0 additions & 6 deletions scadnano/_version.py

This file was deleted.

Loading

0 comments on commit 653d450

Please sign in to comment.