1333: sync requirements.txt and pyproject.toml

.github/workflows/lint_format.yml

@@ -34,8 +34,7 @@ jobs:
           python-version: "3.12"
       - name: Install linters
         run: |
-          pip install flake8==6.1.0
-          pip install black==24.10.0
+          pip install black flake8 -c requirements-dev.txt
       - name: Run flake8
         run: |
           flake8 ${{needs.get_changed_files.outputs.py}} --count --select=E9,F63,F7,F82 --show-source --statistics

.github/workflows/test_unit.yml

@@ -13,7 +13,7 @@ jobs:
           python-version: "3.12"
       - name: Install requirements
         run: |
-          pip install -r requirements.txt
+          pip install -r requirements-dev.txt
       - name: Running Tests
         run: |
           python -m pytest tests/unit/ --cov=cdisc_rules_engine --cov-fail-under=75

README.md

@@ -73,7 +73,7 @@ In the terminal, navigate to the directory you intend to install CORE rules engi
 
 This project uses the `black` code formatter, `flake8` linter for python and `prettier` for JSON, YAML and MD.
 It also uses `pre-commit` to run `black`, `flake8` and `prettier` when you commit.
-Both dependencies are added to _requirements.txt_.
+Both dependencies are added to _requirements-dev.txt_.
 
 **Required**
 
@@ -103,6 +103,8 @@ NOTE: if you have multiple versions of python on your machine, you can call pyth
 
 `python -m pip install -r requirements.txt` # From the root directory
 
+`python -m pip install -r requirements-dev.txt` # From the root directory (this will install dev dependencies like black, flake8, pytest etc.)
+
 ### **Running The Tests**
 
 From the root of the project run the following command (this will run both the unit and regression tests):

pyproject.toml

@@ -4,34 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cdisc-rules-engine"
-dynamic = ["version"]
+dynamic = ["version", "dependencies"]
 description = "Open source offering of the cdisc rules engine"
 readme = "PYPI.md"
 requires-python = ">=3.12, <3.13"
 license = { text = "MIT" }
 authors = [{ name = "cdisc-org", email = "[email protected]" }]
-dependencies = [
-    "business_rules_enhanced==1.4.8",
-    "cdisc-library-client==0.1.6",
-    "importlib-metadata==8.5.0",
-    "jsonpath-ng==1.6.1",
-    "jsonschema==4.18.5",
-    "numpy~=1.23.2",
-    "odmlib==0.1.4",
-    "openpyxl==3.1.5",
-    "pandas==1.5.2",
-    "python-dotenv==0.20.0",
-    "pyyaml==6.0.2",
-    "redis==4.0.2",
-    "requests~=2.32.3",
-    "cachetools==6.1.0",
-    "Pympler==1.1",
-    "psutil==6.1.1",
-    "pyreadstat==1.2.7",
-    "fastparquet==2024.2.0",
-    "dask[dataframe]==2024.2.0",
-    "dask[array]==2024.2.0",
-]
 
 [project.urls]
 "Homepage" = "https://github.com/cdisc-org/cdisc-rules-engine"
@@ -49,3 +27,4 @@ py-modules = ["version"]
 
 [tool.setuptools.dynamic]
 version = { attr = "version.__version__" }
+dependencies = {file = ["requirements.txt"]}

requirements-dev.txt

@@ -0,0 +1,7 @@
+-r requirements.txt
+black==24.10.0
+flake8==6.1.0
+pre-commit==2.20.0
+pytest==7.4.0
+pytest-asyncio==0.21.0
+pytest-cov==6.0.0

requirements.txt

@@ -1,20 +1,14 @@
-black==24.10.0
 business_rules_enhanced==1.4.8
 cdisc-library-client==0.1.6
 click==8.1.7
-flake8==6.1.0
 importlib-metadata==8.5.0
 jsonpath-ng==1.6.1
 jsonschema==4.18.5
 numpy~=1.26.0
 odmlib==0.1.4
 openpyxl==3.1.5
 pandas==2.1.4
-pre-commit==2.20.0
 pyinstaller==6.11.0
-pytest==7.4.0
-pytest-asyncio==0.21.0
-pytest-cov==6.0.0
 python-dotenv==1.0.0
 pyyaml==6.0.2
 redis==4.5.0
@@ -26,4 +20,4 @@ psutil==6.1.1
 dask[dataframe]==2024.6.0
 dask[array]==2024.6.0
 pyreadstat==1.2.7
-fastparquet==2024.2.0
+fastparquet==2024.2.0