Skip to content

Commit

Permalink
Pins astlib to 0.11.8 (#43)
Browse files Browse the repository at this point in the history
* Pins astlib to 0.11.8

Deals with a test breaking issue induced by Astlib 0.11.10 under setuptools 59.6.0 which affects Python 3.6 support.

The issue breaks existing tests. Until we migrate to test under Python 3.8 and Python 3.10 this should fix the existing tests.

* Drop Python3.6 from github ci tests - no longer supported
  • Loading branch information
bennahugo authored Jan 22, 2024
1 parent a0f50a3 commit 76f06d9
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/test_installation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ jobs:
matrix:
os: [ ubuntu-20.04, ubuntu-22.04 ]
python-version: ["3.8", "3.9", "3.10"]
include:
- os: ubuntu-20.04
python-version: 3.6

steps:
- uses: actions/checkout@v2
Expand Down
9 changes: 5 additions & 4 deletions .travis/py3.docker
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ RUN pip3 install -U pip setuptools wheel
#######################################
# Install python 3 meqtrees
#######################################

WORKDIR /code
ADD . /code/tigger-lsm
RUN pip3 install ./tigger-lsm

# add additional Timba dependencies
RUN docker-apt-install python3-pyqt4 python3-pyqt5
WORKDIR /src
Expand Down Expand Up @@ -42,10 +47,6 @@ RUN make
RUN make install
RUN ldconfig

WORKDIR /code
ADD . /code/tigger-lsm
RUN pip3 install ./tigger-lsm

RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.6 2
# basic install tests
RUN flag-ms.py --help
Expand Down
10 changes: 9 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,15 @@
__version__ = "1.7.3"

# PyQt 5 has not been added here are. It needs to be installed via apt-get which is a Tigger v1.6.0 requirement.
requirements = ['astro_kittens', 'numpy', 'scipy', 'astlib', 'astropy', 'future', 'python-casacore']
requirements = ['astro_kittens',
'numpy',
'scipy',
'astlib<=0.11.10; python_version >="3.8"',
'astlib<=0.11.8; python_version <"3.8"',
'astropy',
'future',
'python-casacore'
]

scripts = [
'Tigger/bin/tigger-convert',
Expand Down

0 comments on commit 76f06d9

Please sign in to comment.