Solved conflict

.gitignore

@@ -272,3 +272,9 @@ tags
 
 
 # End of https://www.gitignore.io/api/macos,python,R,linux,vim,emacs
+
+
+
+# Pipfiles
+Pipfile
+Pipfile.lock

.renku/workflow/d508c7c5f5914d498e5ad4c660d799b9_python.cwl

+arguments: []
+baseCommand:
+- python
+class: CommandLineTool
+cwlVersion: v1.0
+hints: []
+inputs:
+  input_1:
+    default:
+      class: File
+      path: ../../src/python/extractMPs.py
+    inputBinding:
+      position: 1
+      separate: true
+      shellQuote: true
+    streamable: false
+    type: File
+  input_2:
+    default:
+      class: File
+      path: ../../data/politicians/Ratsmitglieder_1848_DE_corr.xlsx
+    inputBinding:
+      position: 2
+      separate: true
+      shellQuote: true
+    streamable: false
+    type: File
+  input_3:
+    default: data/politicians/MPs_after1890.csv
+    inputBinding:
+      position: 3
+      separate: true
+      shellQuote: true
+    streamable: false
+    type: string
+  input_4:
+    default:
+      class: Directory
+      listing: []
+      path: ../../data/politicians/lastnames
+    inputBinding:
+      position: 4
+      separate: true
+      shellQuote: true
+    streamable: false
+    type: Directory
+outputs:
+  output_0:
+    outputBinding:
+      glob: data/politicians/lastnames/1941_lastnames.pickle
+    streamable: false
+    type: File
+  output_1:
+    outputBinding:
+      glob: data/politicians/lastnames/1910_lastnames.pickle
+    streamable: false
+    type: File
+  output_10:
+    outputBinding:
+      glob: data/politicians/lastnames/1917_lastnames.pickle
+    streamable: false
+    type: File
+  output_100:
+    outputBinding:
+      glob: data/politicians/lastnames/1930_lastnames.pickle
+    streamable: false
+    type: File
+  output_101:
+    outputBinding:
+      glob: data/politicians/lastnames/1970_lastnames.pickle
+    streamable: false
+    type: File
+  output_102:
+    outputBinding:
+      glob: data/politicians/lastnames/1932_lastnames.pickle
+    streamable: false
+    type: File
+  output_103:
+    outputBinding:
+      glob: data/politicians/lastnames/1946_lastnames.pickle
+    streamable: false
+    type: File
+  output_104:
+    outputBinding:
+      glob: data/politicians/lastnames/1948_lastnames.pickle
+    streamable: false
+    type: File
+  output_105:
+    outputBinding:
+      glob: data/politicians/lastnames/1977_lastnames.pickle
+    streamable: false
+    type: File
+  output_106:
+    outputBinding:
+      glob: data/politicians/lastnames/1933_lastnames.pickle
+    streamable: false
+    type: File
+  output_107:
+    outputBinding:
+      glob: data/politicians/lastnames/1991_lastnames.pickle
+    streamable: false
+    type: File
+  output_108:
+    outputBinding:
+      glob: data/politicians/lastnames/2005_lastnames.pickle
+    streamable: false
+    type: File
+  output_109:
+    outputBinding:
+      glob: data/politicians/lastnames/1903_lastnames.pickle
+    streamable: false
+    type: File
+  output_11:
+    outputBinding:
+      glob: data/politicians/lastnames/2004_lastnames.pickle
+    streamable: false
+    type: File
+  output_110:
+    outputBinding:
+      glob: data/politicians/lastnames/1913_lastnames.pickle
+    streamable: false
+    type: File
+  output_111:
+    outputBinding:
+      glob: data/politicians/lastnames/1937_lastnames.pickle
+    streamable: false
+    type: File
+  output_112:
+    outputBinding:
+      glob: data/politicians/lastnames/1947_lastnames.pickle
+    streamable: false
+    type: File
+  output_113:
+    outputBinding:
+      glob: data/politicians/lastnames/1934_lastnames.pickle
+    streamable: false
+    type: File
+  output_114:
+    outputBinding:
+      glob: data/politicians/lastnames/1990_lastnames.pickle
+    streamable: false
+    type: File
+  output_115:
+    outputBinding:
+      glob: data/politicians/lastnames/1954_lastnames.pickle
+    streamable: false
+    type: File
+  output_116:
+    outputBinding:
+      glob: data/politicians/lastnames/1996_lastnames.pickle
+    streamable: false
+    type: File
+  output_117:
+    outputBinding:
+      glob: data/politicians/lastnames/1984_lastnames.pickle
+    streamable: false
+    type: File
+  output_118:
+    outputBinding:
+      glob: data/politicians/lastnames/1976_lastnames.pickle
+    streamable: false
+    type: File
+  output_119:
+    outputBinding:
+      glob: data/politicians/lastnames/1979_lastnames.pickle
+    streamable: false
+    type: File
+  output_12:
+    outputBinding:
+      glob: data/politicians/lastnames/1960_lastnames.pickle
+    streamable: false
+    type: File
+  output_120:
+    outputBinding:
+      glob: data/politicians/lastnames/1982_lastnames.pickle
+    streamable: false
+    type: File
+  output_121:
+    outputBinding:
+      glob: data/politicians/lastnames/1921_lastnames.pickle
+    streamable: false
+    type: File
+  output_122:
+    outputBinding:
+      glob: data/politicians/lastnames/1967_lastnames.pickle
+    streamable: false
+    type: File
+  output_123:
+    outputBinding:
+      glob: data/politicians/lastnames/1892_lastnames.pickle
+    streamable: false
+    type: File
+  output_124:
+    outputBinding:
+      glob: data/politicians/lastnames/1945_lastnames.pickle
+    streamable: false
+    type: File
+  output_125:
+    outputBinding:
+      glob: data/politicians/lastnames/1985_lastnames.pickle
+    streamable: false
+    type: File
+  output_126:
+    outputBinding:
+      glob: data/politicians/lastnames/1949_lastnames.pickle
+    streamable: false
+    type: File
+  output_13:
+    outputBinding:
+      glob: data/politicians/lastnames/1922_lastnames.pickle
+    streamable: false
+    type: File
+  output_14:
+    outputBinding:
+      glob: data/politicians/lastnames/2009_lastnames.pickle
+    streamable: false
+    type: File
+  output_15:
+    outputBinding:
+      glob: data/politicians/lastnames/1999_lastnames.pickle
+    streamable: false
+    type: File
+  output_16:
+    outputBinding:
+      glob: data/politicians/lastnames/1900_lastnames.pickle
+    streamable: false
+    type: File
+  output_17:
+    outputBinding:
+      glob: data/politicians/lastnames/1895_lastnames.pickle
+    streamable: false
+    type: File
+  output_18:
+    outputBinding:
+      glob: data/politicians/lastnames/2007_lastnames.pickle
+    streamable: false
+    type: File
+  output_19:
+    outputBinding:
+      glob: data/politicians/lastnames/2000_lastnames.pickle
+    streamable: false
+    type: File
+  output_2:
+    outputBinding:
+      glob: data/politicians/lastnames/2006_lastnames.pickle
+    streamable: false
+    type: File
+  output_20:
+    outputBinding:
+      glob: data/politicians/lastnames/1962_lastnames.pickle
+    streamable: false
+    type: File
+  output_21:
+    outputBinding:
+      glob: data/politicians/lastnames/1925_lastnames.pickle
+    streamable: false
+    type: File
+  output_22:
+    outputBinding:
+      glob: data/politicians/lastnames/2016_lastnames.pickle
+    streamable: false
+    type: File
+  output_23:
+    outputBinding:
+      glob: data/politicians/lastnames/1955_lastnames.pickle
+    streamable: false
+    type: File
+  output_24:
+    outputBinding:
+      glob: data/politicians/lastnames/2012_lastnames.pickle
+    streamable: false
+    type: File
+  output_25:
+    outputBinding:
+      glob: data/politicians/lastnames/1939_lastnames.pickle
+    streamable: false
+    type: File
+  output_26:
+    outputBinding:
+      glob: data/politicians/lastnames/1901_lastnames.pickle
+    streamable: false
+    type: File
+  output_27:
+    outputBinding:
+      glob: data/politicians/lastnames/1989_lastnames.pickle
+    streamable: false
+    type: File
+  output_28:
+    outputBinding:
+      glob: data/politicians/lastnames/1986_lastnames.pickle
+    streamable: false
+    type: File
+  output_29:
+    outputBinding:
+      glob: data/politicians/lastnames/1951_lastnames.pickle
+    streamable: false
+    type: File
+  output_3:
+    outputBinding:
+      glob: data/politicians/lastnames/1938_lastnames.pickle
+    streamable: false
+    type: File
+  output_30:
+    outputBinding:
+      glob: data/politicians/lastnames/1904_lastnames.pickle
+    streamable: false
+    type: File
+  output_31:
+    outputBinding:
+      glob: data/politicians/lastnames/1980_lastnames.pickle
+    streamable: false
+    type: File
+  output_32:
+    outputBinding:
+      glob: data/politicians/lastnames/1908_lastnames.pickle
+    streamable: false
+    type: File
+  output_33:
+    outputBinding:
+      glob: data/politicians/lastnames/1924_lastnames.pickle
+    streamable: false
+    type: File
+  output_34:
+    outputBinding:
+      glob: data/politicians/lastnames/1944_lastnames.pickle
+    streamable: false
+    type: File
+  output_35:
+    outputBinding:
+      glob: data/politicians/lastnames/1993_lastnames.pickle
+    streamable: false
+    type: File
+  output_36:
+    outputBinding:
+      glob: data/politicians/lastnames/2015_lastnames.pickle
+    streamable: false
+    type: File
+  output_37:
+    outputBinding:
+      glob: data/politicians/lastnames/2014_lastnames.pickle
+    streamable: false
+    type: File
+  output_38:
+    outputBinding:
+      glob: data/politicians/lastnames/1923_lastnames.pickle
+    streamable: false
+    type: File
+  output_39:
+    outputBinding:
+      glob: data/politicians/lastnames/1992_lastnames.pickle
+    streamable: false
+    type: File
+  output_4:
+    outputBinding:
+      glob: data/politicians/lastnames/1942_lastnames.pickle
+    streamable: false
+    type: File
+  output_40:
+    outputBinding:
+      glob: data/politicians/lastnames/1919_lastnames.pickle
+    streamable: false
+    type: File
+  output_41:
+    outputBinding:
+      glob: data/politicians/lastnames/1914_lastnames.pickle
+    streamable: false
+    type: File
+  output_42:
+    outputBinding:
+      glob: data/politicians/lastnames/1987_lastnames.pickle
+    streamable: false
+    type: File
+  output_43:
+    outputBinding:
+      glob: data/politicians/lastnames/1929_lastnames.pickle
+    streamable: false
+    type: File
+  output_44:
+    outputBinding:
+      glob: data/politicians/lastnames/1988_lastnames.pickle
+    streamable: false
+    type: File
+  output_45:
+    outputBinding:
+      glob: data/politicians/lastnames/1927_lastnames.pickle
+    streamable: false
+    type: File
+  output_46:
+    outputBinding:
+      glob: data/politicians/lastnames/1997_lastnames.pickle
+    streamable: false
+    type: File
+  output_47:
+    outputBinding:
+      glob: data/politicians/lastnames/2001_lastnames.pickle
+    streamable: false
+    type: File
+  output_48:
+    outputBinding:
+      glob: data/politicians/lastnames/1994_lastnames.pickle
+    streamable: false
+    type: File
+  output_49:
+    outputBinding:
+      glob: data/politicians/lastnames/1916_lastnames.pickle
+    streamable: false
+    type: File
+  output_5:
+    outputBinding:
+      glob: data/politicians/lastnames/1971_lastnames.pickle
+    streamable: false
+    type: File
+  output_50:
+    outputBinding:
+      glob: data/politicians/lastnames/1956_lastnames.pickle
+    streamable: false
+    type: File
+  output_51:
+    outputBinding:
+      glob: data/politicians/lastnames/1899_lastnames.pickle
+    streamable: false
+    type: File
+  output_52:
+    outputBinding:
+      glob: data/politicians/lastnames/1920_lastnames.pickle
+    streamable: false
+    type: File
+  output_53:
+    outputBinding:
+      glob: data/politicians/lastnames/1969_lastnames.pickle
+    streamable: false
+    type: File
+  output_54:
+    outputBinding:
+      glob: data/politicians/lastnames/1936_lastnames.pickle
+    streamable: false
+    type: File
+  output_55:
+    outputBinding:
+      glob: data/politicians/lastnames/1973_lastnames.pickle
+    streamable: false
+    type: File
+  output_56:
+    outputBinding:
+      glob: data/politicians/lastnames/2011_lastnames.pickle
+    streamable: false
+    type: File
+  output_57:
+    outputBinding:
+      glob: data/politicians/lastnames/1906_lastnames.pickle
+    streamable: false
+    type: File
+  output_58:
+    outputBinding:
+      glob: data/politicians/lastnames/1964_lastnames.pickle
+    streamable: false
+    type: File
+  output_59:
+    outputBinding:
+      glob: data/politicians/lastnames/1953_lastnames.pickle
+    streamable: false
+    type: File
+  output_6:
+    outputBinding:
+      glob: data/politicians/lastnames/2003_lastnames.pickle
+    streamable: false
+    type: File
+  output_60:
+    outputBinding:
+      glob: data/politicians/lastnames/1957_lastnames.pickle
+    streamable: false
+    type: File
+  output_61:
+    outputBinding:
+      glob: data/politicians/lastnames/1972_lastnames.pickle
+    streamable: false
+    type: File
+  output_62:
+    outputBinding:
+      glob: data/politicians/lastnames/1909_lastnames.pickle
+    streamable: false
+    type: File
+  output_63:
+    outputBinding:
+      glob: data/politicians/lastnames/1896_lastnames.pickle
+    streamable: false
+    type: File
+  output_64:
+    outputBinding:
+      glob: data/politicians/lastnames/1918_lastnames.pickle
+    streamable: false
+    type: File
+  output_65:
+    outputBinding:
+      glob: data/politicians/lastnames/1963_lastnames.pickle
+    streamable: false
+    type: File
+  output_66:
+    outputBinding:
+      glob: data/politicians/lastnames/1998_lastnames.pickle
+    streamable: false
+    type: File
+  output_67:
+    outputBinding:
+      glob: data/politicians/lastnames/1981_lastnames.pickle
+    streamable: false
+    type: File
+  output_68:
+    outputBinding:
+      glob: data/politicians/lastnames/1968_lastnames.pickle
+    streamable: false
+    type: File
+  output_69:
+    outputBinding:
+      glob: data/politicians/lastnames/2002_lastnames.pickle
+    streamable: false
+    type: File
+  output_7:
+    outputBinding:
+      glob: data/politicians/lastnames/1965_lastnames.pickle
+    streamable: false
+    type: File
+  output_70:
+    outputBinding:
+      glob: data/politicians/lastnames/1966_lastnames.pickle
+    streamable: false
+    type: File
+  output_71:
+    outputBinding:
+      glob: data/politicians/lastnames/1898_lastnames.pickle
+    streamable: false
+    type: File
+  output_72:
+    outputBinding:
+      glob: $(inputs.input_3)
+    streamable: false
+    type: File
+  output_73:
+    outputBinding:
+      glob: data/politicians/lastnames/1897_lastnames.pickle
+    streamable: false
+    type: File
+  output_74:
+    outputBinding:
+      glob: data/politicians/lastnames/1952_lastnames.pickle
+    streamable: false
+    type: File
+  output_75:
+    outputBinding:
+      glob: data/politicians/lastnames/1978_lastnames.pickle
+    streamable: false
+    type: File
+  output_76:
+    outputBinding:
+      glob: data/politicians/lastnames/1907_lastnames.pickle
+    streamable: false
+    type: File
+  output_77:
+    outputBinding:
+      glob: data/politicians/lastnames/1983_lastnames.pickle
+    streamable: false
+    type: File
+  output_78:
+    outputBinding:
+      glob: data/politicians/lastnames/1961_lastnames.pickle
+    streamable: false
+    type: File
+  output_79:
+    outputBinding:
+      glob: data/politicians/lastnames/1950_lastnames.pickle
+    streamable: false
+    type: File
+  output_8:
+    outputBinding:
+      glob: data/politicians/lastnames/1893_lastnames.pickle
+    streamable: false
+    type: File
+  output_80:
+    outputBinding:
+      glob: data/politicians/lastnames/1915_lastnames.pickle
+    streamable: false
+    type: File
+  output_81:
+    outputBinding:
+      glob: data/politicians/lastnames/1935_lastnames.pickle
+    streamable: false
+    type: File
+  output_82:
+    outputBinding:
+      glob: data/politicians/lastnames/1911_lastnames.pickle
+    streamable: false
+    type: File
+  output_83:
+    outputBinding:
+      glob: data/politicians/lastnames/1902_lastnames.pickle
+    streamable: false
+    type: File
+  output_84:
+    outputBinding:
+      glob: data/politicians/lastnames/1931_lastnames.pickle
+    streamable: false
+    type: File
+  output_85:
+    outputBinding:
+      glob: data/politicians/lastnames/1894_lastnames.pickle
+    streamable: false
+    type: File
+  output_86:
+    outputBinding:
+      glob: data/politicians/lastnames/1995_lastnames.pickle
+    streamable: false
+    type: File
+  output_87:
+    outputBinding:
+      glob: data/politicians/lastnames/1891_lastnames.pickle
+    streamable: false
+    type: File
+  output_88:
+    outputBinding:
+      glob: data/politicians/lastnames/1905_lastnames.pickle
+    streamable: false
+    type: File
+  output_89:
+    outputBinding:
+      glob: data/politicians/lastnames/1912_lastnames.pickle
+    streamable: false
+    type: File
+  output_9:
+    outputBinding:
+      glob: data/politicians/lastnames/1974_lastnames.pickle
+    streamable: false
+    type: File
+  output_90:
+    outputBinding:
+      glob: data/politicians/lastnames/2008_lastnames.pickle
+    streamable: false
+    type: File
+  output_91:
+    outputBinding:
+      glob: data/politicians/lastnames/1926_lastnames.pickle
+    streamable: false
+    type: File
+  output_92:
+    outputBinding:
+      glob: data/politicians/lastnames/1928_lastnames.pickle
+    streamable: false
+    type: File
+  output_93:
+    outputBinding:
+      glob: data/politicians/lastnames/1943_lastnames.pickle
+    streamable: false
+    type: File
+  output_94:
+    outputBinding:
+      glob: data/politicians/lastnames/1959_lastnames.pickle
+    streamable: false
+    type: File
+  output_95:
+    outputBinding:
+      glob: data/politicians/lastnames/2013_lastnames.pickle
+    streamable: false
+    type: File
+  output_96:
+    outputBinding:
+      glob: data/politicians/lastnames/1958_lastnames.pickle
+    streamable: false
+    type: File
+  output_97:
+    outputBinding:
+      glob: data/politicians/lastnames/1940_lastnames.pickle
+    streamable: false
+    type: File
+  output_98:
+    outputBinding:
+      glob: data/politicians/lastnames/1975_lastnames.pickle
+    streamable: false
+    type: File
+  output_99:
+    outputBinding:
+      glob: data/politicians/lastnames/2010_lastnames.pickle
+    streamable: false
+    type: File
+permanentFailCodes: []
+requirements:
+- class: InlineJavascriptRequirement
+- class: InitialWorkDirRequirement
+  listing:
+  - entry: '$({"listing": [], "class": "Directory"})'
+    entryname: data/politicians/lastnames
+    writable: true
+successCodes: []
+temporaryFailCodes: []