✨ 🚀 ✨ [Project] CFPQ_Data 2.0.0

Author: vadyushkins

.github/PULL_REQUEST_TEMPLATE/new_graph.md

@@ -0,0 +1,28 @@
+⚠ To suggest a new graph, you must fill in all the fields in the triangle brackets(``<>``) ⚠
+---
+# About the new graph
+
+## Info
+| | |
+|---|---|
+| Full Name | ``<Specify the full name of the graph>`` |
+| Version | ``<Current version of CFPQ_Data>`` |
+| Origin | [link](``<Link to download the graph>``) |
+
+## CSV File Structure
+
+| Column Number | Column Type | Column Description |
+|:---:|:---:|---|
+| 1 | int | The tail of the edge |
+| 2 | int | The head of the edge |
+| 3 | str | The label of the edge |
+
+## Graph Statistics
+| Num Nodes | Num Edges |
+|:---:|:---:|
+| ``<The number of nodes in the new graph>`` | ``<The number of edges in the new graph>`` |
+
+## Edges Statistics
+| Edge Label | Num Edge Label |
+|---:|---:|
+| ``<The type of the edge label of the new graph >`` | ``<The number of edges in the new graph of this type>`` |

.github/workflows/coverage.yml

@@ -20,6 +20,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip wheel setuptools
           python -m pip install -r requirements.txt
+          python -m pip install -r requirements/tests.txt
           python -m pip install .
           python -m pip list
 

.github/workflows/lint.yml

@@ -16,17 +16,11 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install packages
-        run: |
-          python -m pip install --upgrade pip wheel setuptools
-          python -m pip install -r requirements/developer.txt
-          python -m pip install .
-          python -m pip list
-
       - name: Install pre-commit
         run: |
+          python -m pip install pre-commit==2.15.0
           pre-commit install
 
-      - name: Run black
+      - name: Run pre-commit
         run: |
           pre-commit run --all-files --color always --verbose --show-diff-on-failure

.github/workflows/tests.yml

@@ -12,7 +12,7 @@ jobs:
             macos-latest,
             windows-latest,
         ]
-        python-version: [ 3.7, 3.8, 3.9 ]
+        python-version: [ 3.8, 3.9 ]
     steps:
       - uses: actions/checkout@v2
 
@@ -25,28 +25,10 @@ jobs:
         run: |
           python -m pip install --upgrade pip wheel setuptools
           python -m pip install -r requirements.txt
+          python -m pip install -r requirements/tests.txt
           python -m pip install .
           python -m pip list
 
       - name: Test CFPQ_Data
         run: |
           pytest --doctest-modules -vv -s cfpq_data tests
-
-  # Only supported on linux platform
-  docker:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Build Docker image
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          tags: cfpq_data:latest
-
-      - name: Run tests inside Docker
-        uses: addnab/docker-run-action@v3
-        with:
-          image: cfpq_data:latest
-          run: python3 -m pytest --doctest-modules -vv -s cfpq_data tests

Dockerfile

@@ -7,11 +7,11 @@
 experimental analysis of context-free path querying algorithms
 """
 
-__version__ = "1.0.2"
-
 import cfpq_data.config
 from cfpq_data.config import *
 
+__version__ = VERSION
+
 import cfpq_data.dataset
 from cfpq_data.dataset import *
 
@@ -20,3 +20,11 @@
 
 import cfpq_data.grammars
 from cfpq_data.grammars import *
+
+import logging
+
+logging.basicConfig(
+    level=logging.INFO,
+    format="[%(asctime)s]>%(levelname)s>%(message)s",
+    datefmt="%Y-%m-%d %H:%M:%S",
+)

cfpq_data/__init__.py

@@ -1,15 +1,12 @@
-from pathlib import Path
+import pathlib
 
 __all__ = [
-    "MAIN_FOLDER",
-    "AWS_ACCESS_KEY_ID",
-    "AWS_SECRET_ACCESS_KEY",
-    "BUCKET_NAME",
+    "VERSION",
+    "ROOT",
+    "DATA",
 ]
 
-MAIN_FOLDER = Path(__file__).parent
+VERSION = "2.0.0"
 
-AWS_ACCESS_KEY_ID = "AKIA326NG25W2XT6TBAZ"
-AWS_SECRET_ACCESS_KEY = "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"
-
-BUCKET_NAME = "cfpq-data"
+ROOT = pathlib.Path(__file__).parent
+DATA = ROOT / "data"

cfpq_data/config.py

@@ -0,0 +1 @@
+from cfpq_data.dataset.data import *