From ed19b44c80c5d2a766a241f9fa438d4ba8164796 Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Wed, 12 Jun 2024 14:40:54 -0400 Subject: [PATCH 1/8] add zlib to manifest --- CHANGES.md | 1 + MANIFEST.in | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 103586f0..d08cdc61 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,7 @@ Bug Fixes - Reading images with empty slices was returning data - Using cfitsio 4.4.0 fixes a bug reading HIERARCH+CONTINUE keywords + - zlib subdir not in manifest version 1.2.2 ------------- diff --git a/MANIFEST.in b/MANIFEST.in index caab1fcb..7cbc0f44 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,3 +3,4 @@ include README.md recursive-include cfitsio-4.2.0 * recursive-include patches * recursive-include fitsio/test_images * +recursive-include zlib * From 2b4ac3144cef27a05ead601ffdfc4296542f4a3b Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Wed, 12 Jun 2024 15:11:30 -0400 Subject: [PATCH 2/8] set version 1.2.3rc1 for testing --- fitsio/__init__.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fitsio/__init__.py b/fitsio/__init__.py index 6cb6eef1..dd190f5f 100644 --- a/fitsio/__init__.py +++ b/fitsio/__init__.py @@ -5,7 +5,7 @@ usage. """ -__version__ = '1.2.3' +__version__ = '1.2.3rc1' from . import fitslib diff --git a/setup.py b/setup.py index e380dfcd..179c5f88 100644 --- a/setup.py +++ b/setup.py @@ -318,7 +318,7 @@ def check_system_cfitsio_objects(self, obj_name): setup( name="fitsio", - version="1.2.3", + version="1.2.3rc1", description=description, long_description=long_description, long_description_content_type='text/markdown; charset=UTF-8; variant=GFM', From c7f07dd603daf8cb23f8c6d46d30d94f713cb80c Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Wed, 12 Jun 2024 15:36:31 -0400 Subject: [PATCH 3/8] test installing from sdist --- .github/workflows/tests.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 11e2cfbc..d18dba49 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -107,6 +107,23 @@ jobs: pip install -vv -e . SKIP_BZIP_TEST=true pytest -vv fitsio + - name: test sdist + shell: bash -l {0} + run: | + rm -rf build* + rm -rf $HOME/cfitsio-static-install + find . -name "*.so" -type f -delete + python setup.py sdist + pushd dist/ + fname=$(ls fitsio*.gz) + tar xvfz "$fname" + dname=$(echo "$fname" | sed 's/\.tar\.gz//') + pushd $dname + pip install -vv -e . + SKIP_BZIP_TEST=true pytest -vv fitsio + popd + popd + - name: flake8 shell: bash -l {0} run: | From 7f9ca36f1a90c7caff0b20322a7806934be1d1f8 Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Wed, 12 Jun 2024 15:39:59 -0400 Subject: [PATCH 4/8] BUG wrong cfitsio in manifest --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 7cbc0f44..51e80e45 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,6 @@ include *.txt include README.md -recursive-include cfitsio-4.2.0 * +recursive-include cfitsio-4.4.0 * recursive-include patches * recursive-include fitsio/test_images * recursive-include zlib * From de3723bac0639a3bc015f7d0d48f64814bd124e4 Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Wed, 12 Jun 2024 16:34:56 -0400 Subject: [PATCH 5/8] set version 1.2.3 for a pypi release A collaborator is accidentally squatting on fitsio in test.pypi, so we need to "test" with a real release --- fitsio/__init__.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fitsio/__init__.py b/fitsio/__init__.py index dd190f5f..6cb6eef1 100644 --- a/fitsio/__init__.py +++ b/fitsio/__init__.py @@ -5,7 +5,7 @@ usage. """ -__version__ = '1.2.3rc1' +__version__ = '1.2.3' from . import fitslib diff --git a/setup.py b/setup.py index 179c5f88..e380dfcd 100644 --- a/setup.py +++ b/setup.py @@ -318,7 +318,7 @@ def check_system_cfitsio_objects(self, obj_name): setup( name="fitsio", - version="1.2.3rc1", + version="1.2.3", description=description, long_description=long_description, long_description_content_type='text/markdown; charset=UTF-8; variant=GFM', From f612cce05658bb013b8e4ddf9436515307127201 Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Wed, 12 Jun 2024 16:36:24 -0400 Subject: [PATCH 6/8] changelog --- CHANGES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index d08cdc61..31c87e37 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,9 +1,10 @@ -version 1.2.3 (not yet released) +version 1.2.3 ------------- Changes - bundle cfitsio 4.4.0. + - update manifest to include new cfitsio Bug Fixes From f64e3de58895d84436859302db2eb942bea54ed6 Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Wed, 12 Jun 2024 16:43:02 -0400 Subject: [PATCH 7/8] add test of installing from sdist but no unit tests --- .github/workflows/tests.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d18dba49..2107ca5d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -107,20 +107,41 @@ jobs: pip install -vv -e . SKIP_BZIP_TEST=true pytest -vv fitsio + - name: test install sdist .gz with no unit tests + shell: bash -l {0} + run: | + rm -rf build* + rm -rf $HOME/cfitsio-static-install + find . -name "*.so" -type f -delete + rm -rf dist + + python setup.py sdist + + pip install -vv --no-deps --no-build-isolation dist/*.tar.gz + cd .. + python -c "import conda_forge_tick; assert conda_forge_tick.__version__ != '0.0.0'" + cd - + pip uninstall conda-forge-tick --yes + - name: test sdist shell: bash -l {0} run: | rm -rf build* rm -rf $HOME/cfitsio-static-install find . -name "*.so" -type f -delete + rm -rf dist + python setup.py sdist pushd dist/ + fname=$(ls fitsio*.gz) tar xvfz "$fname" dname=$(echo "$fname" | sed 's/\.tar\.gz//') pushd $dname + pip install -vv -e . SKIP_BZIP_TEST=true pytest -vv fitsio + popd popd From b8f2bea8d2006c51e6dd26b5f27c9f86aaafa262 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Wed, 12 Jun 2024 15:47:48 -0500 Subject: [PATCH 8/8] Update .github/workflows/tests.yml --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2107ca5d..9b0fe651 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -119,9 +119,9 @@ jobs: pip install -vv --no-deps --no-build-isolation dist/*.tar.gz cd .. - python -c "import conda_forge_tick; assert conda_forge_tick.__version__ != '0.0.0'" + python -c "import fitsio; assert fitsio.__version__ != '0.0.0'" cd - - pip uninstall conda-forge-tick --yes + pip uninstall fitsio --yes - name: test sdist shell: bash -l {0}