change structure

.gitignore

@@ -153,6 +153,8 @@ dmypy.json
 .vscode/
 
 # under development
+*/pickles*
+*.pickle
 evaluations/
 geo/
 docker/
@@ -188,6 +190,4 @@ sqldb.py
 check*
 json.schema
 *.sh
-
-# other packages
-exfor_dictionary/
+uninstall.txt

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "submodules"]
-	path = submodules
+	path = src/exforparser/submodules
 	url = https://github.com/shinokumura/exparser-submodule.git

MANIFEST.in

@@ -0,0 +1,3 @@
+include src/tabulated/MTall.dat
+include src/tabulated/*.json
+include src/submodules/utilities/*.txt

pyproject.toml

@@ -0,0 +1,51 @@
+[build-system]
+requires = ["setuptools", "setuptools-scm"]
+build-backend = "setuptools.build_meta"
+
+
+[project]
+name = "exforparser"
+authors = [
+    {name = "Shin Okumura/IAEA-NDS", email = "[email protected]"},
+]
+version = "1.0.0b"
+description = "EXFOR Parser"
+readme = "README.md"
+requires-python = ">=3.8"
+keywords = ["EXFOR", "Nuclear Data"]
+license = {file = "LICENSE"}
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Operating System :: OS Independent",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3",
+]
+dynamic = ["dependencies"]
+
+[tool.setuptools.dynamic]
+dependencies = {file = ["requirements.txt"]}
+
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
+
+[tool.setuptools]
+include-package-data = true
+
+
+[tool.setuptools.package-data]
+"exforparser.tabulated" = ["*.dat", "*.json"]
+"submodules.utilities" = ["*.txt"]
+
+
+
+
+[project.urls]
+Homepage = "https://github.com/shinokumura/exforparser"
+
+
+[project.scripts]
+exparser = "exforparser.exparser:main"
+tabulated = "exforparser.tabulated:main"
+test = "exforparser.pa:main"

requirements.txt

@@ -1,8 +1,12 @@
 common==0.1.2
-numpy==1.23.0
+greenlet==2.0.2
+numpy==1.25.2
 pandas==2.0.3
 pyparsing==3.1.1
-setuptools==57.5.0
+python-dateutil==2.8.2
+pytz==2023.3
+git+https://github.com/shinokumura/ripl3_json.git
+six==1.16.0
 SQLAlchemy==2.0.18
-exfor_dictionary @ git+https://github.com/IAEA-NDS/exfor_dictionary@main
-ripl3_json @ git+https://github.com/shinokumura/ripl3_json@main
+typing_extensions==4.7.1
+tzdata==2023.3

setup.py

@@ -1,33 +1,41 @@
-from setuptools import setup, find_packages
+import setuptools
 
+if __name__ == "__main__":
+    setuptools.setup()
 
-def read_requirements(file):
-    with open(file) as f:
-        return f.read().splitlines()
+# from setuptools import setup, find_packages
 
-def read_file(file):
-   with open(file) as f:
-        return f.read()
+# # print(find_packages())
+# # --> return ['tabulated', 'parser', 'sql']
 
-version = read_file("VERSION")
-requirements = read_requirements("requirements.txt")
+# def read_requirements(file):
+#     with open(file) as f:
+#         return f.read().splitlines()
 
-setup(
-    name="exforparser",
-    description="EXFOR Parser",
-    packages=find_packages(exclude=["test"]), 
-    version=version,
-    author="Shin Okumura/IAEA-NDS",
-    author_email="[email protected]",
-    maintainer="IAEA-NDS",
-    maintainer_email="[email protected]",
-    license="GPL-2.0 license",
-    url="https://github.com/[email protected]/exforparser",
-    python_requires=">=3.8",
-    install_requires=requirements,
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "Operating System :: OS Independent",
-        "License :: OSI Approved :: GPL-2.0 license",
-    ],
-)
+# def read_file(file):
+#    with open(file) as f:
+#         return f.read()
+
+# version = read_file("VERSION")
+# requirements = read_requirements("requirements.txt")
+
+# setup(
+#     name="exforparser",
+#     description="EXFOR Parser",
+#     packages=find_packages(exclude=["test"]), 
+#     py_modules=['exparser', 'tabulated'],
+#     version=version,
+#     author="Shin Okumura/IAEA-NDS",
+#     author_email="[email protected]",
+#     maintainer="IAEA-NDS",
+#     maintainer_email="[email protected]",
+#     license="GPL-2.0 license",
+#     url="https://github.com/[email protected]/exforparser",
+#     python_requires=">=3.8",
+#     install_requires=requirements,
+#     classifiers=[
+#         "Programming Language :: Python :: 3",
+#         "Operating System :: OS Independent",
+#         "License :: OSI Approved :: GPL-2.0 license",
+#     ],
+# )