diff --git a/.gitignore b/.gitignore index 62891d43cc1aa4575dca328ab81c02c95ce705c4..a0c5a8a6e967d98e398580528c1ae278c31deed9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /0-collect-data/personnal-keys.json /0-collect-data/bso/ +/1-enrich-with-datacite/__pycache__/ /hide \ No newline at end of file diff --git a/0-collect-data/nakala-dois.txt b/0-collect-data/nakala-dois.txt index 62092b1dcb71b9f84b719ce4248f3e6f6b6f62e4..89884b8815c5544fcadc7c75193d24f68e80fe3c 100644 --- a/0-collect-data/nakala-dois.txt +++ b/0-collect-data/nakala-dois.txt @@ -1,8 +1,8 @@ -10.34847/nkl.6caam3dp -10.34847/nkl.76abr599 -10.34847/nkl.a0fe865m 10.34847/nkl.5bcck3cz 10.34847/nkl.ca709965 +10.34847/nkl.a0fe865m +10.34847/nkl.76abr599 +10.34847/nkl.6caam3dp 10.34847/nkl.ca8dmbdh 10.34847/nkl.a5ae8y33 10.34847/nkl.748eqz51 @@ -22,5 +22,5 @@ 10.34847/nkl.3dbc2mtb 10.34847/nkl.bc2b1071 10.34847/nkl.81dcdekj -10.34847/nkl.b1cb3arm -10.34847/nkl.c9e92or4 +10.34847/nkl.ef903o6v +10.34847/nkl.ae94a74k diff --git a/0-collect-data/nakala.py b/0-collect-data/nakala.py index c65aee4a74e4c8ccb4cce97cdbba3b789cf28b48..e2debe6bd3eba95de301bf6c3c42e9a1b38ec445 100644 --- a/0-collect-data/nakala.py +++ b/0-collect-data/nakala.py @@ -68,14 +68,13 @@ def get_dois_n_users(user_id): import json, requests -parent_folder = "0-collect-data" ## list to stock datas nakala_uga_users = [] all_dois = [] other_user_finded = [] ## importer les users depuis le fichier txt -with open(parent_folder + '/nakala-uga-users.txt', 'r') as f: +with open('nakala-uga-users.txt', 'r') as f: ## attention bien stripper quand on import du txt sinon les sauts de ligne sont présents [nakala_uga_users.append( user.strip() ) for user in f.readlines()] @@ -102,11 +101,11 @@ for user in nakala_uga_users : ## ____n____ exporter les DOI au format txt -with open(parent_folder + "/nakala-dois.txt", 'w') as fh : +with open("nakala-dois.txt", 'w') as fh : [fh.write(f"{line}\n") for line in all_dois] ## print les autres utilisateurs trouvés7 -print("\n\n nakala user trouvés ") +print("\n\n nakala new user finded ") for elem in other_user_finded : - print(elem) + print("\t\telem") diff --git a/0-collect-data/zenodo-dois.txt b/0-collect-data/zenodo-dois.txt index 0914c1d76a996b58619227f47e4f0c2b9177eb27..81f3d99321e7e94349094dacc48c34d268047780 100644 --- a/0-collect-data/zenodo-dois.txt +++ b/0-collect-data/zenodo-dois.txt @@ -1,3 +1,5 @@ +10.5281/zenodo.10223402 +10.5281/zenodo.10222606 10.5281/zenodo.10211920 10.5281/zenodo.10204837 10.5281/zenodo.10204743 @@ -101,7 +103,6 @@ 10.5281/zenodo.7865424 10.5281/zenodo.7462516 10.5281/zenodo.7835266 -10.5281/zenodo.7348972 10.5281/zenodo.7667342 10.5281/zenodo.7813697 10.5281/zenodo.7798143 @@ -574,6 +575,7 @@ 10.5281/zenodo.48170 10.5281/zenodo.37476 10.5281/zenodo.20031 +10.5281/zenodo.10210416 10.5281/zenodo.10117556 10.5281/zenodo.10069276 10.5281/zenodo.10055462 diff --git a/0-collect-data/zenodo.py b/0-collect-data/zenodo.py index 4e443151f82adbcb5fa9f58391666778178f53bf..c3435ce0112c1f2fca363b574ae921f7048010df 100644 --- a/0-collect-data/zenodo.py +++ b/0-collect-data/zenodo.py @@ -27,14 +27,16 @@ """ import pandas as pd, requests, json +# import sys +# sys.path.append('0-collect-data') -parent_folder = "0-collect-data" print("\n\nzenodo.py is launched") -## import API key. Recquired to req Zenodo API -with open(parent_folder + "/personnal-keys.json") as f : + +with open("personnal-keys.json") as f : ACCESS_TOKEN = json.load(f)["ZENODO_KEY"] + def req_zenodo(page_nb) : """ retourne les jeux de données UGA depuis Zenodo @@ -105,6 +107,6 @@ while iterate : ## ____z____ exporter la liste de DOI au format txt -with open(parent_folder + "/zenodo-dois.txt", 'w') as f : +with open("zenodo-dois.txt", 'w') as f : [f.write(f"{line}\n") for line in output_dois] diff --git a/README.md b/README.md index 895c5f1c46bfda487c813a51fdb09731ca7050b3..e1b4d2020005658e8c1c0ac926f154dd0a860379 100644 --- a/README.md +++ b/README.md @@ -5,95 +5,3 @@ < br/> < br/> - - ------------- - -## Getting started - -To make it easy for you to get started with GitLab, here's a list of recommended next steps. - -Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)! - -## Add your files - -- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files -- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command: - -``` -cd existing_repo -git remote add origin https://gricad-gitlab.univ-grenoble-alpes.fr/mlarrieu/open-research-data-monitor.git -git branch -M main -git push -uf origin main -``` - -## Integrate with your tools - -- [ ] [Set up project integrations](https://gricad-gitlab.univ-grenoble-alpes.fr/mlarrieu/open-research-data-monitor/-/settings/integrations) - -## Collaborate with your team - -- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/) -- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html) -- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically) -- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/) -- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html) - -## Test and Deploy - -Use the built-in continuous integration in GitLab. - -- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html) -- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/) -- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html) -- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/) -- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html) - -*** - -# Editing this README - -When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template. - -## Suggestions for a good README -Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information. - -## Name -Choose a self-explaining name for your project. - -## Description -Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors. - -## Badges -On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge. - -## Visuals -Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method. - -## Installation -Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection. - -## Usage -Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README. - -## Support -Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc. - -## Roadmap -If you have ideas for releases in the future, it is a good idea to list them in the README. - -## Contributing -State if you are open to contributions and what your requirements are for accepting them. - -For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self. - -You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser. - -## Authors and acknowledgment -Show your appreciation to those who have contributed to the project. - -## License -For open source projects, say how it is licensed. - -## Project status -If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers. diff --git a/run-all-codes.py b/run-all-codes.py index 04fc75ae4ccb73927940fc4306a06a4633337e42..405ca3a5369fc777cadf92e0930d0f6e8ec58045 100644 --- a/run-all-codes.py +++ b/run-all-codes.py @@ -1,30 +1,23 @@ import subprocess -""" -v2 -- revoir gestion de l'arborescence import et export des fichiers (tout passer par des modules ? ) :https://stackoverflow.com/questions/52577047/run-another-python-script-in-different-folder -""" -def execute_python_file(file_path): +def execute_python_file(fila_name): """ - excute a py program from a file_path + excute a py program """ try : - subprocess.run(['python', file_path]) + ## cwd py programs path + subprocess.run(['python', fila_name], cwd= "0-collect-data") except FileNotFoundError: - print(f"Error: The file '{file_path}' does not exist.") + print(f"Error: The file '{fila_name}' does not exist.") - -# file_path = "0-collect-data/nakala.py" - -file_paths = [ - "0-collect-data/zenodo.py", - "0-collect-data/nakala.py", - "0-collect-data/datacite.py", - "0-collect-data/rdg.py" +file_names = [ + "zenodo.py", + "nakala.py", + "datacite.py", + "rdg.py" ] -for file_path in file_paths: - execute_python_file (file_path) +execute_python_file(file_names[1]) \ No newline at end of file