fix: remove hacking changes, fix bugs in wheel/pypi release, release 1.2.8 (#445)

* revert: remove hacking changes

* fix: add back changes and changelog

* fix: skip upload

* fix: get sdist build command right

Author: beckermr

.github/workflows/wheel.yml

@@ -26,8 +26,6 @@ concurrency:
 env:
   PYVER: '3.11'
   CIBW_SKIP_VAL: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.cibw_skip || 'cp36* cp37* pp* cp38*' }}
-  CIBW_BUILD_FRONTEND: "build; args: --no-isolation"
-  CIBW_BEFORE_BUILD: "pip install 'setuptools>=80' 'numpy>=1.7' 'setuptools-scm>=8'"
 
 jobs:
   linux-manylinux:
@@ -207,7 +205,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install -U pip
-          pip install -U "numpy>=1.7" "setuptools>=80" "setuptools-scm>=8" build
+          pip install -U build
 
       - name: download wheels
         uses: actions/download-artifact@v5
@@ -218,7 +216,7 @@ jobs:
 
       - name: build sdist
         run: |
-          python -m build --sdist --no-isolation .
+          python -m build --sdist .
           ls -l dist
           tar tvfz dist/*.tar.gz
 
@@ -232,7 +230,7 @@ jobs:
 
       # - name: publish to pypi
       #   uses: pypa/gh-action-pypi-publish@release/v1
-      #   if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
+      #   if: github.event_name == 'release' || github.event.action == 'workflow_dispatch'
       #   with:
       #     verbose: true
       #     skip-existing: true

CHANGES.md

@@ -1,4 +1,4 @@
-unreleased
+version 1.2.8
 -------------
 
 Changes
@@ -11,6 +11,10 @@ Changes
       unaligned arrays are rare, this change should have
       minimal performance implications.
 
+Bug Fixes
+
+    - Fixed error in PyPI uploads.
+
 version 1.2.7
 -------------
 

pyproject.toml

@@ -5,7 +5,7 @@
 # https://packaging.python.org/guides/distributing-packages-using-setuptools/
 
 from __future__ import print_function
-from setuptools import setup, Extension  # , find_packages
+from setuptools import setup, Extension, find_packages
 from setuptools.command.build_ext import build_ext
 
 import sys
@@ -303,37 +303,37 @@ def check_system_cfitsio_objects(self, obj_name):
 
 ext = Extension("fitsio._fitsio_wrap", sources, include_dirs=['numpy'])
 
-# description = ("A full featured python library to read from and "
-#                "write to FITS files.")
+description = ("A full featured python library to read from and "
+               "write to FITS files.")
 
-# with open(os.path.join(os.path.dirname(__file__), "README.md")) as fp:
-#     long_description = fp.read()
+with open(os.path.join(os.path.dirname(__file__), "README.md")) as fp:
+    long_description = fp.read()
 
-# classifiers = [
-#     "Development Status :: 5 - Production/Stable",
-#     "License :: OSI Approved :: GNU General Public License (GPL)",
-#     "Topic :: Scientific/Engineering :: Astronomy",
-#     "Intended Audience :: Science/Research",
-# ]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "License :: OSI Approved :: GNU General Public License (GPL)",
+    "Topic :: Scientific/Engineering :: Astronomy",
+    "Intended Audience :: Science/Research",
+]
 
 setup(
-    # name="fitsio",
-    # description=description,
-    # long_description=long_description,
-    # long_description_content_type='text/markdown; charset=UTF-8; variant=GFM',
-    # license="GPL",
-    # classifiers=classifiers,
-    # url="https://github.com/esheldon/fitsio",
-    # author="Erin Scott Sheldon",
-    # author_email="erin.sheldon@gmail.com",
-    # setup_requires=['numpy>=1.7', 'setuptools-scm>=8'],
-    # install_requires=['numpy>=1.7'],
-    # packages=find_packages(),
-    # include_package_data=True,
+    name="fitsio",
+    description=description,
+    long_description=long_description,
+    long_description_content_type='text/markdown; charset=UTF-8; variant=GFM',
+    license="GPL",
+    classifiers=classifiers,
+    url="https://github.com/esheldon/fitsio",
+    author="Erin Scott Sheldon",
+    author_email="erin.sheldon@gmail.com",
+    setup_requires=['numpy>=1.7', 'setuptools-scm>=8'],
+    install_requires=['numpy>=1.7'],
+    packages=find_packages(),
+    include_package_data=True,
     ext_modules=[ext],
     cmdclass={"build_ext": build_ext_subclass},
-    # use_scm_version={
-    #     "version_file": "fitsio/_version.py",
-    #     "version_file_template": "__version__ = '{version}'\n"
-    # }
+    use_scm_version={
+        "version_file": "fitsio/_version.py",
+        "version_file_template": "__version__ = '{version}'\n"
+    }
 )