feature/nl-net-injestion-injestor-update #10

Open
ijohn wants to merge 9 commits from feature/nl-net-injestion-injestor-update into main
Collaborator
No description provided.
feat(scripts): initial commit ingestor
Some checks failed
ci/woodpecker/pr/woodpecker Pipeline was successful
ci/woodpecker/push/woodpecker Pipeline failed
1d11f24375
ci: make repo reuse compliant
Some checks failed
ci/woodpecker/pr/woodpecker Pipeline was successful
ci/woodpecker/push/woodpecker Pipeline failed
a6569922d6
Feature: Add first draft of mapping script
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
e562117647
Feature: First draft of hex parsing
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
d745a7f514
# Conflicts:
#	scripts/ingest.py
Chore: Update the branch with changes on main
Some checks failed
ci/woodpecker/pr/woodpecker Pipeline failed
ba68fe9aca
puer-robustus left a comment

Hi @ijohn

Thanks for consolidating things into one PR.

Some comments:

  1. As pointed out in some comments, some of the changes in data/projects are materially wrong.
  2. For the grantid2project.py script, I'm not sure that looking for regex patterns is the most understandable way to parse the hex HTML. Why did you choose this route instead of HTML parsing via e.g. BeautifulSoup?
  3. In the changes to scripts/ingest.py I think we should use a different approach: The Hex parsing can (maybe?) help us maintain the PROJECT2GRANTS mapping, but the hex parsing results should never be used directly to generate the project jsons.
Hi @ijohn Thanks for consolidating things into one PR. Some comments: 1. As pointed out in some comments, some of the changes in `data/projects` are materially wrong. 2. For the `grantid2project.py` script, I'm not sure that looking for regex patterns is the most understandable way to parse the hex HTML. Why did you choose this route instead of HTML parsing via e.g. BeautifulSoup? 3. In the changes to `scripts/ingest.py` I think we should use a different approach: The Hex parsing can (maybe?) help us maintain the PROJECT2GRANTS mapping, but the hex parsing results should never be used directly to generate the project jsons.
@ -0,0 +1,3 @@
# SPDX-FileContributor: Alex <alex@isoc.ch>

This file is not needed anymore. I placed it there, before the data/projects dir contained files.

This file is not needed anymore. I placed it there, before the `data/projects` dir contained files.
@ -0,0 +1,13 @@
{

Something is wrong here. Arcan-A12 is one project with multiple grants. Your import splits this up again.

Something is wrong here. Arcan-A12 is one project with multiple grants. Your import splits this up again.
@ -13,0 +16,4 @@
"https://nlnet.nl/project/Cuirass",
"https://nlnet.nl/project/GUIX-securitytracking",
"https://nlnet.nl/project/Guix-Riscv64",
"https://nlnet.nl/project/GuixDaemon-Guile",

How do the unrelated Guix projects belong to "Cuirass"?

How do the unrelated Guix projects belong to "Cuirass"?

And as for the nlnet-mapping dir, I cannot really give feedback there as I don't know JavaScript. But if I understand correctly, this is more for building up a heuristic to map projects to categories? Why did this need to be a JavaScript app?

And as for the nlnet-mapping dir, I cannot really give feedback there as I don't know JavaScript. But if I understand correctly, this is more for building up a heuristic to map projects to categories? Why did this need to be a JavaScript app?
Some checks failed
ci/woodpecker/pr/woodpecker Pipeline failed
Required
Details
This pull request has changes conflicting with the target branch.
  • data/projects/AtomicData.json
  • data/projects/Autocrypt.json
  • data/projects/CryptoLyzer.json
  • data/projects/DataLab.json
  • data/projects/Diesel.json
  • data/projects/Dino.json
  • data/projects/Dokieli.json
  • data/projects/Dream2nix.json
  • data/projects/ERIS.json
  • data/projects/Earthstar.json
  • data/projects/F3D.json
  • data/projects/ForgeFed.json
  • data/projects/Gancio.json
  • data/projects/Garage.json
  • data/projects/Gosling.json
  • data/projects/Himalaya.json
  • data/projects/Hubzilla.json
  • data/projects/Interpeer.json
  • data/projects/IronCalc.json
  • data/projects/Ironclad.json
  • data/projects/JSON-Joy.json
  • data/projects/Kazarma.json
  • data/projects/LibrePCB.json
  • data/projects/LibreQoS.json
  • data/projects/LumoSQL.json
  • data/projects/MaemoLeste.json
  • data/projects/Mastodon.json
  • data/projects/MobileAtlas.json
  • data/projects/Mosaic.json
  • data/projects/Mox.json
  • data/projects/NextGraph.json
  • data/projects/NodeBB.json
  • data/projects/OpenEPT.json
  • data/projects/OpenWebCalendar.json
  • data/projects/Spectrum.json
  • data/projects/Tauri.json
  • data/projects/Topola.json
  • data/projects/UnifiedPush.json
  • data/projects/uMap.json
  • scripts/ingest.py
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feature/nl-net-injestion-injestor-update:feature/nl-net-injestion-injestor-update
git switch feature/nl-net-injestion-injestor-update
Sign in to join this conversation.
No reviewers
No labels
app
data
schema
No milestone
No project
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
ISOC-CH/tech-dossier-project-data!10
No description provided.