diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da017a9..95f732e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,8 +17,8 @@ jobs: name: black runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 with: python-version: '3.10' - name: Setup @@ -29,8 +29,8 @@ jobs: name: flake8 runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 with: python-version: '3.10' - name: Setup @@ -41,8 +41,8 @@ jobs: name: isort runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 with: python-version: '3.10' - name: Setup @@ -70,14 +70,14 @@ jobs: matrix: os: [windows-latest, ubuntu-latest, macos-latest] steps: - - uses: actions/checkout@v1 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 name: Install Python with: python-version: '3.10' - name: Install cibuildwheel run: | - python -m pip install cibuildwheel==2.3.1 + python -m pip install cibuildwheel - uses: ilammy/msvc-dev-cmd@v1 if: startsWith(matrix.os, 'windows') - name: Build wheels @@ -94,7 +94,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python_tag: [ "cp37-*", "cp38-*", "cp39-*", "cp310-*"] + python_tag: [ "cp39-*", "cp310-*","cp311-*", "cp312-*"] env: CIBW_ARCHS_LINUX: aarch64 CIBW_BUILD: ${{matrix.python_tag}} @@ -103,14 +103,14 @@ jobs: CIBW_BEFORE_BUILD_LINUX: "" steps: - - uses: actions/checkout@v1 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 name: Install Python with: - python-version: '3.10' + python-version: '3.11' - name: Install cibuildwheel run: | - python -m pip install cibuildwheel==2.3.1 + python -m pip install cibuildwheel - uses: docker/setup-qemu-action@v1 name: Set up QEMU - name: Build wheels @@ -133,8 +133,8 @@ jobs: fail-fast: true steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 name: Install Python with: python-version: '3.10' diff --git a/mgrs/__init__.py b/mgrs/__init__.py index 2140533..c33acda 100644 --- a/mgrs/__init__.py +++ b/mgrs/__init__.py @@ -111,7 +111,6 @@ def toLatLon(self, MGRS, inDegrees=True): return (lat, lon) def MGRSToUTM(self, MGRS, encoding="utf-8"): - if type(MGRS) is str: mgrs = MGRS.encode(encoding) else: diff --git a/mgrs/core.py b/mgrs/core.py index afdd22a..d941a26 100644 --- a/mgrs/core.py +++ b/mgrs/core.py @@ -140,7 +140,7 @@ def _load_library(dllname, loadfunction, dllpaths=("",)): free = None - def free(m): + def free(m): # noqa: F811 global free try: free = ctypes.cdll.msvcrt.free(m) @@ -151,7 +151,6 @@ def free(m): raise elif os.name == "posix": - soabi = sysconfig.get_config_var("SOABI") lib_name = "libmgrs.so" if soabi: diff --git a/setup.py b/setup.py index 9f11872..3258d56 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ setup( name="mgrs", - version="1.4.5", + version="1.4.6", description="MGRS coordinate conversion for Python", license="MIT", keywords="gis coordinate conversion",