diff --git a/.travis.yml b/.travis.yml index accf6174..b58a8710 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: python matrix: include: - - env: TARGET=py2_casacore_v3.1 - - env: TARGET=py3_casacore_v3.1 + - env: TARGET=py2_casacore_v3.2 + - env: TARGET=py3_casacore_v3.2 - env: TARGET=py2_casacore_master - env: TARGET=py3_casacore_master - env: TARGET=py2 diff --git a/.travis/py2_casacore_v3.1.docker b/.travis/py2_casacore_v3.2.docker similarity index 91% rename from .travis/py2_casacore_v3.1.docker rename to .travis/py2_casacore_v3.2.docker index db66f70c..0cbf038d 100644 --- a/.travis/py2_casacore_v3.1.docker +++ b/.travis/py2_casacore_v3.2.docker @@ -1,4 +1,4 @@ -FROM quay.io/casacore/casacore:v3.1 +FROM quay.io/casacore/casacore:v3.2 USER root RUN docker-apt-install \ libboost-python-dev \ diff --git a/.travis/py3_casacore_v3.1.docker b/.travis/py3_casacore_v3.2.docker similarity index 91% rename from .travis/py3_casacore_v3.1.docker rename to .travis/py3_casacore_v3.2.docker index 48d42533..463d86e0 100644 --- a/.travis/py3_casacore_v3.1.docker +++ b/.travis/py3_casacore_v3.2.docker @@ -1,4 +1,4 @@ -FROM quay.io/casacore/casacore:v3.1 +FROM quay.io/casacore/casacore:v3.2 USER root RUN docker-apt-install \ libboost-python-dev \ diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a9746f0..83f97774 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# 3.2.0 + +This version as a binary wheel ships with underlying casacore v3.2.0. + +Changes are only in the underlying casacore. + + # 3.1.1 This is the first release that will be supplied as binary wheels diff --git a/casacore/__init__.py b/casacore/__init__.py index fe94370f..7619a02f 100644 --- a/casacore/__init__.py +++ b/casacore/__init__.py @@ -1,2 +1,2 @@ -__version__ = "3.1.1" +__version__ = "3.2.0" __mincasacoreversion__ = "2.3.0" diff --git a/manylinux2010/wheel27.docker b/manylinux2010/wheel27.docker index 00c17811..d7726126 100644 --- a/manylinux2010/wheel27.docker +++ b/manylinux2010/wheel27.docker @@ -9,7 +9,7 @@ WORKDIR /tmp RUN curl http://www.iausofa.org/2015_0209_F/sofa_f-20150209_a.tar.gz --output /tmp/sofa.tgz RUN curl ftp://ftp.astron.nl/outgoing/Measures/WSRT_Measures.ztar --output /tmp/measures.tgz RUN curl ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib.tar.bz2 --output /tmp/wcslib.tar.bz2 -RUN curl https://github.com/casacore/casacore/archive/v3.1.1.tar.gz -L --output /tmp/casacore.tar.gz +RUN curl https://github.com/casacore/casacore/archive/v3.2.0.tar.gz -L --output /tmp/casacore.tar.gz RUN curl https://ufpr.dl.sourceforge.net/project/boost/boost/1.70.0/boost_1_70_0.tar.bz2 --output /tmp/boost.tar.bz2 RUN mkdir /buid @@ -18,9 +18,10 @@ WORKDIR /build # how many threads to use for compiling ENV THREADS 4 -# build wcslib -RUN tar jxvf /tmp/wcslib.tar.bz2 -WORKDIR /build/wcslib-6.2 +# build wcslib (latest version) +RUN mkdir /build/wcslib +RUN tar jxvf /tmp/wcslib.tar.bz2 -C /build/wcslib --strip-components=1 +WORKDIR /build/wcslib RUN ./configure RUN make -j${THREADS} RUN make install @@ -55,9 +56,9 @@ RUN /opt/python/cp27-cp27mu/bin/pip install numpy # set up casacore WORKDIR /build RUN tar zxvf /tmp/casacore.tar.gz -WORKDIR /build/casacore-3.1.1 -RUN mkdir -p /build/casacore-3.1.1/build -WORKDIR /build/casacore-3.1.1/build +WORKDIR /build/casacore-3.2.0 +RUN mkdir -p /build/casacore-3.2.0/build +WORKDIR /build/casacore-3.2.0/build RUN cmake .. \ -DSOFA_ROOT_DIR=/build \ -DPYTHON2_EXECUTABLE=/opt/python/${TARGET}/bin/python \ diff --git a/manylinux2010/wheel34.docker b/manylinux2010/wheel34.docker index f12e9699..6c9200ce 100644 --- a/manylinux2010/wheel34.docker +++ b/manylinux2010/wheel34.docker @@ -9,7 +9,7 @@ WORKDIR /tmp RUN curl http://www.iausofa.org/2015_0209_F/sofa_f-20150209_a.tar.gz --output /tmp/sofa.tgz RUN curl ftp://ftp.astron.nl/outgoing/Measures/WSRT_Measures.ztar --output /tmp/measures.tgz RUN curl ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib.tar.bz2 --output /tmp/wcslib.tar.bz2 -RUN curl https://github.com/casacore/casacore/archive/v3.1.1.tar.gz -L --output /tmp/casacore.tar.gz +RUN curl https://github.com/casacore/casacore/archive/v3.2.0.tar.gz -L --output /tmp/casacore.tar.gz RUN curl https://ufpr.dl.sourceforge.net/project/boost/boost/1.70.0/boost_1_70_0.tar.bz2 --output /tmp/boost.tar.bz2 RUN mkdir /buid @@ -18,9 +18,10 @@ WORKDIR /build # how many threads to use for compiling ENV THREADS 4 -# build wcslib -RUN tar jxvf /tmp/wcslib.tar.bz2 -WORKDIR /build/wcslib-6.2 +# build wcslib (latest version) +RUN mkdir /build/wcslib +RUN tar jxvf /tmp/wcslib.tar.bz2 -C /build/wcslib --strip-components=1 +WORKDIR /build/wcslib RUN ./configure RUN make -j${THREADS} RUN make install @@ -56,9 +57,9 @@ RUN /opt/python/${TARGET}/bin/pip install numpy # set up casacore WORKDIR /build RUN tar zxvf /tmp/casacore.tar.gz -WORKDIR /build/casacore-3.1.1 -RUN mkdir -p /build/casacore-3.1.1/build -WORKDIR /build/casacore-3.1.1/build +WORKDIR /build/casacore-3.2.0 +RUN mkdir -p /build/casacore-3.2.0/build +WORKDIR /build/casacore-3.2.0/build RUN cmake .. \ -DSOFA_ROOT_DIR=/build \ -DPYTHON3_EXECUTABLE=/opt/python/${TARGET}/bin/python \ diff --git a/manylinux2010/wheel35.docker b/manylinux2010/wheel35.docker index 31b06854..216b7add 100644 --- a/manylinux2010/wheel35.docker +++ b/manylinux2010/wheel35.docker @@ -9,7 +9,7 @@ WORKDIR /tmp RUN curl http://www.iausofa.org/2015_0209_F/sofa_f-20150209_a.tar.gz --output /tmp/sofa.tgz RUN curl ftp://ftp.astron.nl/outgoing/Measures/WSRT_Measures.ztar --output /tmp/measures.tgz RUN curl ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib.tar.bz2 --output /tmp/wcslib.tar.bz2 -RUN curl https://github.com/casacore/casacore/archive/v3.1.1.tar.gz -L --output /tmp/casacore.tar.gz +RUN curl https://github.com/casacore/casacore/archive/v3.2.0.tar.gz -L --output /tmp/casacore.tar.gz RUN curl https://ufpr.dl.sourceforge.net/project/boost/boost/1.70.0/boost_1_70_0.tar.bz2 --output /tmp/boost.tar.bz2 RUN mkdir /buid @@ -18,9 +18,10 @@ WORKDIR /build # how many threads to use for compiling ENV THREADS 4 -# build wcslib -RUN tar jxvf /tmp/wcslib.tar.bz2 -WORKDIR /build/wcslib-6.2 +# build wcslib (latest version) +RUN mkdir /build/wcslib +RUN tar jxvf /tmp/wcslib.tar.bz2 -C /build/wcslib --strip-components=1 +WORKDIR /build/wcslib RUN ./configure RUN make -j${THREADS} RUN make install @@ -56,9 +57,9 @@ RUN /opt/python/${TARGET}/bin/pip install numpy # set up casacore WORKDIR /build RUN tar zxvf /tmp/casacore.tar.gz -WORKDIR /build/casacore-3.1.1 -RUN mkdir -p /build/casacore-3.1.1/build -WORKDIR /build/casacore-3.1.1/build +WORKDIR /build/casacore-3.2.0 +RUN mkdir -p /build/casacore-3.2.0/build +WORKDIR /build/casacore-3.2.0/build RUN cmake .. \ -DSOFA_ROOT_DIR=/build \ -DPYTHON3_EXECUTABLE=/opt/python/${TARGET}/bin/python \ diff --git a/manylinux2010/wheel36.docker b/manylinux2010/wheel36.docker index 6db87b3d..ba22852f 100644 --- a/manylinux2010/wheel36.docker +++ b/manylinux2010/wheel36.docker @@ -9,7 +9,7 @@ WORKDIR /tmp RUN curl http://www.iausofa.org/2015_0209_F/sofa_f-20150209_a.tar.gz --output /tmp/sofa.tgz RUN curl ftp://ftp.astron.nl/outgoing/Measures/WSRT_Measures.ztar --output /tmp/measures.tgz RUN curl ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib.tar.bz2 --output /tmp/wcslib.tar.bz2 -RUN curl https://github.com/casacore/casacore/archive/v3.1.1.tar.gz -L --output /tmp/casacore.tar.gz +RUN curl https://github.com/casacore/casacore/archive/v3.2.0.tar.gz -L --output /tmp/casacore.tar.gz RUN curl https://ufpr.dl.sourceforge.net/project/boost/boost/1.70.0/boost_1_70_0.tar.bz2 --output /tmp/boost.tar.bz2 RUN mkdir /buid @@ -18,9 +18,10 @@ WORKDIR /build # how many threads to use for compiling ENV THREADS 4 -# build wcslib -RUN tar jxvf /tmp/wcslib.tar.bz2 -WORKDIR /build/wcslib-6.2 +# build wcslib (latest version) +RUN mkdir /build/wcslib +RUN tar jxvf /tmp/wcslib.tar.bz2 -C /build/wcslib --strip-components=1 +WORKDIR /build/wcslib RUN ./configure RUN make -j${THREADS} RUN make install @@ -56,9 +57,9 @@ RUN /opt/python/${TARGET}/bin/pip install numpy # set up casacore WORKDIR /build RUN tar zxvf /tmp/casacore.tar.gz -WORKDIR /build/casacore-3.1.1 -RUN mkdir -p /build/casacore-3.1.1/build -WORKDIR /build/casacore-3.1.1/build +WORKDIR /build/casacore-3.2.0 +RUN mkdir -p /build/casacore-3.2.0/build +WORKDIR /build/casacore-3.2.0/build RUN cmake .. \ -DSOFA_ROOT_DIR=/build \ -DPYTHON3_EXECUTABLE=/opt/python/${TARGET}/bin/python \ diff --git a/manylinux2010/wheel37.docker b/manylinux2010/wheel37.docker index 76675f9f..2ae96966 100644 --- a/manylinux2010/wheel37.docker +++ b/manylinux2010/wheel37.docker @@ -9,7 +9,7 @@ WORKDIR /tmp RUN curl http://www.iausofa.org/2015_0209_F/sofa_f-20150209_a.tar.gz --output /tmp/sofa.tgz RUN curl ftp://ftp.astron.nl/outgoing/Measures/WSRT_Measures.ztar --output /tmp/measures.tgz RUN curl ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib.tar.bz2 --output /tmp/wcslib.tar.bz2 -RUN curl https://github.com/casacore/casacore/archive/v3.1.1.tar.gz -L --output /tmp/casacore.tar.gz +RUN curl https://github.com/casacore/casacore/archive/v3.2.0.tar.gz -L --output /tmp/casacore.tar.gz RUN curl https://ufpr.dl.sourceforge.net/project/boost/boost/1.70.0/boost_1_70_0.tar.bz2 --output /tmp/boost.tar.bz2 RUN mkdir /buid @@ -18,9 +18,10 @@ WORKDIR /build # how many threads to use for compiling ENV THREADS 4 -# build wcslib -RUN tar jxvf /tmp/wcslib.tar.bz2 -WORKDIR /build/wcslib-6.2 +# build wcslib (latest version) +RUN mkdir /build/wcslib +RUN tar jxvf /tmp/wcslib.tar.bz2 -C /build/wcslib --strip-components=1 +WORKDIR /build/wcslib RUN ./configure RUN make -j${THREADS} RUN make install @@ -56,9 +57,9 @@ RUN /opt/python/${TARGET}/bin/pip install numpy # set up casacore WORKDIR /build RUN tar zxvf /tmp/casacore.tar.gz -WORKDIR /build/casacore-3.1.1 -RUN mkdir -p /build/casacore-3.1.1/build -WORKDIR /build/casacore-3.1.1/build +WORKDIR /build/casacore-3.2.0 +RUN mkdir -p /build/casacore-3.2.0/build +WORKDIR /build/casacore-3.2.0/build RUN cmake .. \ -DSOFA_ROOT_DIR=/build \ -DPYTHON3_EXECUTABLE=/opt/python/${TARGET}/bin/python \