Merge pull request #53 from ratschlab/development

Development
ratschlab · Dec 17, 2019 · f492ba8 · f492ba8
2 parents b93d4fb + 96dfa7d
commit f492ba8
Show file tree

Hide file tree

Showing 208 changed files with 90,903 additions and 1,758 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/python:2.7.15-stretch-node
+      - image: circleci/python:3.6.8-jessie
     steps:
       - checkout
       - run:

diff --git a/.gitignore b/.gitignore
@@ -107,3 +107,4 @@ ENV/
 # intermediate test data
 tests/data/genome/
 /scripts/generate_gt_file.py
+*.bak
diff --git a/AUTHORS b/AUTHORS
@@ -0,0 +1,6 @@
+Metagraph was conceived and written by:
+    Matthias Hüser
+    Andre Kahles
+    Jiayu Chen
+    Laurie Prelot
+    Gunnar Rätsch
diff --git a/LICENSE b/LICENSE
@@ -2,7 +2,9 @@
 
 MIT License
 
-Copyright (c) 2018, ETH Zurich, Biomedical Informatics Group; Andre Kahles
+Copyright (c) 2018-2019, Matthias Hüser, Andre Kahles, Jiayu Chen, Gunnar Rätsch
+                    (for further author information, please refer to the AUTHORS file)
+All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
diff --git a/README.rst b/README.rst
diff --git a/development_history.md b/development_history.md
diff --git a/immunopepper/__init__.py b/immunopepper/__init__.py
@@ -2,4 +2,4 @@
 
 __author__ = """Ratschlab"""
 __email__ = '[email protected]'
-__version__ = '1.0.0'
+__version__ = '1.1.0'
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ version: 2 @@
     jobs:
       build:
         docker:
-          - image: circleci/python:2.7.15-stretch-node
+          - image: circleci/python:3.6.8-jessie
         steps:
           - checkout
           - run:
@@ Expand Down @@