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

Updates docker setup notes #461

Closed
wants to merge 4 commits into from
Closed

Updates docker setup notes #461

wants to merge 4 commits into from

Conversation

brwnj
Copy link
Member

@brwnj brwnj commented Dec 16, 2015

Also clips a little white space.

Joe Brown and others added 4 commits December 16, 2015 10:13
* master: (29 commits)
  Add recipe for MapSplice 2.2.0
  proper toposorting of deps: first level
  add somehow deleted meta.yamls
  add first batch of toposorted recipes
  add r-* packages to osx-whitelist in prep for bioconductor
  update bioconductor recipes
  bioconductor recipes with new tarball urls
  trinity folder now resides in opt/
  update main README and the scripts/ucsc/README
  add requirements.txt for bioconductor work
  update wrapper to reflect other script changes
  allow update_bioconductor_packages.py to use arbitrary recipe dirs
  --recipe-dir -> --recipes
  cached dir should be relative to script itself
  mv bioconductor details from main README to
scripts/bioconductor/README.md
  rename bioconductor_scraper -> bioconductor_skeleton
  move bioconductor scripts to scripts/bioconductor
  readme updates
  rename bioconductor builder scripts so they are importable
  bump build if updated version == updated version
  ...

# Conflicts:
#	README.md
daler added a commit that referenced this pull request Dec 26, 2015
@johanneskoester
Copy link
Contributor

Thanks!

@johanneskoester
Copy link
Contributor

Looks like there are some conflicts though...

@brwnj brwnj closed this Jan 4, 2016
@brwnj brwnj deleted the update-readme branch January 4, 2016 17:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants