From 476788fb27efa7672ad699e0ea369cc778aa1538 Mon Sep 17 00:00:00 2001 From: Kanahiro Date: Tue, 4 Jul 2023 21:36:11 +0900 Subject: [PATCH] gtfs-parser as submodule --- .github/workflows/test_gtfs_parser.yml | 25 ------------------------- .gitmodules | 3 +++ gtfs_go_dialog.py | 3 ++- gtfs_parser | 1 + 4 files changed, 6 insertions(+), 26 deletions(-) delete mode 100644 .github/workflows/test_gtfs_parser.yml create mode 100644 .gitmodules create mode 160000 gtfs_parser diff --git a/.github/workflows/test_gtfs_parser.yml b/.github/workflows/test_gtfs_parser.yml deleted file mode 100644 index c6fcf99..0000000 --- a/.github/workflows/test_gtfs_parser.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: test gtfs_parser - -on: - pull_request: - branches: [ main ] - paths: - - "gtfs_parser/**" - -jobs: - unittest: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Set up Python 3.7 - uses: actions/setup-python@v2 - with: - python-version: 3.7 - - - name: Install dependencies - run: python -m pip install pandas - - - name: unittest - run: python -m unittest discover gtfs_parser \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..fec05d3 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "gtfs_parser"] + path = gtfs_parser + url = https://github.com/MIERUNE/gtfs-parser.git diff --git a/gtfs_go_dialog.py b/gtfs_go_dialog.py index 7dc75cd..c9029d5 100755 --- a/gtfs_go_dialog.py +++ b/gtfs_go_dialog.py @@ -39,12 +39,13 @@ from qgis.PyQt import uic from qgis.utils import iface -from . import constants, gtfs_parser, repository +from . import constants, repository from .gtfs_go_labeling import get_labeling_for_stops from .gtfs_go_renderer import Renderer from .gtfs_go_settings import ( STOPS_MINIMUM_VISIBLE_SCALE, ) +from .gtfs_parser import gtfs_parser from .repository.japan_dpf.table import HEADERS, HEADERS_TO_HIDE DATALIST_JSON_PATH = os.path.join(os.path.dirname(__file__), "gtfs_go_datalist.json") diff --git a/gtfs_parser b/gtfs_parser new file mode 160000 index 0000000..2818852 --- /dev/null +++ b/gtfs_parser @@ -0,0 +1 @@ +Subproject commit 28188527c7d16591c089e03d2bff6b7b283909d0