Merge pull request #126 from mraspaud/fix-sdist-deploy

Switch to `pyproject.toml`entirely

.github/workflows/deploy-sdist.yaml

@@ -11,15 +11,17 @@ jobs:
 
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Create sdist
         shell: bash -l {0}
-        run: python setup.py sdist
+        run: |
+          python -m pip install -q build
+          python -m build -s
 
       - name: Publish package to PyPI
         if: github.event.action == 'published'
-        uses: pypa/gh-action-pypi-publish@v1.4.1
+        uses: pypa/gh-action-pypi-publish@v1.8.12
         with:
           user: __token__
           password: ${{ secrets.pypi_password }}

.gitignore

@@ -6,5 +6,11 @@ doc/build
 dist
 pygac.egg-info
 etc/*.cfg
-gapfilled_tles/
+gapfilled_tles/*
 pygac/version.py
+
+tmp
+.vscode
+.venv
+*.lock
+.python-version

.pre-commit-config.yaml

@@ -1,8 +1,14 @@
 exclude: '^$'
 fail_fast: false
+
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.2.3
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: 'v0.3.2'
     hooks:
-    - id: flake8
-      additional_dependencies: [flake8-docstrings, flake8-debugger, flake8-bugbear]
+      - id: ruff
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer

MANIFEST.in

@@ -1,6 +1,5 @@
-include etc/*
-include gapfilled_tles/*
-include bin/pygac-*
+include etc/pygac.cfg.template
+include gapfilled_tles/TLE_*.txt
 include LICENSE.txt
 include README.md
 include pygac/version.py

pygac/calibration.py

@@ -24,17 +24,18 @@
 """Calibration coefficients and generic calibration functions
 """
 from __future__ import division
-from enum import Enum
-import sys
-import logging
-import numpy as np
-import json
+
+import datetime as dt
 import hashlib
+import json
+import logging
+import sys
 import warnings
-import datetime as dt
 from collections import namedtuple
-from pkg_resources import resource_filename
+from enum import Enum
+from importlib.resources import files
 
+import numpy as np
 
 LOG = logging.getLogger(__name__)
 
@@ -172,7 +173,7 @@ def read_coeffs(cls, coeffs_file):
             LOG.info('Read calibration coefficients from "%s"', coeffs_file)
         else:
             LOG.debug("Read PyGAC internal calibration coefficients.")
-            coeffs_file = resource_filename('pygac', 'data/calibration.json')
+            coeffs_file = files("pygac") / "data/calibration.json"
         with open(coeffs_file, mode='rb') as json_file:
             content = json_file.read()
             coeffs = json.loads(content)