diff --git a/.travis/mypy.docker b/.ci/mypy.docker similarity index 100% rename from .travis/mypy.docker rename to .ci/mypy.docker diff --git a/.travis/pep8.docker b/.ci/pep8.docker similarity index 100% rename from .travis/pep8.docker rename to .ci/pep8.docker diff --git a/.travis/py3.docker b/.ci/py3.docker similarity index 95% rename from .travis/py3.docker rename to .ci/py3.docker index 8e8c5a4..047eff2 100644 --- a/.travis/py3.docker +++ b/.ci/py3.docker @@ -5,7 +5,7 @@ RUN docker-apt-install python3-casacore casacore-dev casacore-data makems casare libfftw3-dev wcslib-dev libcfitsio-dev \ 'libcasa-*' liblapack-dev libatlas-base-dev 2to3 -RUN pip install -U pip setuptools wheel +RUN pip install -U pip 'setuptools[core]' wheel ####################################### # Install python 3 meqtrees ####################################### diff --git a/.github/workflows/test_installation.yml b/.github/workflows/test_installation.yml index ce7041f..65b560a 100644 --- a/.github/workflows/test_installation.yml +++ b/.github/workflows/test_installation.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: os: [ ubuntu-20.04, ubuntu-22.04 ] - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v2 diff --git a/Jenkinsfile.sh b/Jenkinsfile.sh index 06555f6..c216ea5 100644 --- a/Jenkinsfile.sh +++ b/Jenkinsfile.sh @@ -21,4 +21,4 @@ cd $PROJECTS_DIR/meqtrees-tigger-lsm IMAGENAME="mttiglsmpr" # build and test -docker build -f .travis/py3.docker -t "${IMAGENAME}36:$BUILD_NUMBER" --no-cache=true . +docker build -f .ci/py3.docker -t "${IMAGENAME}36:$BUILD_NUMBER" --no-cache=true . diff --git a/Tigger/bin/tigger_tag.py b/Tigger/bin/tigger_tag.py index dabbfba..f4cc905 100644 --- a/Tigger/bin/tigger_tag.py +++ b/Tigger/bin/tigger_tag.py @@ -257,7 +257,7 @@ def lookupObject(src, tagname): for arg in rem_args[1:]: # Match either the SELTAG<>SELVAL, or the TAG=[TYPE:]VALUE, or the [+!/]TAG forms # If none match, assume the NAME form - mselcomp = re.match("^(?i)([^=<>!.]+)(%s)([^dms]+)([dms])?" % "|".join( + mselcomp = re.match("(?i)^([^=<>!.]+)(%s)([^dms]+)([dms])?" % "|".join( [key.replace('.', '\.') for key in list(select_predicates.keys())]), arg) mseltag = re.match("=(.+)$", arg) mset = re.match("^(.+)=((bool|int|str|float|complex):)?(.+)$", arg) diff --git a/pyproject.toml b/pyproject.toml index 3e46ad4..f0f3f63 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,13 +12,23 @@ packages = [ [tool.poetry.dependencies] python = "^3.8" astro-kittens = "^1.4.6" -numpy = "*" -scipy = "*" +numpy = [ + { version = ">=2.0.0", python = ">=3.12"}, + { version = "<2.0.0", python = ">=3.8, <3.12"} +] +scipy = [ + { version = ">=1.13.0", python = ">=3.12"}, + { version = "<1.13.0", python = ">=3.8, <3.12"} +] astlib = [ - { version = "<=0.11.10", python = ">=3.8"}, - { version = "<=0.11.8", python = "<=3.8"} + { version = ">=0.12.0", python = ">=3.12"}, + { version = "<=0.11.10", python = ">=3.8, <3.12"}, + { version = "<=0.11.8", python = "<3.8"} +] +astropy = [ + { version = ">=6.1.0", python = ">=3.12"}, + { version = "<6.1.0", python = ">=3.8, <3.12"} ] -astropy = "*" future = "*" python-casacore = "*" meqtrees-cattery = "^1.7.9"