Skip to content

Commit 0cc00e0

Browse files
authored
Merge pull request #42 from LocationMind/dev
Merge dev to main (stable version)
2 parents 3fd7260 + 86b23ff commit 0cc00e0

File tree

151 files changed

+4308
-12663
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+4308
-12663
lines changed
File renamed without changes.

.github/workflows/action.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,27 @@ jobs:
1717
- name: Dependencies installation
1818
run: |
1919
python -m pip install --upgrade pip
20-
pip install -r Requirements/requirements_base.txt
20+
if [[ "${{ runner.os }}" != "Windows" ]]; then
21+
sed -i '/pywin32/d' Requirements/requirements.txt
22+
fi
23+
python -m pip install -r Requirements/requirements.txt
2124
2225
- name: Docker setup
23-
run: docker compose up -d
26+
run: docker compose up -d --wait
2427

25-
- name: Wait for PostgreSQL to be ready
28+
- name: Wait for PostgreSQL to be ready (2 min maximum)
2629
run: |
27-
until docker compose exec pgrouting pg_isready -U postgres; do
30+
MAX_RETRIES=6
31+
RETRY_COUNT=0
32+
until docker compose exec pgrouting pg_isready -U postgres -d pgrouting || [ $RETRY_COUNT -eq $MAX_RETRIES ]; do
2833
echo "Waiting for PostgreSQL to be ready..."
2934
sleep 5
35+
RETRY_COUNT=$((RETRY_COUNT+1))
3036
done
37+
if [ $RETRY_COUNT -eq $MAX_RETRIES ]; then
38+
echo "PostgreSQL did not become ready in time." >&2
39+
exit 1
40+
fi
3141
3242
- name: Run tests
3343
run: pytest -v

Bash/OMF/Analyze/copy_place_category_main_to_tsv.sh

Lines changed: 0 additions & 40 deletions
This file was deleted.

Bash/OMF/Analyze/copy_place_cnt_to_tsv.sh

Lines changed: 0 additions & 81 deletions
This file was deleted.

Bash/OMF/Analyze/copy_place_source_to_tsv.sh

Lines changed: 0 additions & 48 deletions
This file was deleted.

Bash/OMF/Analyze/copy_place_to_tsv.sh

Lines changed: 0 additions & 47 deletions
This file was deleted.

Bash/OMF/ETL/omf_download.sh

Lines changed: 0 additions & 74 deletions
This file was deleted.

Bash/OMF/ETL/omf_import.sh

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)