Skip to content
Snippets Groups Projects
Commit 3243eef5 authored by Nico Vermaas's avatar Nico Vermaas
Browse files

remove atdb_interface package

parent e57c1e83
No related branches found
No related tags found
No related merge requests found
Showing
with 4 additions and 957 deletions
......@@ -41,6 +41,8 @@ Deployment Diagram:
> export DOCKER_BUILD_DIR=$HOME/my_docker/atdb-ldv/atdb-ldv/atdb
> export DOCKER_COMPOSE_DIR=$DOCKER_BUILD_DIR/docker
> cd $DOCKER_BUILD_DIR
> git pull
> cd $DOCKER_COMPOSE_DIR
> docker-compose -p atdb up -d
......
......@@ -111,7 +111,6 @@ class Observation(TaskObject):
end_band = models.IntegerField(null=True)
# ARTS SC4
process_triggers = models.BooleanField(default=False)
beams = models.CharField(max_length=255, default="0..39")
quality = models.CharField(max_length=30, default="unknown")
......
......@@ -57,7 +57,7 @@ class ObservationSerializer(serializers.ModelSerializer):
'generated_dataproducts','telescopes',
'data_location', 'irods_collection','node','control_parameters',
'skip_auto_ingest','observing_mode','science_mode','parset_location',
'par_file_name','number_of_bins','start_band','end_band','process_triggers','beams', 'delay_center_offset',
'par_file_name','number_of_bins','start_band','end_band','beams', 'delay_center_offset',
'locality_policy','max_lifetime_on_disk','quality','science_observation','filler','ingest_progress',
'timestamp_starting','timestamp_running','timestamp_completing',
'timestamp_ingesting','timestamp_archived','timestamp_aborted','timestamp_ingest_error')
......
......@@ -46,7 +46,7 @@
</div>
{% include 'taskdatabase/pagination.html' %}
</div>
<p class="footer"> Version 2.0.0 (11 dec 2020)</p>
<p class="footer"> Version 2.0.0 (15 dec 2020 - 08:00)</p>
<script type="text/javascript">
(function(seconds) {
......
......@@ -48,7 +48,6 @@ class ObservationFilter(filters.FilterSet):
'irods_collection': ['exact', 'icontains'],
'node': ['exact', 'in'],
'skip_auto_ingest': ['exact'],
'process_triggers': ['exact'],
'beams': ['exact', 'icontains'],
'delay_center_offset': ['exact', 'icontains'],
'quality': ['exact', 'icontains'],
......
atdb_interface
==============
This module contains a service that run standalone and interact with the Apertif Task Database REST API.
See 'atdb_interface -h' for help and 'atdb_interface -e' for examples.
This package is required when using atdb_services
Installing
^^^^^^^^^^
To install a version from Nexus repository use::
> pip install <<nexus url>> --upgrade
or download and install the tarball,
> pip install atdb_interface.tar.gz --upgrade
Within the development environment such as with PyCharm one can install the package within the virtualenv with which
PyCharm is configured. To avoid uninstall and install after each code change pip can install packages within development
mode::
(.env) > pip install -e ..project../atdb_interface_pip --upgrade
This will install the package with soft links to the original code, such that one gets immediate refresh within PyCharm,
which is used for refactoring, code completion, imports etc.
Uninstalling
^^^^^^^^^^^^
Uninstall is trivial using the command (watch out for the '-')::
> pip uninstall atdb-interface
or without confirmation::
> pip uninstall --yes atdb-interface
\ No newline at end of file
Metadata-Version: 1.0
Name: atdb-interface
Version: 1.2.9
Summary: ATDB interface
Home-page: https://www.astron.nl/wsrt/wiki/doku.php?id=atdb:atdb_interface
Author: Nico Vermaas - Astron
Author-email: vermaas@astron.nl
License: BSD
Description: UNKNOWN
Platform: UNKNOWN
README.rst
setup.py
atdb_interface/__init__.py
atdb_interface/atdb_interface.py
atdb_interface.egg-info/PKG-INFO
atdb_interface.egg-info/SOURCES.txt
atdb_interface.egg-info/dependency_links.txt
atdb_interface.egg-info/entry_points.txt
atdb_interface.egg-info/requires.txt
atdb_interface.egg-info/top_level.txt
\ No newline at end of file
[console_scripts]
atdb_interface = atdb_interface.atdb_interface:main
requests
atdb_interface
This diff is collapsed.
--operation=POST
--key=dataproducts
--payload={name=WSRTA180223003_B003.MS,filename=WSRTA180223003_B003.MS,description=WSRTA180223003_B003.MS,dataproduct_type=visibility,taskID=180223003,size=54321,quality=raw,new_status=defined,new_location=datawriter}
#!/bin/bash
# This script make a source distribution for the pip installable package in the current folder
echo "Build a source distribution for ATDB interface"
python --version
# Explicit give format otherwise a zip is created (Windows?)
python setup.py sdist --formats=gztar
# Next command will not close the window, can be handy if something goes wrong
#exec $SHELL
\ No newline at end of file
File deleted
File deleted
from setuptools import setup, find_packages
def readme():
with open('README.rst') as f:
return f.read()
setup(name='atdb_interface',
version='1.2.9',
description='ATDB interface',
url='https://www.astron.nl/wsrt/wiki/doku.php?id=atdb:atdb_interface',
author='Nico Vermaas - Astron',
author_email='vermaas@astron.nl',
license='BSD',
install_requires=['requests'],
packages=find_packages(),
entry_points={
'console_scripts': [
'atdb_interface=atdb_interface.atdb_interface:main',
],
},
)
\ No newline at end of file
#!/bin/bash
##---------------------------------------------------------------------------------------------------------------------#
##! \brief Description: This script uploads the created atdb_interface artifact to the Nexus repository
##! In: $1 [Optional] Additional Artifact version tag which can be anything
##! Out: None
##! Returns: None
##! Preconditions:
##! - build should be done /dist/atdb_interface-[version].tar.gz is available
##! Postconditions:
##! - artifact uploaded to https://support.astron.nl/nexus/content/repositories/snapshots/nl/astron/atdb/ATDB_interface-[version][additional version tag].tar.gz
##! Examples: .\upload_to_nexus
##! .\upload_to_nexus 20180913
##! .\upload_to_nexus test
##---------------------------------------------------------------------------------------------------------------------#
VERSION=$(python setup.py --version)
ARTIFACT_NAME="ATDB_interface"
ARTIFACT_BUILD="/dist/atdb_interface-${VERSION}.tar.gz"
ARTIFACT_UPLOAD_BASE_PATH="https://support.astron.nl/nexus/content/repositories/snapshots/nl/astron/atdb/"
if [[ $# -eq 1 ]]; then
ARTIFACT_VERSION="-${VERSION}-${1}"
else
ARTIFACT_VERSION="-${VERSION}"
fi
ARTIFACT_UPLOAD_PATH="${ARTIFACT_UPLOAD_BASE_PATH}${ARTIFACT_NAME}${ARTIFACT_VERSION}.tar.gz"
ARTIFACT_BUILD_PATH="$(pwd)${ARTIFACT_BUILD}"
echo "Upload ${ARTIFACT_BUILD_PATH} to $ARTIFACT_UPLOAD_PATH"
curl --insecure --upload-file ${ARTIFACT_BUILD_PATH} -u upload:upload ${ARTIFACT_UPLOAD_PATH}
# Next command will not close the window, can be handy if something goes wrong
exec $SHELL
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment