Merge pull request #1242 from gboeing/docker

improve workflows and pre-commit checks
gboeing · Dec 8, 2024 · 08782f1 · 08782f1
2 parents 879e8ed + a42fc9a
commit 08782f1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 15 deletions.
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.13"
+          python-version: "3.x"
           cache: "pip"
 
       - name: Install requirements

diff --git a/.github/workflows/test-latest.yml b/.github/workflows/test-latest.yml
@@ -26,7 +26,7 @@ jobs:
         uses: actions/setup-python@v5
         with:
           cache: "pip"
-          python-version: "3.13"
+          python-version: "3.x"
 
       - name: Install OSMnx with dependency pre-releases
         run: |

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -22,20 +22,8 @@ repos:
         args: [--branch, main]
       - id: trailing-whitespace
 
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v4.0.0-alpha.8"
-    hooks:
-      - id: prettier
-        types_or: [markdown, yaml]
-
-  - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: "v0.43.0"
-    hooks:
-      - id: markdownlint
-        args: [--disable=MD013]
-
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.8.0"
+    rev: "v0.8.2"
     hooks:
       - id: ruff
         args: [--fix]

diff --git a/environments/linux/create-environment.sh b/environments/linux/create-environment.sh
@@ -11,6 +11,7 @@ eval "$(conda shell.bash hook)"
 conda activate $ENV
 python -m pip --python $ENV_PATH uninstall $PACKAGE --yes
 python -m pip --python $ENV_PATH install -e ../../.
+python -m pip --python $ENV_PATH check
 python -m ipykernel install --prefix $ENV_PATH --name $ENV --display-name "Python ($ENV)"
 conda env export -n $ENV > environment.yml
 conda list -n $ENV

diff --git a/environments/windows/create-environment.bat b/environments/windows/create-environment.bat
@@ -9,6 +9,7 @@ mamba create -n %ENV% --yes -c conda-forge --strict-channel-priority --file "../
 conda activate %ENV% && ^
 python -m pip --python %ENV_PATH%\python.exe uninstall %PACKAGE% --yes && ^
 python -m pip --python %ENV_PATH%\python.exe install -e ../../. && ^
+python -m pip --python %ENV_PATH%\python.exe check && ^
 python -m ipykernel install --prefix %ENV_PATH% --name %ENV% --display-name "Python (%ENV%)" && ^
 conda env export -n %ENV% > environment.yml && ^
 conda list && ^