Skip to content

Commit

Permalink
Merge pull request #5 from julia-sprenger/enh/install
Browse files Browse the repository at this point in the history
Improve install, update and authentication handling
  • Loading branch information
shinokumura authored Dec 12, 2024
2 parents 25292a1 + 70ce581 commit c30cb53
Show file tree
Hide file tree
Showing 8 changed files with 181 additions and 193 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@ venv.bak/
*.log
*.pptx

# IDEs
.vscode

# This repository
geo/
invenio.py
Expand Down
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/shinokumura/exfor_dictionary/main?labpath=example/example.ipynb)
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/IAEA-NDS/exfor_dictionary/main?labpath=example/example.ipynb)

## Introduction to the EXFOR dictionary in JSON
You may find many mysterious keywords in EXFOR entries such as:
Expand Down Expand Up @@ -99,9 +99,14 @@ The EXFOR dictionary is updated irregular basis, so if you need to run the updat
python convert_dictionary.py
```

Parsing all information is not yet perfect. Currently, JSON files are produced for some of ```DICTION``` with information that are used in the EXFOR parser.
Note, that currently the IAEA-NDS "Open" Area is password protected. To run the update successfully you will need to provide your credentials as environment variables:

```bash
export OPENAREA_USER=<my_user_name>
export OPENAREA_PWD=<my_user_password>
```

Parsing all information is not yet perfect. Currently, JSON files are produced for some of ```DICTION``` with information that are used in the EXFOR parser.

## Contact
[email protected]
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ name = "exfor_dictionary"
authors = [
{name = "Shin Okumura/IAEA-NDS", email = "[email protected]"},
]
version = "1.0.0b"
description = "JSON converter for the EXFOR dictionary"
readme = "README.md"
requires-python = ">=3.8"
Expand All @@ -20,11 +19,12 @@ classifiers = [
"License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3",
]
dynamic = ["dependencies"]
dynamic = ["dependencies", "version"]


[tool.setuptools.dynamic]
dependencies = {file = ["requirements.txt"]}
version = {file = "VERSION"}


[tool.setuptools.packages.find]
Expand All @@ -40,5 +40,5 @@ include-package-data = true
"exfor_dictionary.pickles" = ["*.pickle"]

[project.urls]
Homepage = "https://github.com/shinokumura/ripl3_json"
Homepage = "https://github.com/IAEA-NDS/exfor_dictionary"

30 changes: 15 additions & 15 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
beautifulsoup4==4.12.2
certifi==2023.7.22
chardet==5.2.0
charset-normalizer==3.2.0
idna==3.4
numpy==1.25.2
pandas==2.0.3
python-dateutil==2.8.2
pytz==2023.3
requests==2.31.0
six==1.16.0
soupsieve==2.4.1
tzdata==2023.3
# urllib3==2.0.4
urllib3==1.26.6
beautifulsoup4>=4.12.2
certifi>=2023.7.22
chardet>=5.2.0
charset-normalizer>=3.2.0
idna>=3.4
numpy>=1.25.2
pandas>=2.0.3
python-dateutil>=2.8.2
pytz>=2023.3
requests>=2.31.0
six>=1.16.0
soupsieve>=2.4.1
tzdata>=2023.3
# urllib3>=2.0.4
urllib3>=1.26.6
Loading

0 comments on commit c30cb53

Please sign in to comment.