History of marvel_partnerships
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] 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/marvel_partnerships/__init__.py b/entries/marvel_partnerships/__init__.py
index ef951c9..094f5df 100644
--- a/entries/marvel_partnerships/__init__.py
+++ b/entries/marvel_partnerships/__init__.py
@@ -31,7 +31,7 @@ The network has the following properties:
tags = ['Social', 'Fictional', 'Unweighted']
url = 'http://ix.io/1omF'
citation = [('"Ulf Aslak (@ulfaslak) Tweet", Twitter (2018)', 'https://twitter.com/ulfaslak/status/1048126665338101760')]
-icon_hash = '5bcb8ae2197c3f8a02723137'
+date_added = '2020-08-11'
upstream_license = None
upstream_prefix = 'http://ix.io'
files = [('1omF', None, None)]
[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/marvel_partnerships/__init__.py b/entries/marvel_partnerships/__init__.py
index f33e04e..ef951c9 100644
--- a/entries/marvel_partnerships/__init__.py
+++ b/entries/marvel_partnerships/__init__.py
@@ -25,9 +25,9 @@ description = """Network of partnerships among characters of the Marvel comic bo
The network has the following properties:
-- `id`: the title of the character's Wikipedia article (as in "Venom (Marvel Comics character)").
-- `group`: the type of character, with 0 = hero and 1 = villain. The value 2 is used for 35 characters that have been both, such as Magneto, Rogue or Sabretooth; its meaning is not documented in the source.
-- `size`: the number of partners of the character in the source data (equal to its degree)."""
+- (Node) `id`: the title of the character's Wikipedia article (as in "Venom (Marvel Comics character)").
+- (Node) `group`: the type of character, with 0 = hero and 1 = villain. The value 2 is used for 35 characters that have been both, such as Magneto, Rogue or Sabretooth; its meaning is not documented in the source.
+- (Node) `size`: the number of partners of the character in the source data (equal to its degree)."""
tags = ['Social', 'Fictional', 'Unweighted']
url = 'http://ix.io/1omF'
citation = [('"Ulf Aslak (@ulfaslak) Tweet", Twitter (2018)', 'https://twitter.com/ulfaslak/status/1048126665338101760')]
[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/marvel_partnerships/__init__.py b/entries/marvel_partnerships/__init__.py
index fcff19b..f33e04e 100644
--- a/entries/marvel_partnerships/__init__.py
+++ b/entries/marvel_partnerships/__init__.py
@@ -44,7 +44,6 @@ def fetch_upstream(force=False):
@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:
@@ -67,5 +66,5 @@ def parse(alts=None):
for edge in d["links"]:
u = vs[edge["source"]]
v = vs[edge["target"]]
- e = g.add_edge(u, v)
+ g.add_edge(u, v)
yield alt, g
[entries] Fix parse bugs and improve the metadata of existing entries c996a0e
From a review of the dataset descriptions against the upstream sources and papers, and from user reports: - parse fixes (wrong edge direction or directedness, shifted or misnamed properties, merged node identities, duplicated or missing edges and nodes, wrong types), e.g. arxiv_citation (the HepTh dates were a copy of the HepPh ones; now from the KDD Cup 2003 data), eu_procurements, foursquare_global, hiv_transmission, genetic_multiplex, gnutella (adds the 05 snapshot), roadnet, macaque_neural, python_dependency - descriptions rewritten from the upstream sources, documenting every property - corrected titles, citations and DOIs, licences (ustream_license typo, the data's own terms), tags and ICON ids - url lists for entries with several sources or dataset pages - SocioPatterns entries moved to the site's new data location, with the daily networks of sp_infectious and sp_primary_school - the Michael Fire entries marked as orphans (served from the mirror) - redundant type forcings removed after the graph-tool coercion fixes
diff --git a/entries/marvel_partnerships/__init__.py b/entries/marvel_partnerships/__init__.py
index 51af13b..fcff19b 100644
--- a/entries/marvel_partnerships/__init__.py
+++ b/entries/marvel_partnerships/__init__.py
@@ -21,13 +21,18 @@ from .. import *
import json
title = "Marvel character partnerships (2018)"
-description = """A network of partnerships among characters in the Marvel comic book universe. Nodes are either heroes or villains, and edges represent partnerships between such characters. The partnership network was extracted from Wikipedia pages of these characters, which indicate partnership relations with other such pages.[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
+description = """Network of partnerships among characters of the Marvel comic book universe, compiled by Ulf Aslak in 2018 and shared as a JSON file accompanying a network visualization posted on Twitter. Nodes are heroes and villains, identified by the titles of their English Wikipedia articles, and an undirected edge connects two characters if the Wikipedia page of one lists the other as a partner. Only characters with at least one partnership are included. Further details of the extraction are not documented.
+
+The network has the following properties:
+
+- `id`: the title of the character's Wikipedia article (as in "Venom (Marvel Comics character)").
+- `group`: the type of character, with 0 = hero and 1 = villain. The value 2 is used for 35 characters that have been both, such as Magneto, Rogue or Sabretooth; its meaning is not documented in the source.
+- `size`: the number of partners of the character in the source data (equal to its degree)."""
tags = ['Social', 'Fictional', 'Unweighted']
url = 'http://ix.io/1omF'
citation = [('"Ulf Aslak (@ulfaslak) Tweet", Twitter (2018)', 'https://twitter.com/ulfaslak/status/1048126665338101760')]
icon_hash = '5bcb8ae2197c3f8a02723137'
-ustream_license = None
+upstream_license = None
upstream_prefix = 'http://ix.io'
files = [('1omF', None, None)]
Update copyright information 73a4f0d
diff --git a/entries/marvel_partnerships/__init__.py b/entries/marvel_partnerships/__init__.py
index e15b2df..51af13b 100644
--- a/entries/marvel_partnerships/__init__.py
+++ b/entries/marvel_partnerships/__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/marvel_partnerships/__init__.py b/entries/marvel_partnerships/__init__.py
index 74a3bf1..e15b2df 100644
--- a/entries/marvel_partnerships/__init__.py
+++ b/entries/marvel_partnerships/__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/marvel_partnerships/__init__.py b/entries/marvel_partnerships/__init__.py
index 4f264ba..74a3bf1 100644
--- a/entries/marvel_partnerships/__init__.py
+++ b/entries/marvel_partnerships/__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/marvel_partnerships/__init__.py b/entries/marvel_partnerships/__init__.py
index de44a71..4f264ba 100644
--- a/entries/marvel_partnerships/__init__.py
+++ b/entries/marvel_partnerships/__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
Update citations to use DOIs e878874
diff --git a/entries/marvel_partnerships/__init__.py b/entries/marvel_partnerships/__init__.py
index 1e16f9e..de44a71 100644
--- a/entries/marvel_partnerships/__init__.py
+++ b/entries/marvel_partnerships/__init__.py
@@ -25,7 +25,7 @@ description = """A network of partnerships among characters in the Marvel comic
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Fictional', 'Unweighted']
url = 'http://ix.io/1omF'
-citation = [('Ulf Aslak (@ulfaslak) Tweet, Twitter (2018)', 'https://twitter.com/ulfaslak/status/1048126665338101760')]
+citation = [('"Ulf Aslak (@ulfaslak) Tweet", Twitter (2018)', 'https://twitter.com/ulfaslak/status/1048126665338101760')]
icon_hash = '5bcb8ae2197c3f8a02723137'
ustream_license = None
upstream_prefix = 'http://ix.io'
Change license from GPLv3 to AGPLv3 d754be5
diff --git a/entries/marvel_partnerships/__init__.py b/entries/marvel_partnerships/__init__.py
index 49c1cf2..1e16f9e 100644
--- a/entries/marvel_partnerships/__init__.py
+++ b/entries/marvel_partnerships/__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/marvel_partnerships/__init__.py b/entries/marvel_partnerships/__init__.py
index fcaf9db..49c1cf2 100644
--- a/entries/marvel_partnerships/__init__.py
+++ b/entries/marvel_partnerships/__init__.py
@@ -21,7 +21,8 @@ from .. import *
import json
title = "Marvel character partnerships (2018)"
-description = "A network of partnerships among characters in the Marvel comic book universe. Nodes are either heroes or villains, and edges represent partnerships between such characters. The partnership network was extracted from Wikipedia pages of these characters, which indicate partnership relations with other such pages."
+description = """A network of partnerships among characters in the Marvel comic book universe. Nodes are either heroes or villains, and edges represent partnerships between such characters. The partnership network was extracted from Wikipedia pages of these characters, which indicate partnership relations with other such pages.[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Fictional', 'Unweighted']
url = 'http://ix.io/1omF'
citation = [('Ulf Aslak (@ulfaslak) Tweet, Twitter (2018)', 'https://twitter.com/ulfaslak/status/1048126665338101760')]
Initial commit cc85872
diff --git a/entries/marvel_partnerships/__init__.py b/entries/marvel_partnerships/__init__.py
new file mode 100644
index 0000000..fcaf9db
--- /dev/null
+++ b/entries/marvel_partnerships/__init__.py
@@ -0,0 +1,65 @@
+#! /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 *
+
+import json
+
+title = "Marvel character partnerships (2018)"
+description = "A network of partnerships among characters in the Marvel comic book universe. Nodes are either heroes or villains, and edges represent partnerships between such characters. The partnership network was extracted from Wikipedia pages of these characters, which indicate partnership relations with other such pages."
+tags = ['Social', 'Fictional', 'Unweighted']
+url = 'http://ix.io/1omF'
+citation = [('Ulf Aslak (@ulfaslak) Tweet, Twitter (2018)', 'https://twitter.com/ulfaslak/status/1048126665338101760')]
+icon_hash = '5bcb8ae2197c3f8a02723137'
+ustream_license = None
+upstream_prefix = 'http://ix.io'
+files = [('1omF', None, None)]
+
+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, "r")) for fn in fnames]
+ g = Graph(directed=False)
+ d = json.load(fs[0])
+ g.vp.id = g.new_vp("string")
+ g.vp.group = g.new_vp("int")
+ g.vp.size = g.new_vp("int")
+ for node in d["nodes"]:
+ v = g.add_vertex()
+ g.vp.id[v] = node["id"]
+ g.vp.group[v] = node["group"]
+ g.vp.size[v] = node["size"]
+ vs = {g.vp.id[v] : v for v in g.vertices()}
+ for edge in d["links"]:
+ u = vs[edge["source"]]
+ v = vs[edge["target"]]
+ e = g.add_edge(u, v)
+ yield alt, g