Skip to content

Commit dd18134

Browse files
committed
repackage for auto pypi and docker build
1 parent 037c955 commit dd18134

File tree

9 files changed

+135
-93
lines changed

9 files changed

+135
-93
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,5 @@ docs/_build/
5555

5656
# PyBuilder
5757
target/
58+
59+
MANIFEST

.travis.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
language: python
2+
sudo: false
3+
python:
4+
- '2.7'
5+
install:
6+
- python setup.py install
7+
script:
8+
- true
9+
deploy:
10+
provider: pypi
11+
user: gijzelaerr
12+
password:
13+
secure: VWyae9s3GPw7nL9J5G82DsW+8Qp/26GCyWKUbCBUuNoL5uWXRFk5Hz5sCbxYJwQU7iGKe6Ms948XaoB4PNOdIqzS19r+HfFbeP++J3mur6QjKG4qVm5xgggE+pJHigDRKYDSdYd/LaX4rqKYbhvJMQ6DXD90VMuboNXvTMD6yH8xxCDtl2/HlPfmYu9+z6alc9cknNGYz3KvMPGtv3zyZfwQ/yHffAuRjXdufMti/tCDNLdQFEwCELUQklTsrVuUS1UIr3FuWwLZQenGRaE342MRvhKbX7Iz4/LxbLKb9V7Ifp76k78xaEQ57HFKw1ZICZegPEDo/rpy2IZVfh3me49MIZJs8qNvTvUfcZ9tgvTZS2fpyxGkxw1RaiDIjpPD7YRssglHbZE4kUhzkC3/k1n8OwTerhVZ/g2Q//FmAFf3l5lp0/UI7CH8zv8wJU4Szlm9I0eMBaccAKdduDlhu+bdOdMpm1/BkYBimkeA1RmlJTZ+GkaHRC1uz6YKA0Ilk+8eibGeZCuUtFzvi5rnapa0o09N8q5PwQaY7b3ugZZ0fPALcLNJMDFgupmynqo8ACd99DLRquZP89PhfJAy2tYEXdV1kz/K/lt6zlliKv3G8iCMM2RhqDrMBTJ6zbGXJiPvFTgAE/5YuhNTzazKCnBbDdMQXA19uGr0sVGripI=
14+
on:
15+
tags: true
16+
repo: radio-astro/sourcery

Dockerfile

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
FROM radioastro/base:0.2
2+
3+
MAINTAINER gijsmolenaar@gmail.com
4+
5+
RUN apt-get update && \
6+
apt-get install -y \
7+
lofar \
8+
python-numpy \
9+
python-scipy \
10+
python-astlib \
11+
python-tigger \
12+
&& \
13+
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
14+
15+
ADD . /tmp/sourcery
16+
17+
RUN cd /tmp/sourcery && pip install .
18+
19+
CMD python /usr/local/bin/sourcery

MANIFEST.in

Whitespace-only changes.

Makefile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
DOCKER_REPO=radioastro/sourcery:1.2.5
2+
3+
.PHONY: build clean
4+
5+
all: build
6+
7+
build:
8+
docker build -t ${DOCKER_REPO} .
9+
10+
run:
11+
docker run -ti ${DOCKER_REPO}
12+
13+
clean:
14+
docker rmi ${DOCKER_REPO}
15+
16+
upload: build
17+
docker push ${DOCKER_REPO}

README.md

Lines changed: 0 additions & 84 deletions
This file was deleted.

README.rst

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
========
2+
sourcery
3+
========
4+
5+
Tools for creating high fidelity source catalogues from radio interferometric datasets.
6+
It also provides a tool for selecting sources responsible for artifacts in an image.
7+
8+
Requires
9+
========
10+
11+
* pybdsm (part lofar software package)
12+
* tigger
13+
* numpy
14+
* scipy
15+
* astlib
16+
17+
You can find ubuntu packages for tigger, astlib, lofar on `radio-astro ppa <https://launchpad.net/~radio-astro/+archive/ubuntu/main>`_. You may need to build the them source for other distributions, in that case find the source at the `ska-sa github repo <https://github.com/ska-sa>`_.
18+
19+
20+
Install
21+
=======
22+
23+
Pip
24+
---
25+
26+
::
27+
28+
$ pip install sourcery
29+
30+
Direct build
31+
------------
32+
33+
::
34+
35+
$ git clone github.com/SpheMakh/sourcery
36+
$ cd sourcery
37+
$ pip install .
38+
39+
40+
Running command
41+
---------------
42+
43+
Using defaults::
44+
45+
sourcery -i fitsimage -p psfimage
46+
47+
For changing parameters::
48+
49+
sourcery -h
50+
51+
If using config.json:
52+
53+
1. Provide a -pref on the command line, e.g::
54+
55+
-prefix KAT7_DIRECTORY
56+
57+
2. You can either provide image input name inside the config file or on the comand line.
58+
In case you provide the input image inside the cofig.json only a single image can be executed per config file.
59+
But if providing the input image on the command line then more than one image can be specified and exceuted.
60+
One can use both the config file and the command line such as::
61+
62+
sourcery -i kat7.fits,kat8.fits -p kat7psf.fits -jc config.json
63+
64+
In which the parameter settings used are specified in config.json and the image to be executed are kat7.fits, kat8.fits etc.
65+
66+
If using the command line alone then sourcery -h should be your friend.
67+
Note more than one image can be specfied::
68+
69+
sourcery -i kat7.fits,kat8.fits -p kat7psf.fits
70+
71+
The psf "kat7psf.fits" in this case will be used for both images, if each image has its own psf then provide this excplicitly as::
72+
sourcery -i kat7.fits,kat8.fits -p kat7psf.fits,kat8psf.fits
73+

Sourcery/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.1.8"
1+
__version__ = "0.2.5"

setup.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
#!/usr/bin/env python
22

33
import os
4-
from distutils.core import setup
4+
from setuptools import setup, find_packages
55
import Sourcery
66

77
setup(name="sourcery",
88
version=Sourcery.__version__,
99
description="Tools for creating high fidelity source catalogues from radio interferometric datasets",
1010
author="Lerato Sebokolodi",
11-
author_email="Lerato Sebokolodi <mll.sebokolodi@gmail.com>",
12-
url="https://github.com/sphemakh/sourcery",
13-
packages=["Sourcery"],
14-
requires=["numpy", "matplotlib", "scipy", "astlib", "pyfits", "tigger"],
11+
author_email="mll.sebokolodi@gmail.com",
12+
url="https://github.com/radio-astro/sourcery",
13+
packages=find_packages(),
14+
requires=["setuptools", "numpy", "matplotlib", "scipy", "astlib", "pyfits", "tigger"],
1515
scripts=["Sourcery/bin/" + i for i in os.listdir("Sourcery/bin")],
16-
licence="This program should come with the GNU General Public Licence. "\
17-
"If not, find it at http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html",
16+
license="GPL2",
1817
classifiers=[],
19-
)
18+
)

0 commit comments

Comments
 (0)