Initial version (#1)

Author: scaramallion

.github/workflows/check-pr-release.yml

@@ -0,0 +1,35 @@
+name: check-pull-request
+
+on:
+#  schedule:
+#    - cron: '48 22 * * 0'
+  pull_request:
+    branches: [ master ]
+
+
+jobs:
+
+  check-pr:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.9
+    - name: Download and check source data
+      run: |
+        pip install -e .[dev]
+        mkdir sr/temp
+        python sr/main.py --dev --force-regeneration
+        black sr/*py
+        black sr/tables/*.py
+        git diff --output=gitdiff.txt
+    - name: Upload artifacts
+      if: ${{ success() }}
+      uses: actions/upload-artifact@v2
+      with:
+        name: diff
+        path: gitdiff.txt

.gitignore

@@ -21,36 +21,7 @@
 # Build/dist files
 dist/*
 build/*
-pydicom.egg-info/*
+*.egg-info
 distribute*.egg
 distribute*.tar.gz
-py3source
-.tox/*
-
-# Docs build
-docs/_build/*
-doc/_build/*
-doc/auto_examples/*
-doc/generated/*
-doc/reference/generated/*
-
-# coverage.py files
-.coverage
-
-# PyCharm IDE files
-*.idea*
-
-
-# jupyter notebooks
-*.ipynb
-.ipynb_checkpoints/*
-tests/test_pixel.py
-
-# mypy
-pydicom/.mypy_cache/*
-
-# vscode
-.vscode/*
-
-# virtualenv
-env/
+__pycache__

LICENSE

@@ -1,7 +1,5 @@
 Copyright (c) 2021 pydicom contributors
 
-Except for portions outlined below, pydicom is released under an MIT license:
-
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

mypy.ini

@@ -0,0 +1,13 @@
+[mypy]
+python_version = 3.9
+exclude = sr/(tables|temp)
+files = sr/
+show_error_codes = True
+warn_redundant_casts = True
+warn_unused_ignores = True
+warn_return_any = True
+warn_unreachable = True
+ignore_missing_imports = True
+disallow_untyped_calls = True
+disallow_untyped_defs = True
+disallow_incomplete_defs = True

setup.py

@@ -1,20 +1,35 @@
+from pathlib import Path
 from setuptools import setup, find_packages
 
+
+PROJECT_DIR = Path(__file__).parent.resolve(strict=True)
+
+
+def get_version() -> str:
+    """Return the package version as a str"""
+    VERSION_FILE = PROJECT_DIR / "sr" / "_version.py"
+    _globals = {}
+    with open(VERSION_FILE) as f:
+        exec(f.read(), _globals)
+
+    return _globals["__version__"]
+
+
 setup(
-    name = "pydicom-data-sr",
-    packages = find_packages(),
-    include_package_data = True,
-    version = __version__,
-    zip_safe = False,
-    description = "",
-    long_description = "",
-    long_description_content_type = "text/markdown",
-    author = "scaramallion",
-    author_email = "[email protected]",
-    url = "https://github.com/pydicom/pydicom-sr-data",
-    license = "MIT",
-    keywords = "dicom python pydicom sr structuredreports",
-    classifiers = [
+    name="pydicom-data-sr",
+    packages=find_packages(),
+    include_package_data=True,
+    version=get_version(),
+    zip_safe=False,
+    description="",
+    long_description="",
+    long_description_content_type="text/markdown",
+    author="scaramallion",
+    author_email="[email protected]",
+    url="https://github.com/pydicom/pydicom-sr-data",
+    license="MIT",
+    keywords="dicom python pydicom sr structuredreports",
+    classifiers=[
         "License :: OSI Approved :: MIT License",
         "Intended Audience :: Developers",
         "Intended Audience :: Healthcare Industry",
@@ -29,10 +44,19 @@
         "Topic :: Scientific/Engineering :: Medical Science Apps.",
         "Topic :: Software Development :: Libraries",
     ],
-    python_requires = ">=3.6",
-    setup_requires = ["setuptools>=18.0"],
-    install_requires = [],
-    entry_points = {
+    python_requires=">=3.6",
+    setup_requires=["setuptools>=18.0"],
+    install_requires=[],
+    extras_require={
+        "dev": [
+            "beautifulsoup4==4.9.3",
+            "requests==2.25.1",
+            "black==21.6b0",
+            "mypy==0.902",
+            "types-requests==0.1.11",
+        ]
+    },
+    entry_points={
         "pydicom.data.external_sources": "pydicom-data-sr = srdata:DataStore",
-    }
+    },
 )

sr/__init__.py

@@ -0,0 +1,13 @@
+from pathlib import Path
+
+from sr._version import __version__
+
+
+PACKAGE_DIR = Path(__file__).parent.resolve(strict=True)
+HASH_FILE = PACKAGE_DIR / "hashes.json"
+VERSION_FILE = PACKAGE_DIR / "_version.py"
+
+SR_TABLES = PACKAGE_DIR / "tables"
+CID_FILE = SR_TABLES / "_cid.py"
+CONCEPTS_FILE = SR_TABLES / "_concepts.py"
+SNOMED_FILE = SR_TABLES / "_snomed.py"

sr/_version.py

@@ -0,0 +1,2 @@
+__version__: str = "2021.06.16"
+__dicom_version__: str = "2021b"