Skip to content

Commit d6ea2cb

Browse files
authored
Fix pip CI checks and remove distutils implicit dependency (#675)
1 parent 1bbfddd commit d6ea2cb

File tree

3 files changed

+6
-21
lines changed

3 files changed

+6
-21
lines changed

.github/workflows/pip-checks.yml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,16 @@ jobs:
1818
os: ["ubuntu-latest", "macos-latest"]
1919
python-version: ["3.10", "3.11", "3.12"]
2020

21-
# Run all shells using bash (including Windows)
22-
defaults:
23-
run:
24-
shell: bash -l {0}
25-
2621
steps:
2722
- uses: actions/checkout@v4
2823

29-
# We initiate the environment empty
30-
- name: Initiate empty environment
31-
uses: conda-incubator/setup-miniconda@v3
24+
- uses: actions/setup-python@v5
3225
with:
33-
miniforge-version: latest
34-
auto-update-conda: true
35-
use-mamba: true
36-
mamba-version: "2.0.5"
37-
channel-priority: strict
38-
activate-environment: geoutils-pip
3926
python-version: ${{ matrix.python-version }}
4027

4128
# Use pip install
4229
- name: Install project
43-
run: |
44-
mamba install pip
45-
pip install -e .
30+
run: python -m pip install -e .
4631

4732
# Check import works
4833
- name: Check import works with base environment

.github/workflows/python-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
uses: coverallsapp/github-action@v2
106106
with:
107107
github-token: ${{ secrets.github_token }}
108-
flag-name: run-${{ matrix.test_number }}
108+
flag-name: run-${{ join(matrix.*, '-') }}
109109
path-to-lcov: coverage.info
110110
parallel: true
111111

@@ -114,7 +114,7 @@ jobs:
114114
runs-on: ubuntu-latest
115115
steps:
116116
- name: Upload to Coveralls finished
117-
uses: coverallsapp/github-action@master
117+
uses: coverallsapp/github-action@v2
118118
with:
119119
github-token: ${{ secrets.github_token }}
120120
parallel-finished: true

geoutils/examples.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"""Utility functions to download and find example data."""
2020

2121
import os
22+
import shutil
2223
import tarfile
2324
import tempfile
2425
import urllib.request
25-
from distutils.dir_util import copy_tree
2626

2727
# Define the location of the data in the example directory
2828
_EXAMPLES_DIRECTORY = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "examples/data"))
@@ -87,7 +87,7 @@ def download_examples(overwrite: bool = False) -> None:
8787
)
8888

8989
# Copy the temporary extracted data to the example directory.
90-
copy_tree(tmp_dir_name, os.path.join(_EXAMPLES_DIRECTORY, dir_name))
90+
shutil.copytree(tmp_dir_name, os.path.join(_EXAMPLES_DIRECTORY, dir_name))
9191

9292

9393
def get_path(name: str) -> str:

0 commit comments

Comments
 (0)