Skip to content

Commit b98463c

Browse files
committed
Move version to __version__ file, update to 3.0
1 parent c4b93da commit b98463c

File tree

5 files changed

+19
-8
lines changed

5 files changed

+19
-8
lines changed

README.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Data Analysis of Real-time Candidates from the Apertif Radio Transient System
44
[![DOI](https://zenodo.org/badge/165673299.svg)](https://zenodo.org/badge/latestdoi/165673299)[![Build Status](https://travis-ci.com/loostrum/darc.svg?branch=master)](https://travis-ci.com/loostrum/darc)
55

66
This repository contains the necessary software to automatically process FRB candidates produced by the ARTS real-time system.
7-
As of February 2020, DARC has discovered 11 FRBs.
7+
As of Summer 2020, DARC has discovered 18 new FRBs and several bursts from known repeaters.
88

99
### Installation
1010

@@ -18,13 +18,14 @@ The following packages are automatically installed when installing DARC through
1818
* h5py
1919
* matplotlib
2020
* numpy
21+
* pypdf4
2122
* pytz
2223
* pyyaml
2324
* scipy
2425
* voevent-parse
2526

26-
To install a DARC release, for example v2.0:
27-
`pip install git+https://github.com/loostrum/darc/archive/v2.0.tar.gz`
27+
To install a DARC release, for example v3.0:
28+
`pip install git+https://github.com/loostrum/darc/archive/v3.0.tar.gz`
2829
To install the latest master:
2930
`pip install git+https://github.com/loostrum/darc.git`
3031

@@ -52,9 +53,9 @@ DARC comprises several parts that communicate through either queues or sockets.
5253

5354

5455
### Usage
55-
Note: This example is specific to the ARTS cluster and assumes you are logged in to the ARTS master node. The python 3.6 virtual env (`. ~/python36/bin/activate`) needs to be activated to be able to run DARC commands manually. Always start DARC on the master node before starting it on other nodes. DARC can be started automatically across the cluster by running `start_full_pipeline` and stopped with `stop_full_pipeline`.
56+
Note: This example is specific to the ARTS cluster and assumes you are logged in to the ARTS master node. The python virtual env (`. ~/darc/venv/bin/activate`) needs to be activated to be able to run DARC commands manually. Always start DARC on the master node before starting it on other nodes. DARC can be started automatically across the cluster by running `start_full_pipeline` and stopped with `stop_full_pipeline`.
5657

57-
Start DARC (e.g. on the master and arts001): `darc_start_all_services; ssh arts001 . ~/python36/bin/activate && darc_start_all_services`
58+
Start DARC (e.g. on the master and arts001): `darc_start_all_services; ssh arts001 . ~/darc/venv/bin/activate && darc_start_all_services`
5859
Verify that all services are running: `darc --host arts001 --service all status`
5960
Check the log file of a specific service: `tail ~/darc/log/amber_clustering.arts001.log`
6061
Restart a specific service: `darc --host arts001 --service amber_clustering restart`

darc/__init__.py

+2
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@
1111
from .offline_processing import OfflineProcessing
1212
from .status_website import StatusWebsite
1313
from .darc_master import DARCMaster
14+
15+
from .__version__ import __version__

darc/__version__.py

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__version__ = '3.0'

docs/conf.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#
1313
import os
1414
import sys
15+
from darc import __version__
1516
sys.path.insert(0, os.path.abspath('..'))
1617
autodoc_mock_imports = ['tensorflow']
1718

@@ -29,7 +30,7 @@
2930
author = 'Leon Oostrum'
3031

3132
# The full version, including alpha/beta/rc tags
32-
release = '2.1'
33+
release = __version__
3334

3435

3536
# -- General configuration ---------------------------------------------------

setup.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22

3+
import os
34
from setuptools import setup, find_packages
45

6+
with open(os.path.join('darc', '__version__.py')) as version_file:
7+
version = {}
8+
exec(version_file.read(), version)
9+
project_version = version['__version__']
10+
511

612
setup(name='darc',
7-
version='2.1',
13+
version=project_version,
814
description='Data Analysis of Real-time Candidates from ARTS',
915
url='http://github.com/loostrum/darc',
1016
author='Leon Oostrum',

0 commit comments

Comments
 (0)