From 36f4faca885e443fd9825a3d35f369127ceda61b Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Mon, 26 Jun 2023 10:34:48 -0400 Subject: [PATCH 01/20] BUG checking rows were sent --- fitsio/fitsio_pywrap.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/fitsio/fitsio_pywrap.c b/fitsio/fitsio_pywrap.c index ac158894..7db9045b 100644 --- a/fitsio/fitsio_pywrap.c +++ b/fitsio/fitsio_pywrap.c @@ -3205,8 +3205,6 @@ static int read_binary_column( LONGLONG repeat=0; LONGLONG width=0; - int rows_sent=0; - // use char for pointer arith. It's actually ok to use void as char but // this is just in case. char *data=NULL, *ptr=NULL; @@ -3220,10 +3218,8 @@ static int read_binary_column( repeat = colptr->trepeat; width = colptr->tdatatype == TSTRING ? 1 : colptr->twidth; - rows_sent = nrows == hdu->numrows ? 0 : 1; - for (irow=0; irowFptr; - rows_sent = (nrows == hdu->numrows) ? 0 : 1; - for (irow=0; irow < nrows; irow++) { - if (rows_sent) { + if (rows != NULL) { si = sortind[irow]; row = rows[si]; } else { @@ -3644,7 +3637,13 @@ PyFITSObject_read_columns_as_rec(struct PyFITSObject* self, PyObject* args) { nrows = hdu->numrows; } else { rows = get_int64_from_array(rowsObj, &nrows); + if (rows == NULL) { + return NULL; + } sortind = get_int64_from_array(sortindObj, &nsortind); + if (sortind == NULL) { + return NULL; + } } if (read_binary_rec_columns( self->fits, ncols, colnums, From 3665ab6581a6e59eb4e9f601d4e64ad8f9b23752 Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Mon, 26 Jun 2023 10:59:08 -0400 Subject: [PATCH 02/20] try to add 32 bit --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a8f617cf..3e5d18dc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, ubuntu-latest] + os: [macos-latest, ubuntu-latest, i386/ubuntu:latest] pyver: ["3.8", "3.9", "3.10", "3.11"] npver: ["1.20", "1.21", "1.23"] exclude: From 8c50907ef22e27875ebf6503a12a53311d472232 Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Mon, 26 Jun 2023 11:24:53 -0400 Subject: [PATCH 03/20] try adding i386 action --- .github/workflows/tests-i386.yaml | 40 +++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/tests-i386.yaml diff --git a/.github/workflows/tests-i386.yaml b/.github/workflows/tests-i386.yaml new file mode 100644 index 00000000..29eccff6 --- /dev/null +++ b/.github/workflows/tests-i386.yaml @@ -0,0 +1,40 @@ +name: tests-i386 + +on: + push: + branches: + - master + pull_request: null + +jobs: + tests: + name: tests + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest] + runs-on: ${{ matrix.os }} + + steps: + - name: cancel previous runs + uses: styfle/cancel-workflow-action@0.6.0 + with: + access_token: ${{ github.token }} + + - uses: actions/checkout@v2 + + - name: install deps + shell: bash -l {0} + run: | + sudo apt install build-essential:i386 python3-numpy:i386 python3-pytest:i386 python3-flake8:i386 + + - name: test build + shell: bash -l {0} + run: | + pip install -e . + SKIP_BZIP_TEST=true pytest -vv fitsio + + - name: flake8 + shell: bash -l {0} + run: | + flake8 fitsio From a42cc0d18af40e69cf2dc2be6d1ee8cdcf7c4a16 Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Mon, 26 Jun 2023 11:41:26 -0400 Subject: [PATCH 04/20] try setup-python --- .github/workflows/tests-i386.yaml | 21 +++++++++------------ .github/workflows/tests.yml | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/tests-i386.yaml b/.github/workflows/tests-i386.yaml index 29eccff6..1a580d6b 100644 --- a/.github/workflows/tests-i386.yaml +++ b/.github/workflows/tests-i386.yaml @@ -6,14 +6,12 @@ on: - master pull_request: null + jobs: tests: name: tests strategy: fail-fast: false - matrix: - os: [ubuntu-latest] - runs-on: ${{ matrix.os }} steps: - name: cancel previous runs @@ -21,20 +19,19 @@ jobs: with: access_token: ${{ github.token }} - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + architecture: x86 + python-version: '3.10' + cache: 'pip' # caching pip dependencies - name: install deps shell: bash -l {0} - run: | - sudo apt install build-essential:i386 python3-numpy:i386 python3-pytest:i386 python3-flake8:i386 + run: pip install numpy - - name: test build + - name: test build and pytest shell: bash -l {0} run: | pip install -e . SKIP_BZIP_TEST=true pytest -vv fitsio - - - name: flake8 - shell: bash -l {0} - run: | - flake8 fitsio diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3e5d18dc..a8f617cf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, ubuntu-latest, i386/ubuntu:latest] + os: [macos-latest, ubuntu-latest] pyver: ["3.8", "3.9", "3.10", "3.11"] npver: ["1.20", "1.21", "1.23"] exclude: From 2596455f3603fd5ac58c7688b642893078608230 Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Mon, 26 Jun 2023 11:45:19 -0400 Subject: [PATCH 05/20] BUG forgot runs-on --- .github/workflows/tests-i386.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests-i386.yaml b/.github/workflows/tests-i386.yaml index 1a580d6b..eb224164 100644 --- a/.github/workflows/tests-i386.yaml +++ b/.github/workflows/tests-i386.yaml @@ -8,10 +8,11 @@ on: jobs: - tests: - name: tests + tests-i386: + name: tests-i386 strategy: fail-fast: false + runs-on: ubuntu-latest steps: - name: cancel previous runs From 7c3540f3300faa7ea55fb5e865392e114bf2bb02 Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Mon, 26 Jun 2023 11:46:25 -0400 Subject: [PATCH 06/20] try 3.8 3.10 was not available --- .github/workflows/tests-i386.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests-i386.yaml b/.github/workflows/tests-i386.yaml index eb224164..04736761 100644 --- a/.github/workflows/tests-i386.yaml +++ b/.github/workflows/tests-i386.yaml @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-python@v4 with: architecture: x86 - python-version: '3.10' + python-version: '3.8' cache: 'pip' # caching pip dependencies - name: install deps From 4a265129e00995b5adb56cfd904d32d6cc16e4d5 Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Mon, 26 Jun 2023 12:02:06 -0400 Subject: [PATCH 07/20] another try i386 --- .github/workflows/tests-i386.yaml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests-i386.yaml b/.github/workflows/tests-i386.yaml index 04736761..736db4ee 100644 --- a/.github/workflows/tests-i386.yaml +++ b/.github/workflows/tests-i386.yaml @@ -6,13 +6,14 @@ on: - master pull_request: null - jobs: tests-i386: name: tests-i386 strategy: fail-fast: false - runs-on: ubuntu-latest + matrix: + os: [ubuntu-latest] + runs-on: ${{ matrix.os }} steps: - name: cancel previous runs @@ -20,19 +21,23 @@ jobs: with: access_token: ${{ github.token }} - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - architecture: x86 - python-version: '3.8' - cache: 'pip' # caching pip dependencies + - uses: actions/checkout@v2 - name: install deps shell: bash -l {0} - run: pip install numpy + run: | + sudo dpkg --add-architecture i386 + sudo apt-get update + sudo apt-get -y install --allow-downgrades gcc-multilib libglib2.0-dev:i386 python:i386 + pip install numpy - - name: test build and pytest + - name: test build shell: bash -l {0} run: | pip install -e . SKIP_BZIP_TEST=true pytest -vv fitsio + + - name: flake8 + shell: bash -l {0} + run: | + flake8 fitsio From 2087483bfac64c922a364e2a011de363e0f89bc2 Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Mon, 26 Jun 2023 12:05:59 -0400 Subject: [PATCH 08/20] install pytest not sure if this pip is using i386 --- .github/workflows/tests-i386.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/tests-i386.yaml b/.github/workflows/tests-i386.yaml index 736db4ee..a1e3d1b6 100644 --- a/.github/workflows/tests-i386.yaml +++ b/.github/workflows/tests-i386.yaml @@ -29,15 +29,10 @@ jobs: sudo dpkg --add-architecture i386 sudo apt-get update sudo apt-get -y install --allow-downgrades gcc-multilib libglib2.0-dev:i386 python:i386 - pip install numpy + pip install numpy pytest - name: test build shell: bash -l {0} run: | pip install -e . SKIP_BZIP_TEST=true pytest -vv fitsio - - - name: flake8 - shell: bash -l {0} - run: | - flake8 fitsio From 9e0253dc8bcfa94d0d49843d33ccd53200363d42 Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Mon, 26 Jun 2023 14:24:01 -0400 Subject: [PATCH 09/20] correct package --- .github/workflows/tests-i386.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests-i386.yaml b/.github/workflows/tests-i386.yaml index a1e3d1b6..77df0b4e 100644 --- a/.github/workflows/tests-i386.yaml +++ b/.github/workflows/tests-i386.yaml @@ -28,7 +28,7 @@ jobs: run: | sudo dpkg --add-architecture i386 sudo apt-get update - sudo apt-get -y install --allow-downgrades gcc-multilib libglib2.0-dev:i386 python:i386 + sudo apt-get -y install --allow-downgrades gcc-multilib libglib2.0-dev:i386 python3:i386 pip install numpy pytest - name: test build From a9192b6a96416dcedab1ef3ed1e22829b37d103d Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Mon, 26 Jun 2023 14:29:18 -0400 Subject: [PATCH 10/20] more deps --- .github/workflows/tests-i386.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests-i386.yaml b/.github/workflows/tests-i386.yaml index 77df0b4e..ba04d85f 100644 --- a/.github/workflows/tests-i386.yaml +++ b/.github/workflows/tests-i386.yaml @@ -27,8 +27,12 @@ jobs: shell: bash -l {0} run: | sudo dpkg --add-architecture i386 - sudo apt-get update - sudo apt-get -y install --allow-downgrades gcc-multilib libglib2.0-dev:i386 python3:i386 + sudo apt-get update + sudo apt-get -y install --allow-downgrades gcc-multilib g++-multilib libpcre3-dev:i386 libglib2.0-dev:i386 python3:i386 libpython3-stdlib:i386 + + - name: install deps + shell: bash -l {0} + run: | pip install numpy pytest - name: test build From f7e0348db74bf621a0b67dd1feaa69a8afd5f284 Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Mon, 26 Jun 2023 14:30:42 -0400 Subject: [PATCH 11/20] more deps --- .github/workflows/tests-i386.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests-i386.yaml b/.github/workflows/tests-i386.yaml index ba04d85f..f34cc66b 100644 --- a/.github/workflows/tests-i386.yaml +++ b/.github/workflows/tests-i386.yaml @@ -28,7 +28,7 @@ jobs: run: | sudo dpkg --add-architecture i386 sudo apt-get update - sudo apt-get -y install --allow-downgrades gcc-multilib g++-multilib libpcre3-dev:i386 libglib2.0-dev:i386 python3:i386 libpython3-stdlib:i386 + sudo apt-get -y install --allow-downgrades gcc-multilib g++-multilib libgcc-s1:i386 libstdc++6:i386 libpcre3-dev:i386 libglib2.0-dev:i386 python3:i386 libpython3-stdlib:i386 - name: install deps shell: bash -l {0} From 5b0e38455df31f6f6668a714c66c03d15e3d09a7 Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Mon, 26 Jun 2023 14:36:06 -0400 Subject: [PATCH 12/20] more deps --- .github/workflows/tests-i386.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests-i386.yaml b/.github/workflows/tests-i386.yaml index f34cc66b..a5da3cc6 100644 --- a/.github/workflows/tests-i386.yaml +++ b/.github/workflows/tests-i386.yaml @@ -28,9 +28,9 @@ jobs: run: | sudo dpkg --add-architecture i386 sudo apt-get update - sudo apt-get -y install --allow-downgrades gcc-multilib g++-multilib libgcc-s1:i386 libstdc++6:i386 libpcre3-dev:i386 libglib2.0-dev:i386 python3:i386 libpython3-stdlib:i386 + sudo apt-get -y install --allow-downgrades gcc-multilib g++-multilib libgcc-s1:i386 libstdc++6:i386 libpcre3-dev:i386 libglib2.0-dev:i386 python3:i386 python3-apt:i386 libpython3-stdlib:i386 - - name: install deps + - name: install python deps shell: bash -l {0} run: | pip install numpy pytest From 3e23b826914c20108a785ecd4494d5e19aee683f Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Tue, 27 Jun 2023 09:16:07 -0400 Subject: [PATCH 13/20] remove ubuntu-advantage-tools --- .github/workflows/tests-i386.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests-i386.yaml b/.github/workflows/tests-i386.yaml index a5da3cc6..a1956ffd 100644 --- a/.github/workflows/tests-i386.yaml +++ b/.github/workflows/tests-i386.yaml @@ -28,6 +28,7 @@ jobs: run: | sudo dpkg --add-architecture i386 sudo apt-get update + sudo apt-get -y remove ubuntu-advantage-tools sudo apt-get -y install --allow-downgrades gcc-multilib g++-multilib libgcc-s1:i386 libstdc++6:i386 libpcre3-dev:i386 libglib2.0-dev:i386 python3:i386 python3-apt:i386 libpython3-stdlib:i386 - name: install python deps From 3c662a17a5bf39e82eaefa6fc8be69afbb207314 Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Tue, 27 Jun 2023 09:23:44 -0400 Subject: [PATCH 14/20] try to install numpy through apt --- .github/workflows/tests-i386.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests-i386.yaml b/.github/workflows/tests-i386.yaml index a1956ffd..f10dd6d1 100644 --- a/.github/workflows/tests-i386.yaml +++ b/.github/workflows/tests-i386.yaml @@ -29,7 +29,7 @@ jobs: sudo dpkg --add-architecture i386 sudo apt-get update sudo apt-get -y remove ubuntu-advantage-tools - sudo apt-get -y install --allow-downgrades gcc-multilib g++-multilib libgcc-s1:i386 libstdc++6:i386 libpcre3-dev:i386 libglib2.0-dev:i386 python3:i386 python3-apt:i386 libpython3-stdlib:i386 + sudo apt-get -y install --allow-downgrades gcc-multilib g++-multilib libgcc-s1:i386 libstdc++6:i386 libpcre3-dev:i386 libglib2.0-dev:i386 python3:i386 python3-numpy:i386 python3-apt:i386 libpython3-stdlib:i386 - name: install python deps shell: bash -l {0} From 8270221b29fcda5344df33d25874cce7c28b225c Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Tue, 27 Jun 2023 09:55:58 -0400 Subject: [PATCH 15/20] force 64 bit for 32 bit systems argsort returns 32 bit on i386 --- .github/workflows/tests-i386.yaml | 10 ++++++---- fitsio/hdu/table.py | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests-i386.yaml b/.github/workflows/tests-i386.yaml index f10dd6d1..b17c3d4b 100644 --- a/.github/workflows/tests-i386.yaml +++ b/.github/workflows/tests-i386.yaml @@ -29,15 +29,17 @@ jobs: sudo dpkg --add-architecture i386 sudo apt-get update sudo apt-get -y remove ubuntu-advantage-tools - sudo apt-get -y install --allow-downgrades gcc-multilib g++-multilib libgcc-s1:i386 libstdc++6:i386 libpcre3-dev:i386 libglib2.0-dev:i386 python3:i386 python3-numpy:i386 python3-apt:i386 libpython3-stdlib:i386 + sudo apt-get -y install --allow-downgrades gcc-multilib g++-multilib libgcc-s1:i386 libstdc++6:i386 libpcre3-dev:i386 libglib2.0-dev:i386 python3:i386 python3-apt:i386 libpython3-stdlib:i386 - name: install python deps shell: bash -l {0} run: | - pip install numpy pytest + echo skipping + # pip install numpy pytest - name: test build shell: bash -l {0} run: | - pip install -e . - SKIP_BZIP_TEST=true pytest -vv fitsio + echo skipping + # pip install -e . + # SKIP_BZIP_TEST=true pytest -vv fitsio diff --git a/fitsio/hdu/table.py b/fitsio/hdu/table.py index 5a5e4e76..f94e10ab 100644 --- a/fitsio/hdu/table.py +++ b/fitsio/hdu/table.py @@ -1425,8 +1425,8 @@ def _extract_rows(self, rows, sort=False): rows = np.unique(rows) return rows, None - # returns unique, sorted - sortind = rows.argsort() + # returns unique, sorted. Force i8 for 32-bit systems + sortind = np.array(rows.argsort(), dtype='i8', copy=False) maxrow = self._info['nrows']-1 if rows.size > 0: From 32c44aac2fb4e00e33d75d7213ab97c3db907e1f Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Tue, 27 Jun 2023 09:57:08 -0400 Subject: [PATCH 16/20] set maxsize for older python stdlib --- fitsio/tests/makedata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fitsio/tests/makedata.py b/fitsio/tests/makedata.py index c9da611e..ef0d8fd5 100644 --- a/fitsio/tests/makedata.py +++ b/fitsio/tests/makedata.py @@ -11,7 +11,7 @@ ) -@lru_cache +@lru_cache(maxsize=1) def make_data(): nvec = 2 From 0466c67a1645143b5a5bd3f7e4fd2c68e2199ea4 Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Tue, 27 Jun 2023 10:26:18 -0400 Subject: [PATCH 17/20] ensure 8 bit arange returns i4 for i386 --- fitsio/hdu/table.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fitsio/hdu/table.py b/fitsio/hdu/table.py index f94e10ab..f210121b 100644 --- a/fitsio/hdu/table.py +++ b/fitsio/hdu/table.py @@ -1099,7 +1099,7 @@ def read_slice(self, firstrow, lastrow, step=1, else: _vstorage = vstorage rows = np.arange(firstrow, lastrow, step, dtype='i8') - sortind = np.arange(rows.size) + sortind = np.arange(rows.size, dtype='i8') colnums = self._extract_colnums() array = self._read_rec_with_var( colnums, rows, sortind, dtype, offsets, isvar, _vstorage) From 40d12b6cf82f97be970e85a33eb7f6dd915551bd Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Tue, 27 Jun 2023 11:05:16 -0400 Subject: [PATCH 18/20] remove test-i386 --- .github/workflows/tests-i386.yaml | 45 ------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 .github/workflows/tests-i386.yaml diff --git a/.github/workflows/tests-i386.yaml b/.github/workflows/tests-i386.yaml deleted file mode 100644 index b17c3d4b..00000000 --- a/.github/workflows/tests-i386.yaml +++ /dev/null @@ -1,45 +0,0 @@ -name: tests-i386 - -on: - push: - branches: - - master - pull_request: null - -jobs: - tests-i386: - name: tests-i386 - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest] - runs-on: ${{ matrix.os }} - - steps: - - name: cancel previous runs - uses: styfle/cancel-workflow-action@0.6.0 - with: - access_token: ${{ github.token }} - - - uses: actions/checkout@v2 - - - name: install deps - shell: bash -l {0} - run: | - sudo dpkg --add-architecture i386 - sudo apt-get update - sudo apt-get -y remove ubuntu-advantage-tools - sudo apt-get -y install --allow-downgrades gcc-multilib g++-multilib libgcc-s1:i386 libstdc++6:i386 libpcre3-dev:i386 libglib2.0-dev:i386 python3:i386 python3-apt:i386 libpython3-stdlib:i386 - - - name: install python deps - shell: bash -l {0} - run: | - echo skipping - # pip install numpy pytest - - - name: test build - shell: bash -l {0} - run: | - echo skipping - # pip install -e . - # SKIP_BZIP_TEST=true pytest -vv fitsio From bb744b9f2477e9584dfe425d8c0fa4f2175fd1d1 Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Tue, 27 Jun 2023 11:06:14 -0400 Subject: [PATCH 19/20] change log --- CHANGES.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 8afbf759..28c1a3cd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,14 @@ +version 1.1.10 (unreleased) +--------------------------- + +Changes + +Bug Fixes + + - Fix errors on 32 bit builds where default numpy integer + types were 32 rather than 64 bit assumed by the C code. + - Fix checks for rows being sent to C codes + version 1.1.9 ------------- From 566086e280c27d29f43fa1e5bc73681b52b61f4d Mon Sep 17 00:00:00 2001 From: Erin Sheldon Date: Tue, 27 Jun 2023 11:07:14 -0400 Subject: [PATCH 20/20] bump version --- 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 1cbc601b..cc54fcca 100644 --- a/fitsio/__init__.py +++ b/fitsio/__init__.py @@ -5,7 +5,7 @@ usage. """ -__version__ = '1.1.9' +__version__ = '1.1.10' from . import fitslib diff --git a/setup.py b/setup.py index bf33ec21..d2f6e4a1 100644 --- a/setup.py +++ b/setup.py @@ -267,7 +267,7 @@ def check_system_cfitsio_objects(self, obj_name): setup( name="fitsio", - version="1.1.9", + version="1.1.10", description=description, long_description=long_description, long_description_content_type='text/markdown; charset=UTF-8; variant=GFM',