History of interactome_vidal
The changes to the source code of this entry in the repository, newest first, each with the differences it made to the entry's files. They are also listed on GitLab.
[entries] Remove superfluous details of the upstream distribution from the descriptions dc07aa0
The descriptions mentioned incidental details of how the upstream data are made available: the file formats (CSV, JSON, XML, GEXF, SBML, HIF, Pajek, UCINET, ...), file names, where the files were published or obtained from (Zenodo, figshare, Kaggle, the Pajek datasets page, the Internet Archive), and that some networks are only available in the gt format. These are left out; caveats about the data themselves are kept, referring to "the data" instead of "the file". The description of sp_baboons now lists its properties instead of the upstream columns, and says that events without a recipient are left out.
diff --git a/entries/interactome_vidal/__init__.py b/entries/interactome_vidal/__init__.py
index bdde4f5..b3329c4 100644
--- a/entries/interactome_vidal/__init__.py
+++ b/entries/interactome_vidal/__init__.py
@@ -21,8 +21,8 @@ from .. import *
title = 'Vidal human interactome (2005)'
description = """Networks of interactions between human proteins from the first version of a proteome-scale map of human binary protein–protein interactions by Rual et al. (2005), from the Center for Cancer Systems Biology (CCSB) at the Dana-Farber Cancer Institute. In that study, pairwise interactions among the products of about 8,100 open reading frames (the "Space-I" of the human ORFeome) were tested with a stringent high-throughput yeast two-hybrid (Y2H) system, detecting 2,754 interactions among 1,549 proteins (the CCSB-HI1 data set, later called HI-I-05). The collection contains two versions of the data:
-- `HI-I-05`: the CCSB-HI1 interactions, as released by the CCSB in its Interactome Database (file `HI-I-05.tsv`, with the gene identifiers of the original publication), with proteins identified by their Entrez Gene IDs.
-- `maayan`: the network distributed by the network collection of the Ma'ayan Laboratory (Mount Sinai School of Medicine), in its SIG flat file format, as protein–protein interactions extracted from the paper, with proteins identified by gene symbols and, where available, UniProt accessions. This network is larger than CCSB-HI1: of its 6,726 interactions, only 2,509 match (by gene symbol) the 2,754 interactions of `HI-I-05`; the origin of the others is not documented.
+- `HI-I-05`: the CCSB-HI1 interactions, as released by the CCSB in its Interactome Database (with the gene identifiers of the original publication), with proteins identified by their Entrez Gene IDs.
+- `maayan`: the network of the network collection of the Ma'ayan Laboratory (Mount Sinai School of Medicine), as protein–protein interactions extracted from the paper, with proteins identified by gene symbols and, where available, UniProt accessions. This network is larger than CCSB-HI1: of its 6,726 interactions, only 2,509 match (by gene symbol) the 2,754 interactions of `HI-I-05`; the origin of the others is not documented.
In both networks, nodes are proteins (identified by the genes that encode them), and an undirected edge represents an interaction. Self-loops denote proteins that interact with themselves.
[entries] Add the date when each entry was added, and remove icon_hash beff7c9
The dates are those of the commits that first added the entries' files (2020-08-11 for the entries of the initial commit); renamed entries keep the date of their first name. Changed: none
diff --git a/entries/interactome_vidal/__init__.py b/entries/interactome_vidal/__init__.py
index 5f6dd51..bdde4f5 100644
--- a/entries/interactome_vidal/__init__.py
+++ b/entries/interactome_vidal/__init__.py
@@ -37,7 +37,7 @@ tags = ['Biological', 'Protein interactions', 'Unweighted', 'Metadata']
url = ['https://web.archive.org/web/20150511224913/http://interactome.dfci.harvard.edu/H_sapiens/index.php?page=download',
'https://web.archive.org/web/20180916202441/http://research.mssm.edu/maayan/datasets/qualitative_networks.shtml']
citation = [('J.-F. Rual et al., "Towards a proteome-scale map of the human protein–protein interaction network." Nature 437(7062), 1173-1178 (2005)', 'https://doi.org/10.1038/nature04209')]
-icon_hash = ['581760778cf714f319c3e77a', '56a85c8e26855e083a2f794b']
+date_added = '2020-08-11'
upstream_license = None
# The Ma'ayan Laboratory site and the CCSB Interactome Database are gone; the
# files are obtained from the Internet Archive.
[entries] Prefix the properties in the descriptions with (Node), (Edge) or (Graph) bc3dbbd
The lists of properties at the end of the descriptions marked edge properties with "Edge" but left node properties unmarked, or grouped them in "Nodes: `a`, ...; `b`, ..." items, so the kind of a property was often unclear. Every item now starts with (Node), (Edge) or (Graph), followed by the property names, a colon and the explanation, one item per property or group of properties; qualifications (kinds of nodes, networks) follow the names in parentheses. Properties that were only named got a short explanation, and a few items that named the wrong kind of property were corrected.
diff --git a/entries/interactome_vidal/__init__.py b/entries/interactome_vidal/__init__.py
index 7fccaae..5f6dd51 100644
--- a/entries/interactome_vidal/__init__.py
+++ b/entries/interactome_vidal/__init__.py
@@ -28,8 +28,9 @@ In both networks, nodes are proteins (identified by the genes that encode them),
The networks have the following properties:
-- `HI-I-05`: Nodes: `entrez_id`, the Entrez Gene ID; `name`, the HGNC gene symbol.
-- `maayan`: Nodes: `name`, the gene symbol of the protein; `uniprot_human` and `uniprot_mouse`, the UniProt accessions of the human protein and of its mouse orthologue (empty if not available).
+- (Node) `entrez_id` (`HI-I-05`): the Entrez Gene ID.
+- (Node) `name`: the HGNC gene symbol (`HI-I-05`), or the gene symbol of the protein (`maayan`).
+- (Node) `uniprot_human`, `uniprot_mouse` (`maayan`): the UniProt accessions of the human protein and of its mouse orthologue (empty if not available).
Other data sets of the CCSB Interactome Database are in the entries `human_interactome_2014` (the later human maps HI-II-14 and Lit-BM-13), `yeast_interactome_ccsb` (the yeast binary Y2H maps CCSB-YI1, Ito core and Uetz screen, and literature-curated and gold-standard reference sets), `collins_yeast` (the yeast co-complex associations of Collins et al.) and `celegans_interactomes` (the *C. elegans* interactome networks)."""
tags = ['Biological', 'Protein interactions', 'Unweighted', 'Metadata']
[entries] Remove unneeded code from the entries 2c69f19
Unneeded "global files" statements, unused imports and variables, f-strings without placeholders, duplicate keys in foodweb_little_rock (keeping the order and the values used), and the second definition of get_lines() in twitter_higgs. Nothing changes in the networks or descriptions. Changed: none
diff --git a/entries/interactome_vidal/__init__.py b/entries/interactome_vidal/__init__.py
index 96cd6e3..7fccaae 100644
--- a/entries/interactome_vidal/__init__.py
+++ b/entries/interactome_vidal/__init__.py
@@ -67,7 +67,6 @@ def read_sig(f):
@coerce_props()
@annotate()
def parse(alts=None):
- global files
name = __name__.split(".")[-1]
for fname, alt, fmt in files:
if alts is not None and alt not in alts:
[entries] Merge duplicate entries and add cross-references between related ones 9bc6033
- Removed duplicates, merged into the entries holding the same data: dblp_coauthor_snap (soc_net_comms), cattle and bison (dom; bison's breeding data move there, as do the wolves' age and sex), football_tsevans (football, with both conference assignments), eu_procurements_alt (eu_procurements), foursquare_friendships (foursquare_global). - software_dependencies: colt and scolt are one network; ambassador: the duplicate 2001 network is dropped and the three same-edge networks combined; dom: the dataset count corrected (436). - macaque_neural: Young's 71-area network added (young71; the 47-area one is now cocomac47), both from archived copies. - collins_yeast, celegans_interactomes: from archived copies of the dead CCSB site (byte-identical files). - Cross-references between entries holding versions of the same data (food webs, Wikipedia, Slashdot, physicians, SNAP/Mislove, CCSB). - ICON ids of duplicate records added; macaque_neural's corrected. - prosper, dbpedia_all: string properties given in edge-index order (needs graph-tool with the fixed vals ordering).
diff --git a/entries/interactome_vidal/__init__.py b/entries/interactome_vidal/__init__.py
index 85f70f7..96cd6e3 100644
--- a/entries/interactome_vidal/__init__.py
+++ b/entries/interactome_vidal/__init__.py
@@ -29,12 +29,14 @@ In both networks, nodes are proteins (identified by the genes that encode them),
The networks have the following properties:
- `HI-I-05`: Nodes: `entrez_id`, the Entrez Gene ID; `name`, the HGNC gene symbol.
-- `maayan`: Nodes: `name`, the gene symbol of the protein; `uniprot_human` and `uniprot_mouse`, the UniProt accessions of the human protein and of its mouse orthologue (empty if not available)."""
+- `maayan`: Nodes: `name`, the gene symbol of the protein; `uniprot_human` and `uniprot_mouse`, the UniProt accessions of the human protein and of its mouse orthologue (empty if not available).
+
+Other data sets of the CCSB Interactome Database are in the entries `human_interactome_2014` (the later human maps HI-II-14 and Lit-BM-13), `yeast_interactome_ccsb` (the yeast binary Y2H maps CCSB-YI1, Ito core and Uetz screen, and literature-curated and gold-standard reference sets), `collins_yeast` (the yeast co-complex associations of Collins et al.) and `celegans_interactomes` (the *C. elegans* interactome networks)."""
tags = ['Biological', 'Protein interactions', 'Unweighted', 'Metadata']
url = ['https://web.archive.org/web/20150511224913/http://interactome.dfci.harvard.edu/H_sapiens/index.php?page=download',
'https://web.archive.org/web/20180916202441/http://research.mssm.edu/maayan/datasets/qualitative_networks.shtml']
citation = [('J.-F. Rual et al., "Towards a proteome-scale map of the human protein–protein interaction network." Nature 437(7062), 1173-1178 (2005)', 'https://doi.org/10.1038/nature04209')]
-icon_hash = '581760778cf714f319c3e77a'
+icon_hash = ['581760778cf714f319c3e77a', '56a85c8e26855e083a2f794b']
upstream_license = None
# The Ma'ayan Laboratory site and the CCSB Interactome Database are gone; the
# files are obtained from the Internet Archive.
[entries] Add networks to existing entries 3023ce5
- digg_votes: the Digg friendship network (`friends`, next to `votes`) - facebook_wall: the friendship links (`friends`, next to `wall`) - interactome_vidal: CCSB's HI-I-05 interactions (`HI-I-05`, next to `maayan`) - trackers: ssc.io's tracker embedding network (`trackers`, next to KONECT's `third_parties`), with corrected description and citations - dblp_author_paper, dblp_cite, dblp_coauthor: the dblp release of 2026-10-03 (`2026-10`, next to `2017`) - fullerene_structures: year, licence and description
diff --git a/entries/interactome_vidal/__init__.py b/entries/interactome_vidal/__init__.py
index 05f4a6b..85f70f7 100644
--- a/entries/interactome_vidal/__init__.py
+++ b/entries/interactome_vidal/__init__.py
@@ -19,26 +19,36 @@
from .. import *
title = 'Vidal human interactome (2005)'
-description = """A network of interactions between human proteins, associated with the first version of a proteome-scale map of human binary protein–protein interactions by Rual et al. (2005), from the Center for Cancer Systems Biology (CCSB) at the Dana-Farber Cancer Institute. In that study, pairwise interactions among the products of about 8,100 open reading frames were tested with a stringent high-throughput yeast two-hybrid (Y2H) system, detecting about 2,800 interactions (the CCSB-HI1 data set). The data were obtained from the network collection of the Ma'ayan Laboratory (Mount Sinai School of Medicine), which distributed them in its SIG flat file format as protein–protein interactions extracted from the paper, with proteins identified by gene symbols and, where available, UniProt accessions. This network is larger than CCSB-HI1: of its 6,726 interactions, 2,509 match (by gene symbol) the 2,754 interactions of the CCSB-HI1 file released by the CCSB (HI-I-05); the origin of the others is not documented.
+description = """Networks of interactions between human proteins from the first version of a proteome-scale map of human binary protein–protein interactions by Rual et al. (2005), from the Center for Cancer Systems Biology (CCSB) at the Dana-Farber Cancer Institute. In that study, pairwise interactions among the products of about 8,100 open reading frames (the "Space-I" of the human ORFeome) were tested with a stringent high-throughput yeast two-hybrid (Y2H) system, detecting 2,754 interactions among 1,549 proteins (the CCSB-HI1 data set, later called HI-I-05). The collection contains two versions of the data:
-Nodes are proteins, and an undirected edge represents an interaction. Self-loops denote proteins that interact with themselves.
+- `HI-I-05`: the CCSB-HI1 interactions, as released by the CCSB in its Interactome Database (file `HI-I-05.tsv`, with the gene identifiers of the original publication), with proteins identified by their Entrez Gene IDs.
+- `maayan`: the network distributed by the network collection of the Ma'ayan Laboratory (Mount Sinai School of Medicine), in its SIG flat file format, as protein–protein interactions extracted from the paper, with proteins identified by gene symbols and, where available, UniProt accessions. This network is larger than CCSB-HI1: of its 6,726 interactions, only 2,509 match (by gene symbol) the 2,754 interactions of `HI-I-05`; the origin of the others is not documented.
-The network has the following properties:
+In both networks, nodes are proteins (identified by the genes that encode them), and an undirected edge represents an interaction. Self-loops denote proteins that interact with themselves.
-- Nodes: `name`, the gene symbol of the protein; `uniprot_human` and `uniprot_mouse`, the UniProt accessions of the human protein and of its mouse orthologue (empty if not available)."""
+The networks have the following properties:
+
+- `HI-I-05`: Nodes: `entrez_id`, the Entrez Gene ID; `name`, the HGNC gene symbol.
+- `maayan`: Nodes: `name`, the gene symbol of the protein; `uniprot_human` and `uniprot_mouse`, the UniProt accessions of the human protein and of its mouse orthologue (empty if not available)."""
tags = ['Biological', 'Protein interactions', 'Unweighted', 'Metadata']
-url = 'https://web.archive.org/web/20180916202441/http://research.mssm.edu/maayan/datasets/qualitative_networks.shtml'
+url = ['https://web.archive.org/web/20150511224913/http://interactome.dfci.harvard.edu/H_sapiens/index.php?page=download',
+ 'https://web.archive.org/web/20180916202441/http://research.mssm.edu/maayan/datasets/qualitative_networks.shtml']
citation = [('J.-F. Rual et al., "Towards a proteome-scale map of the human protein–protein interaction network." Nature 437(7062), 1173-1178 (2005)', 'https://doi.org/10.1038/nature04209')]
icon_hash = '581760778cf714f319c3e77a'
upstream_license = None
-# The Ma'ayan Laboratory site is gone; the file is obtained from the Internet
-# Archive.
+# The Ma'ayan Laboratory site and the CCSB Interactome Database are gone; the
+# files are obtained from the Internet Archive.
upstream_prefix = 'https://web.archive.org/web/20150912005145id_/http://research.mssm.edu:80/maayan/datasets'
-files = [('vidal.sig', None, 'sig')]
+ccsb_prefix = 'https://web.archive.org/web/20150511224913id_/http://interactome.dfci.harvard.edu/H_sapiens/download'
+files = [('vidal.sig', 'maayan', 'sig'),
+ ('HI-I-05.tsv', 'HI-I-05', 'tsv')]
def fetch_upstream(force=False):
- return fetch_upstream_files(__name__.split(".")[-1], upstream_prefix, files,
- force)
+ name = __name__.split(".")[-1]
+ fetch_upstream_files(name, upstream_prefix,
+ [x for x in files if x[2] == "sig"], force)
+ fetch_upstream_files(name, ccsb_prefix,
+ [x for x in files if x[2] == "tsv"], force)
def read_sig(f):
"""Read a SIG file of the Ma'ayan Laboratory: one interaction per line, with
@@ -60,6 +70,24 @@ def parse(alts=None):
for fname, alt, fmt in files:
if alts is not None and alt not in alts:
continue
+ if fmt == "tsv":
+ # Columns: Entrez Gene IDA, Symbol A, Entrez Gene IDB, Symbol B
+ with open_upstream_file(name, fname, "r") as f:
+ rows = list(csv.reader(f, delimiter="\t"))
+ assert rows[0] == ["Entrez Gene IDA", "Symbol A",
+ "Entrez Gene IDB", "Symbol B"]
+ g = Graph(directed=False)
+ g.vp.entrez_id = g.add_edge_list(numpy.array([(int(r[0]), int(r[2]))
+ for r in rows[1:]]),
+ hashed=True)
+ sym = {}
+ for r in rows[1:]:
+ sym[int(r[0])] = r[1]
+ sym[int(r[2])] = r[3]
+ g.vp.name = g.new_vp("string",
+ vals=[sym[i] for i in g.vp.entrez_id])
+ yield alt, g
+ continue
g = Graph(directed=False)
vs = {}
acc = defaultdict(lambda: [None, None])
[entries] Move KONECT-derived entries to their original sources 45943ea
The entries now download the data from where KONECT obtained them (live or via the Wayback Machine), gaining the metadata KONECT dropped (names, identifiers, timestamps, attributes), with descriptions and citations rewritten from the original sources: - Ma'ayan lab collection: faa_routes, foodweb_little_rock (taxon names were assigned to the wrong nodes), interactome_pdz, interactome_figeys, interactome_stelzl, interactome_vidal - Pajek collection and primary sources: word_assoc (from the Edinburgh Associative Thesaurus; KONECT dropped all counts >= 10), foldoc, new_guinea_tribes - bitriad: elite, ceo_club (adds the CEO KONECT's copy lacked) - Lovro Subelj: cora, euroroad (adds isolated cities and parallel roads) - SNAP: elec (all votes, with elections and nominators) - Zenodo: wiki_talk (user ids and roles) - MPI-SWS: flickr_growth, facebook_wall (edges now point from poster to wall owner, as documented), wikipedia_growth (full timestamps) - Other sources: prosper, jester, reactome (the 2014 release KONECT used), unicodelang (CLDR 27), wordnet (WordNet 3.1), chicago_road (TNTP ChicagoRegional)
diff --git a/entries/interactome_vidal/__init__.py b/entries/interactome_vidal/__init__.py
index b5d5f69..05f4a6b 100644
--- a/entries/interactome_vidal/__init__.py
+++ b/entries/interactome_vidal/__init__.py
@@ -18,32 +18,69 @@
from .. import *
-title = "Vidal human interactome (2005)"
-description = """A network of human proteins and their binding interactions. Nodes represent proteins and an edge represents a binding interaction between two proteins, as tested using a high-throughput yeast two-hybrid (Y2H) system.[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
-tags = ['Biological', 'Protein interactions', 'Unweighted']
-url = 'http://konect.cc/networks/maayan-vidal'
-citation = [('JF. Rual et al. "Towards a proteome-scale map of the human protein–protein interaction network." Nature 437.7062, 1173-1178. (2005).', 'https://doi.org/10.1038/nature04209')]
+title = 'Vidal human interactome (2005)'
+description = """A network of interactions between human proteins, associated with the first version of a proteome-scale map of human binary protein–protein interactions by Rual et al. (2005), from the Center for Cancer Systems Biology (CCSB) at the Dana-Farber Cancer Institute. In that study, pairwise interactions among the products of about 8,100 open reading frames were tested with a stringent high-throughput yeast two-hybrid (Y2H) system, detecting about 2,800 interactions (the CCSB-HI1 data set). The data were obtained from the network collection of the Ma'ayan Laboratory (Mount Sinai School of Medicine), which distributed them in its SIG flat file format as protein–protein interactions extracted from the paper, with proteins identified by gene symbols and, where available, UniProt accessions. This network is larger than CCSB-HI1: of its 6,726 interactions, 2,509 match (by gene symbol) the 2,754 interactions of the CCSB-HI1 file released by the CCSB (HI-I-05); the origin of the others is not documented.
+
+Nodes are proteins, and an undirected edge represents an interaction. Self-loops denote proteins that interact with themselves.
+
+The network has the following properties:
+
+- Nodes: `name`, the gene symbol of the protein; `uniprot_human` and `uniprot_mouse`, the UniProt accessions of the human protein and of its mouse orthologue (empty if not available)."""
+tags = ['Biological', 'Protein interactions', 'Unweighted', 'Metadata']
+url = 'https://web.archive.org/web/20180916202441/http://research.mssm.edu/maayan/datasets/qualitative_networks.shtml'
+citation = [('J.-F. Rual et al., "Towards a proteome-scale map of the human protein–protein interaction network." Nature 437(7062), 1173-1178 (2005)', 'https://doi.org/10.1038/nature04209')]
icon_hash = '581760778cf714f319c3e77a'
-upstream_prefix = 'http://konect.cc/files'
-files = [('download.tsv.maayan-vidal.tar.bz2', None, 'konect')]
+upstream_license = None
+# The Ma'ayan Laboratory site is gone; the file is obtained from the Internet
+# Archive.
+upstream_prefix = 'https://web.archive.org/web/20150912005145id_/http://research.mssm.edu:80/maayan/datasets'
+files = [('vidal.sig', None, 'sig')]
def fetch_upstream(force=False):
return fetch_upstream_files(__name__.split(".")[-1], upstream_prefix, files,
force)
+def read_sig(f):
+ """Read a SIG file of the Ma'ayan Laboratory: one interaction per line, with
+ 13 space-separated columns (source name, human and mouse accessions, type
+ and location; the same for the target; effect, interaction type, PubMed
+ IDs), "NA" denoting missing values."""
+ for line in f.read().decode("utf-8").splitlines():
+ line = line.split()
+ if len(line) == 0:
+ continue
+ yield [None if x == "NA" else x for x in line]
+
@cache_network()
@coerce_props()
@annotate()
def parse(alts=None):
global files
name = __name__.split(".")[-1]
- for fnames, alt, fmt in files:
+ for fname, alt, fmt in files:
if alts is not None and alt not in alts:
continue
- if isinstance(fnames, str):
- fnames = [fnames]
- with ExitStack() as stack:
- fs = [stack.enter_context(open_upstream_file(name, fn, "rb")) for fn in fnames]
- g = parse_graph(fs, fmt, directed=True)
+ g = Graph(directed=False)
+ vs = {}
+ acc = defaultdict(lambda: [None, None])
+ edges = []
+ with open_upstream_file(name, fname, "rb") as f:
+ for row in read_sig(f):
+ ends = []
+ for i in (0, 5):
+ v = vs.setdefault(row[i], len(vs))
+ ends.append(v)
+ for j in (0, 1):
+ if row[i + 1 + j] is not None:
+ acc[v][j] = row[i + 1 + j]
+ edges.append(ends)
+ g.add_vertex(len(vs))
+ g.vp.name = g.new_vp("string")
+ g.vp.uniprot_human = g.new_vp("string")
+ g.vp.uniprot_mouse = g.new_vp("string")
+ for k, v in vs.items():
+ g.vp.name[v] = k
+ g.vp.uniprot_human[v] = acc[v][0] or ""
+ g.vp.uniprot_mouse[v] = acc[v][1] or ""
+ g.add_edge_list(edges)
yield alt, g
Update copyright information 73a4f0d
diff --git a/entries/interactome_vidal/__init__.py b/entries/interactome_vidal/__init__.py
index 5a9249e..b5d5f69 100644
--- a/entries/interactome_vidal/__init__.py
+++ b/entries/interactome_vidal/__init__.py
@@ -1,7 +1,7 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright (C) 2020-2024 Tiago de Paula Peixoto <tiago@skewed.de>
+# Copyright (C) 2020-2026 Tiago de Paula Peixoto <tiago@skewed.de>
#
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU Affero General Public License as published by the Free
Update copyright information 3d288ea
diff --git a/entries/interactome_vidal/__init__.py b/entries/interactome_vidal/__init__.py
index 1fc0433..5a9249e 100644
--- a/entries/interactome_vidal/__init__.py
+++ b/entries/interactome_vidal/__init__.py
@@ -1,7 +1,7 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright (C) 2020-2023 Tiago de Paula Peixoto <tiago@skewed.de>
+# Copyright (C) 2020-2024 Tiago de Paula Peixoto <tiago@skewed.de>
#
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU Affero General Public License as published by the Free
Update copyright information 8d005ae
diff --git a/entries/interactome_vidal/__init__.py b/entries/interactome_vidal/__init__.py
index 2606438..1fc0433 100644
--- a/entries/interactome_vidal/__init__.py
+++ b/entries/interactome_vidal/__init__.py
@@ -1,7 +1,7 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright (C) 2021 Tiago de Paula Peixoto <tiago@skewed.de>
+# Copyright (C) 2020-2023 Tiago de Paula Peixoto <tiago@skewed.de>
#
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU Affero General Public License as published by the Free
Update copyright info db2efcc
diff --git a/entries/interactome_vidal/__init__.py b/entries/interactome_vidal/__init__.py
index 3f4edd1..2606438 100644
--- a/entries/interactome_vidal/__init__.py
+++ b/entries/interactome_vidal/__init__.py
@@ -1,7 +1,7 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright (C) 2020 Tiago de Paula Peixoto <tiago@skewed.de>
+# Copyright (C) 2021 Tiago de Paula Peixoto <tiago@skewed.de>
#
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU Affero General Public License as published by the Free
Un-orphan KONECT datasets 894eba5
KONECT has been brought back from the dead for the time being.
diff --git a/entries/interactome_vidal/__init__.py b/entries/interactome_vidal/__init__.py
index 8788353..3f4edd1 100644
--- a/entries/interactome_vidal/__init__.py
+++ b/entries/interactome_vidal/__init__.py
@@ -26,7 +26,6 @@ url = 'http://konect.cc/networks/maayan-vidal'
citation = [('JF. Rual et al. "Towards a proteome-scale map of the human protein–protein interaction network." Nature 437.7062, 1173-1178. (2005).', 'https://doi.org/10.1038/nature04209')]
icon_hash = '581760778cf714f319c3e77a'
upstream_prefix = 'http://konect.cc/files'
-orphan = True
files = [('download.tsv.maayan-vidal.tar.bz2', None, 'konect')]
def fetch_upstream(force=False):
Update citations to use DOIs e878874
diff --git a/entries/interactome_vidal/__init__.py b/entries/interactome_vidal/__init__.py
index 482e5fe..8788353 100644
--- a/entries/interactome_vidal/__init__.py
+++ b/entries/interactome_vidal/__init__.py
@@ -23,7 +23,7 @@ description = """A network of human proteins and their binding interactions. Nod
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Biological', 'Protein interactions', 'Unweighted']
url = 'http://konect.cc/networks/maayan-vidal'
-citation = [('JF. Rual et al. "Towards a proteome-scale map of the human protein–protein interaction network." Nature 437.7062, 1173-1178. (2005).', 'http://www.nature.com/nature/journal/v437/n7062/abs/nature04209.html')]
+citation = [('JF. Rual et al. "Towards a proteome-scale map of the human protein–protein interaction network." Nature 437.7062, 1173-1178. (2005).', 'https://doi.org/10.1038/nature04209')]
icon_hash = '581760778cf714f319c3e77a'
upstream_prefix = 'http://konect.cc/files'
orphan = True
Add support for 'orphan' datasets and tag konect entries e330b80
diff --git a/entries/interactome_vidal/__init__.py b/entries/interactome_vidal/__init__.py
index 2158160..482e5fe 100644
--- a/entries/interactome_vidal/__init__.py
+++ b/entries/interactome_vidal/__init__.py
@@ -26,6 +26,7 @@ url = 'http://konect.cc/networks/maayan-vidal'
citation = [('JF. Rual et al. "Towards a proteome-scale map of the human protein–protein interaction network." Nature 437.7062, 1173-1178. (2005).', 'http://www.nature.com/nature/journal/v437/n7062/abs/nature04209.html')]
icon_hash = '581760778cf714f319c3e77a'
upstream_prefix = 'http://konect.cc/files'
+orphan = True
files = [('download.tsv.maayan-vidal.tar.bz2', None, 'konect')]
def fetch_upstream(force=False):
Change license from GPLv3 to AGPLv3 d754be5
diff --git a/entries/interactome_vidal/__init__.py b/entries/interactome_vidal/__init__.py
index 58d7ccf..2158160 100644
--- a/entries/interactome_vidal/__init__.py
+++ b/entries/interactome_vidal/__init__.py
@@ -3,18 +3,18 @@
#
# Copyright (C) 2020 Tiago de Paula Peixoto <tiago@skewed.de>
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+# details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Affero General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
from .. import *
Add explicit attribution to descriptions obtained from ICON 1645314
diff --git a/entries/interactome_vidal/__init__.py b/entries/interactome_vidal/__init__.py
index 369dbc3..58d7ccf 100644
--- a/entries/interactome_vidal/__init__.py
+++ b/entries/interactome_vidal/__init__.py
@@ -19,7 +19,8 @@
from .. import *
title = "Vidal human interactome (2005)"
-description = "A network of human proteins and their binding interactions. Nodes represent proteins and an edge represents a binding interaction between two proteins, as tested using a high-throughput yeast two-hybrid (Y2H) system."
+description = """A network of human proteins and their binding interactions. Nodes represent proteins and an edge represents a binding interaction between two proteins, as tested using a high-throughput yeast two-hybrid (Y2H) system.[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Biological', 'Protein interactions', 'Unweighted']
url = 'http://konect.cc/networks/maayan-vidal'
citation = [('JF. Rual et al. "Towards a proteome-scale map of the human protein–protein interaction network." Nature 437.7062, 1173-1178. (2005).', 'http://www.nature.com/nature/journal/v437/n7062/abs/nature04209.html')]
Initial commit cc85872
diff --git a/entries/interactome_vidal/__init__.py b/entries/interactome_vidal/__init__.py
new file mode 100644
index 0000000..369dbc3
--- /dev/null
+++ b/entries/interactome_vidal/__init__.py
@@ -0,0 +1,48 @@
+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2020 Tiago de Paula Peixoto <tiago@skewed.de>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from .. import *
+
+title = "Vidal human interactome (2005)"
+description = "A network of human proteins and their binding interactions. Nodes represent proteins and an edge represents a binding interaction between two proteins, as tested using a high-throughput yeast two-hybrid (Y2H) system."
+tags = ['Biological', 'Protein interactions', 'Unweighted']
+url = 'http://konect.cc/networks/maayan-vidal'
+citation = [('JF. Rual et al. "Towards a proteome-scale map of the human protein–protein interaction network." Nature 437.7062, 1173-1178. (2005).', 'http://www.nature.com/nature/journal/v437/n7062/abs/nature04209.html')]
+icon_hash = '581760778cf714f319c3e77a'
+upstream_prefix = 'http://konect.cc/files'
+files = [('download.tsv.maayan-vidal.tar.bz2', None, 'konect')]
+
+def fetch_upstream(force=False):
+ return fetch_upstream_files(__name__.split(".")[-1], upstream_prefix, files,
+ force)
+
+@cache_network()
+@coerce_props()
+@annotate()
+def parse(alts=None):
+ global files
+ name = __name__.split(".")[-1]
+ for fnames, alt, fmt in files:
+ if alts is not None and alt not in alts:
+ continue
+ if isinstance(fnames, str):
+ fnames = [fnames]
+ with ExitStack() as stack:
+ fs = [stack.enter_context(open_upstream_file(name, fn, "rb")) for fn in fnames]
+ g = parse_graph(fs, fmt, directed=True)
+ yield alt, g