Merge branch 'master' into addCarriKing

UoMResearchIT · Sep 9, 2024 · efb1c9f · efb1c9f
2 parents b800f18 + 59e7df6
commit efb1c9f
Show file tree

Hide file tree

Showing 3 changed files with 120 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,10 @@
 # About
 This is the RSE Skills Graph web app written in Python 3 with the Flask framework. Original code by Steve Pettifer; mods by Ian Cottam, Colin Morris, Ian Hinder; The University of Manchester; Apache 2 Licence
 
+# How to Use
+
+There is an existing deployment hosted [here](https://rseskillsgraph.itservices.manchester.ac.uk/). You can click on RSEs' names and see their skills, as well as search by skill.
+
 # How to Add / Update
 To add or update a person's entry, modify the JSON entry in `people.json`. People with spaces in their surname should use underscore e.g. Le_Blanc.
 It will be displayed properly with a space. The "interests" for each person need to come from Wikipedia main entries - that is our controlled vocabulary.

diff --git a/people.json b/people.json
@@ -24,8 +24,6 @@
     "Catherine McGuire": {
         "interests": [
             "Python (programming language)",
-            "HTML",
-            "SQL",
             "LaTeX",
             "Machine learning",
             "Natural language processing",
@@ -34,11 +32,24 @@
             "Pandas (software)",
             "Streamlit (software)",
             "Git",
-            "Trello",
-            "Project management",
+            "GitHub",
             "Agile software development",
-            "Business analysis"
-        ]
+            "Trello",
+            "R (programming language)", 
+            "Shiny (software)",
+            "Artifical Intelligence",
+            "Data Science",
+            "Data analysis",
+            "Data visualization",
+            "Jupyter Notebook",
+            "Astrophysics",
+            "Django",
+            "Wagtail (CMS)",
+            "Bootstrap (front-end framework)",
+            "Microsoft Windows",
+            "Windows Subsystem for Linux",
+            "Bash (Unix shell)"
+          ]
     },
   "Carri King": {
         "interests":[
@@ -798,26 +809,32 @@
 
     "Scott Archer-Nicholls": {
         "interests":[
-            "Atmospheric chemistry",
-            "Climate model",
-	          "Chemical transport model",
-            "Weather Research and Forecasting Model",
-	          "Unified Model",
-	          "Climate Change",
-	          "Air Quality",
-            "Data wrangling",
-            "Data analysis",
-            "Data science",
-            "High-performance computing",
-            "Fortran",
             "Python (programming language)",
+            "Fortran",
             "LaTeX",
             "R (programming language)",
+            "JavaScript",
+            "HTML",
             "Bash (Unix shell)",
             "Git",
             "Apache Subversion",
             "macOS",
-            "Linux"
+            "Linux",
+            "Data wrangling",
+            "Data analysis",
+            "Data science",
+            "High-performance computing",
+            "Project management",
+            "Agile software development",
+            "The Carpentries",
+            "Atmospheric chemistry",
+            "Climate model",
+            "Chemical transport model",
+            "Weather Research and Forecasting Model",
+            "Unified Model",
+            "Climate Change",
+            "Air Quality",
+            "Geographic information system"
         ]
     },
 
@@ -942,6 +959,29 @@
         ]
     },
 
+    "Chris Lam": {
+        "interests":[
+            "C (programming language)",
+            "C Sharp (programming language)",
+            "C++ (programming language)",
+            "R (programming language)",
+            "Python (programming language)",
+            "JavaScript",
+            "Bash (Unix shell)",
+            "Powershell",
+            "LaTeX",
+            "Git",
+            "GitHub",
+            "GitHub Actions",
+            "Vue.js",
+            "PostgreSQL",
+            "SQLite",
+            "Win32",
+            "WxWidgets",
+            "Pandas (software)"
+        ]
+    },
+
     "Erdem Atbas": {
         "interests":[
             "Embedded system",
@@ -1141,5 +1181,59 @@
             "Visual Studio",
             "Xamarin.Forms"
         ]
+    },
+
+    "Sarah Jaffa": {
+        "interests":[
+            "Agile software development",
+            "Bash (Unix shell)",
+            "Git",
+            "GitHub",
+	    "Docker",
+            "Instructor-led training",
+            "Python (programming language)",
+	    "C++",
+            "Software Testing",
+            "Jira",
+            "Linux",
+	    "High-performance computing",
+            "The Carpentries",
+	    "LaTeX",
+            "Version Control",
+            "HPC",
+            "Parallel computing",
+	    "Monte Carlo methods",
+            "Data science",
+	    "Astrophysics",
+	    "Smoothed-particle hydrodynamics",
+	    "Digital image processing"
+        ]
+    },
+
+    "Benito Matischen": {
+        "interests":[
+            "Django (web framework)",
+            "Python (programming language)",
+            "Wagtail (CMS)",
+            "Linux",
+            "Windows Subsystem for Linux",
+            "PostgreSQL",
+            "JavaScript",
+            "TypeScript",
+            "CSS",
+            "HTML",
+            "JQuery",
+            "Express.js",
+            "Git",
+            "Pandas (software)",
+            "Chart.js",
+            "LaTeX",
+            "Visual Studio Code",
+            "C Sharp (programming language)",
+            "Visual Studio",
+            "JSON",
+            "Android SDK",
+            "Xamarin.Forms"
+        ]
     }
 }
diff --git a/requirements.txt b/requirements.txt
@@ -1,12 +1,12 @@
 Click==8.1.3
 Flask==2.3.3
 itsdangerous==2.1.2
-Jinja2==3.1.3
+Jinja2==3.1.4
 lxml==4.9.1
 MarkupSafe==2.1.1
 natsort==6.0.0
 pygraphviz==1.5
 pyparsing==2.4.0
 pytest==7.4.2
-urllib3==1.26.18
-Werkzeug==3.0.1
+urllib3==1.26.19
+Werkzeug==3.0.3