Skip to content

Commit 3529d7d

Browse files
tammojantammojan
authored
Merge pull request #191 from casacore/prep-3.2.0
Prep 3.2.0
2 parents 88001d8 + 322a2c3 commit 3529d7d

File tree

10 files changed

+52
-40
lines changed

10 files changed

+52
-40
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
language: python
22
matrix:
33
include:
4-
- env: TARGET=py2_casacore_v3.1
5-
- env: TARGET=py3_casacore_v3.1
4+
- env: TARGET=py2_casacore_v3.2
5+
- env: TARGET=py3_casacore_v3.2
66
- env: TARGET=py2_casacore_master
77
- env: TARGET=py3_casacore_master
88
- env: TARGET=py2

.travis/py2_casacore_v3.1.docker renamed to .travis/py2_casacore_v3.2.docker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/casacore/casacore:v3.1
1+
FROM quay.io/casacore/casacore:v3.2
22
USER root
33
RUN docker-apt-install \
44
libboost-python-dev \

.travis/py3_casacore_v3.1.docker renamed to .travis/py3_casacore_v3.2.docker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/casacore/casacore:v3.1
1+
FROM quay.io/casacore/casacore:v3.2
22
USER root
33
RUN docker-apt-install \
44
libboost-python-dev \

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# 3.2.0
2+
3+
This version as a binary wheel ships with underlying casacore v3.2.0.
4+
5+
Changes are only in the underlying casacore.
6+
7+
18
# 3.1.1
29

310
This is the first release that will be supplied as binary wheels

‎casacore/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
__version__ = "3.1.1"
1+
__version__ = "3.2.0"
22
__mincasacoreversion__ = "2.3.0"

‎manylinux2010/wheel27.docker‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ WORKDIR /tmp
99
RUN curl http://www.iausofa.org/2015_0209_F/sofa_f-20150209_a.tar.gz --output /tmp/sofa.tgz
1010
RUN curl ftp://ftp.astron.nl/outgoing/Measures/WSRT_Measures.ztar --output /tmp/measures.tgz
1111
RUN curl ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib.tar.bz2 --output /tmp/wcslib.tar.bz2
12-
RUN curl https://github.com/casacore/casacore/archive/v3.1.1.tar.gz -L --output /tmp/casacore.tar.gz
12+
RUN curl https://github.com/casacore/casacore/archive/v3.2.0.tar.gz -L --output /tmp/casacore.tar.gz
1313
RUN curl https://ufpr.dl.sourceforge.net/project/boost/boost/1.70.0/boost_1_70_0.tar.bz2 --output /tmp/boost.tar.bz2
1414

1515
RUN mkdir /buid
@@ -18,9 +18,10 @@ WORKDIR /build
1818
# how many threads to use for compiling
1919
ENV THREADS 4
2020

21-
# build wcslib
22-
RUN tar jxvf /tmp/wcslib.tar.bz2
23-
WORKDIR /build/wcslib-6.2
21+
# build wcslib (latest version)
22+
RUN mkdir /build/wcslib
23+
RUN tar jxvf /tmp/wcslib.tar.bz2 -C /build/wcslib --strip-components=1
24+
WORKDIR /build/wcslib
2425
RUN ./configure
2526
RUN make -j${THREADS}
2627
RUN make install
@@ -55,9 +56,9 @@ RUN /opt/python/cp27-cp27mu/bin/pip install numpy
5556
# set up casacore
5657
WORKDIR /build
5758
RUN tar zxvf /tmp/casacore.tar.gz
58-
WORKDIR /build/casacore-3.1.1
59-
RUN mkdir -p /build/casacore-3.1.1/build
60-
WORKDIR /build/casacore-3.1.1/build
59+
WORKDIR /build/casacore-3.2.0
60+
RUN mkdir -p /build/casacore-3.2.0/build
61+
WORKDIR /build/casacore-3.2.0/build
6162
RUN cmake .. \
6263
-DSOFA_ROOT_DIR=/build \
6364
-DPYTHON2_EXECUTABLE=/opt/python/${TARGET}/bin/python \

‎manylinux2010/wheel34.docker‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ WORKDIR /tmp
99
RUN curl http://www.iausofa.org/2015_0209_F/sofa_f-20150209_a.tar.gz --output /tmp/sofa.tgz
1010
RUN curl ftp://ftp.astron.nl/outgoing/Measures/WSRT_Measures.ztar --output /tmp/measures.tgz
1111
RUN curl ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib.tar.bz2 --output /tmp/wcslib.tar.bz2
12-
RUN curl https://github.com/casacore/casacore/archive/v3.1.1.tar.gz -L --output /tmp/casacore.tar.gz
12+
RUN curl https://github.com/casacore/casacore/archive/v3.2.0.tar.gz -L --output /tmp/casacore.tar.gz
1313
RUN curl https://ufpr.dl.sourceforge.net/project/boost/boost/1.70.0/boost_1_70_0.tar.bz2 --output /tmp/boost.tar.bz2
1414

1515
RUN mkdir /buid
@@ -18,9 +18,10 @@ WORKDIR /build
1818
# how many threads to use for compiling
1919
ENV THREADS 4
2020

21-
# build wcslib
22-
RUN tar jxvf /tmp/wcslib.tar.bz2
23-
WORKDIR /build/wcslib-6.2
21+
# build wcslib (latest version)
22+
RUN mkdir /build/wcslib
23+
RUN tar jxvf /tmp/wcslib.tar.bz2 -C /build/wcslib --strip-components=1
24+
WORKDIR /build/wcslib
2425
RUN ./configure
2526
RUN make -j${THREADS}
2627
RUN make install
@@ -56,9 +57,9 @@ RUN /opt/python/${TARGET}/bin/pip install numpy
5657
# set up casacore
5758
WORKDIR /build
5859
RUN tar zxvf /tmp/casacore.tar.gz
59-
WORKDIR /build/casacore-3.1.1
60-
RUN mkdir -p /build/casacore-3.1.1/build
61-
WORKDIR /build/casacore-3.1.1/build
60+
WORKDIR /build/casacore-3.2.0
61+
RUN mkdir -p /build/casacore-3.2.0/build
62+
WORKDIR /build/casacore-3.2.0/build
6263
RUN cmake .. \
6364
-DSOFA_ROOT_DIR=/build \
6465
-DPYTHON3_EXECUTABLE=/opt/python/${TARGET}/bin/python \

‎manylinux2010/wheel35.docker‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ WORKDIR /tmp
99
RUN curl http://www.iausofa.org/2015_0209_F/sofa_f-20150209_a.tar.gz --output /tmp/sofa.tgz
1010
RUN curl ftp://ftp.astron.nl/outgoing/Measures/WSRT_Measures.ztar --output /tmp/measures.tgz
1111
RUN curl ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib.tar.bz2 --output /tmp/wcslib.tar.bz2
12-
RUN curl https://github.com/casacore/casacore/archive/v3.1.1.tar.gz -L --output /tmp/casacore.tar.gz
12+
RUN curl https://github.com/casacore/casacore/archive/v3.2.0.tar.gz -L --output /tmp/casacore.tar.gz
1313
RUN curl https://ufpr.dl.sourceforge.net/project/boost/boost/1.70.0/boost_1_70_0.tar.bz2 --output /tmp/boost.tar.bz2
1414

1515
RUN mkdir /buid
@@ -18,9 +18,10 @@ WORKDIR /build
1818
# how many threads to use for compiling
1919
ENV THREADS 4
2020

21-
# build wcslib
22-
RUN tar jxvf /tmp/wcslib.tar.bz2
23-
WORKDIR /build/wcslib-6.2
21+
# build wcslib (latest version)
22+
RUN mkdir /build/wcslib
23+
RUN tar jxvf /tmp/wcslib.tar.bz2 -C /build/wcslib --strip-components=1
24+
WORKDIR /build/wcslib
2425
RUN ./configure
2526
RUN make -j${THREADS}
2627
RUN make install
@@ -56,9 +57,9 @@ RUN /opt/python/${TARGET}/bin/pip install numpy
5657
# set up casacore
5758
WORKDIR /build
5859
RUN tar zxvf /tmp/casacore.tar.gz
59-
WORKDIR /build/casacore-3.1.1
60-
RUN mkdir -p /build/casacore-3.1.1/build
61-
WORKDIR /build/casacore-3.1.1/build
60+
WORKDIR /build/casacore-3.2.0
61+
RUN mkdir -p /build/casacore-3.2.0/build
62+
WORKDIR /build/casacore-3.2.0/build
6263
RUN cmake .. \
6364
-DSOFA_ROOT_DIR=/build \
6465
-DPYTHON3_EXECUTABLE=/opt/python/${TARGET}/bin/python \

‎manylinux2010/wheel36.docker‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ WORKDIR /tmp
99
RUN curl http://www.iausofa.org/2015_0209_F/sofa_f-20150209_a.tar.gz --output /tmp/sofa.tgz
1010
RUN curl ftp://ftp.astron.nl/outgoing/Measures/WSRT_Measures.ztar --output /tmp/measures.tgz
1111
RUN curl ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib.tar.bz2 --output /tmp/wcslib.tar.bz2
12-
RUN curl https://github.com/casacore/casacore/archive/v3.1.1.tar.gz -L --output /tmp/casacore.tar.gz
12+
RUN curl https://github.com/casacore/casacore/archive/v3.2.0.tar.gz -L --output /tmp/casacore.tar.gz
1313
RUN curl https://ufpr.dl.sourceforge.net/project/boost/boost/1.70.0/boost_1_70_0.tar.bz2 --output /tmp/boost.tar.bz2
1414

1515
RUN mkdir /buid
@@ -18,9 +18,10 @@ WORKDIR /build
1818
# how many threads to use for compiling
1919
ENV THREADS 4
2020

21-
# build wcslib
22-
RUN tar jxvf /tmp/wcslib.tar.bz2
23-
WORKDIR /build/wcslib-6.2
21+
# build wcslib (latest version)
22+
RUN mkdir /build/wcslib
23+
RUN tar jxvf /tmp/wcslib.tar.bz2 -C /build/wcslib --strip-components=1
24+
WORKDIR /build/wcslib
2425
RUN ./configure
2526
RUN make -j${THREADS}
2627
RUN make install
@@ -56,9 +57,9 @@ RUN /opt/python/${TARGET}/bin/pip install numpy
5657
# set up casacore
5758
WORKDIR /build
5859
RUN tar zxvf /tmp/casacore.tar.gz
59-
WORKDIR /build/casacore-3.1.1
60-
RUN mkdir -p /build/casacore-3.1.1/build
61-
WORKDIR /build/casacore-3.1.1/build
60+
WORKDIR /build/casacore-3.2.0
61+
RUN mkdir -p /build/casacore-3.2.0/build
62+
WORKDIR /build/casacore-3.2.0/build
6263
RUN cmake .. \
6364
-DSOFA_ROOT_DIR=/build \
6465
-DPYTHON3_EXECUTABLE=/opt/python/${TARGET}/bin/python \

‎manylinux2010/wheel37.docker‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ WORKDIR /tmp
99
RUN curl http://www.iausofa.org/2015_0209_F/sofa_f-20150209_a.tar.gz --output /tmp/sofa.tgz
1010
RUN curl ftp://ftp.astron.nl/outgoing/Measures/WSRT_Measures.ztar --output /tmp/measures.tgz
1111
RUN curl ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib.tar.bz2 --output /tmp/wcslib.tar.bz2
12-
RUN curl https://github.com/casacore/casacore/archive/v3.1.1.tar.gz -L --output /tmp/casacore.tar.gz
12+
RUN curl https://github.com/casacore/casacore/archive/v3.2.0.tar.gz -L --output /tmp/casacore.tar.gz
1313
RUN curl https://ufpr.dl.sourceforge.net/project/boost/boost/1.70.0/boost_1_70_0.tar.bz2 --output /tmp/boost.tar.bz2
1414

1515
RUN mkdir /buid
@@ -18,9 +18,10 @@ WORKDIR /build
1818
# how many threads to use for compiling
1919
ENV THREADS 4
2020

21-
# build wcslib
22-
RUN tar jxvf /tmp/wcslib.tar.bz2
23-
WORKDIR /build/wcslib-6.2
21+
# build wcslib (latest version)
22+
RUN mkdir /build/wcslib
23+
RUN tar jxvf /tmp/wcslib.tar.bz2 -C /build/wcslib --strip-components=1
24+
WORKDIR /build/wcslib
2425
RUN ./configure
2526
RUN make -j${THREADS}
2627
RUN make install
@@ -56,9 +57,9 @@ RUN /opt/python/${TARGET}/bin/pip install numpy
5657
# set up casacore
5758
WORKDIR /build
5859
RUN tar zxvf /tmp/casacore.tar.gz
59-
WORKDIR /build/casacore-3.1.1
60-
RUN mkdir -p /build/casacore-3.1.1/build
61-
WORKDIR /build/casacore-3.1.1/build
60+
WORKDIR /build/casacore-3.2.0
61+
RUN mkdir -p /build/casacore-3.2.0/build
62+
WORKDIR /build/casacore-3.2.0/build
6263
RUN cmake .. \
6364
-DSOFA_ROOT_DIR=/build \
6465
-DPYTHON3_EXECUTABLE=/opt/python/${TARGET}/bin/python \

0 commit comments

Comments
 (0)