Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

B1.0 pre5 #63

Merged
merged 25 commits into from
Mar 3, 2020
Merged

B1.0 pre5 #63

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
86f658b
bumped CARTA version
o-smirnov Feb 28, 2020
e7b5366
Elevate detribution so that travis can deploy dist and wheels
Athanaseus Feb 28, 2020
323eeb4
Add badges to README
Athanaseus Feb 28, 2020
c80149a
Add README as package long discription
Athanaseus Feb 28, 2020
10df5d7
Merge branch 'b1.0-pre4' into b1.0-pre5
o-smirnov Feb 28, 2020
cdfd46d
CARTA version bump
o-smirnov Feb 28, 2020
a959680
Add project toml file
Athanaseus Feb 28, 2020
d140173
Update local with remote
Athanaseus Feb 28, 2020
5d41919
Revert "CARTA version bump"
Athanaseus Feb 28, 2020
75c89f6
Revert "Add project toml file"
Athanaseus Feb 28, 2020
602044a
CARTA version bump
Athanaseus Feb 28, 2020
7be5d2f
don;t be verbose when upacking carta tarball
o-smirnov Feb 28, 2020
09341da
Create pyproject.toml
Athanaseus Feb 28, 2020
111e483
Include pip
Athanaseus Feb 28, 2020
7940c02
fixing CARTA base path. You are in maze of twisty passageways, all al…
o-smirnov Feb 28, 2020
90f37f7
Merge branch 'b1.0-pre5' of github.com:ratt-ru/radiopadre into b1.0-pre5
o-smirnov Feb 28, 2020
5eb5b04
Install jupyter
Athanaseus Feb 28, 2020
e3e136d
fixes #64
o-smirnov Feb 29, 2020
2175c00
fixes #64 some more
o-smirnov Feb 29, 2020
8522052
fixes to docker mode build
o-smirnov Feb 29, 2020
d84dd1d
cleaned up installation of jupyter kernel, goes into venv now, should…
o-smirnov Mar 1, 2020
290aac6
Update .travis.yml
Athanaseus Mar 2, 2020
bc61ac1
Update py3.docker
Athanaseus Mar 2, 2020
146ebcc
Delete pyproject.toml
Athanaseus Mar 2, 2020
95341d1
Define a custom wheel building cmd class
Athanaseus Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ script:
deploy:
provider: pypi
user: athanaseus
distributions: sdist bdist_wheel
password:
secure: NfSxCXOU9WywE0S2Pdhlpu+BLmeUA5XVL3O6jFouLOFQOznZ53YTiqesYCkvoYm2a3bIMPLpKRFnSvKZ9gmLW3lwRkfBaF7c8RwWSYRaw9YfZ5S/gQUhPiPc7sQcIQz/umpdNLKgz35KEBx2BS3d2Kpapbf/ysziyYBbyf3zWBIig/sdNS/ogt3uG6yAuBDn3lie7m6P/fu/l99UCyZrl5eScoU+5fn6MYlSLfgtOIkzC8lQ1FcNuRXDHgwlfJjMshAEbIiVDBwVWhCVs71/N6ed8qbfhPbGA3Qg+Bur4xiQEyRCg24hx1BZ6ombFE068nOXHLMe357qDGwybFpcNsslkI737SLOZnXdIbhQ1IWk0z99CALHym0f8oJ426FPK0C4n9+uwotDzrr5o2eQsKnQq1cLuVrBBfUSxcCDkKk55VG820qY9NklNgmyhZIGm+Ijs+xN+QKwqMhVMfMy8tIpJgYYwIdY7w2mFUhp7Q64XdxDyC/QTVo+zT/0Z0TlFHnH36ibsriRrITf61zmIYzP8U1ShsNFKTEbIu5W4z+labixI8DUutnWsuo+MXtflrPLxzCCL/01W9NHvOG1+3vre27qwgo1T1H7E9jQObYF7eGvr2QQXQs98fOesMjsUxUC2y30YKRqf3JAwsfuDRH77pxylMr8tGghuBjuuuE=
on:
tags: true
distributions: sdist bdist_wheel
repo: ratt-ru/radiopadre
repo: ratt-ru/radiopadre
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM kernsuite/base:5

ARG CLIENT_BRANCH=b1.0-pre4
ARG CARTA_VERSION=v1.2.1
ARG CLIENT_BRANCH=b1.0-pre5
ARG CARTA_VERSION=v1.2.2
ARG CARTA_BASE=CARTA-$CARTA_VERSION-remote
ARG CARTA_TGZ=$CARTA_BASE.tgz
ARG CARTA_URL=https://github.com/CARTAvis/carta-releases/releases/download/$CARTA_VERSION/$CARTA_TGZ
Expand Down
5 changes: 4 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

Astronomy visualization framework for ipython notebooks.

[![Build Status](https://travis-ci.org/radio-astro/radiopadre.svg?branch=master](https://travis-ci.org/radio-astro/radiopadre)
[![Build Status](https://travis-ci.org/ratt-ru/radiopadre.svg?branch=master)](https://travis-ci.org/radio-astro/radiopadre/)
[![PyPI version shields.io](https://img.shields.io/pypi/v/radiopadre.svg)](https://pypi.python.org/pypi/radiopadre/)
[![PyPI pyversions](https://img.shields.io/pypi/pyversions/radiopadre.svg)](https://pypi.python.org/pypi/radiopadre/)
[![PyPI status](https://img.shields.io/pypi/status/radiopadre.svg)](https://pypi.python.org/pypi/radiopadre/)

[radiopadre on pypi](https://pypi.python.org/pypi/radiopadre)

Expand Down
2 changes: 1 addition & 1 deletion bin/setup-radiopadre-virtualenv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PADRE_PATH = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
JS9_REPO = "https://github.com/ericmandel/js9.git"
JS9_DIR = PADRE_PATH + "/js9"

CARTA_LINK = "https://github.com/CARTAvis/carta-releases/releases/download/v1.2.1/CARTA-v1.2.1-remote.tgz"
CARTA_LINK = "https://github.com/CARTAvis/carta-releases/releases/download/v1.2.2/CARTA-v1.2.2-remote.tgz"

import argparse
parser = argparse.ArgumentParser(description="Installs radiopadre components inside an existing virtual environment")
Expand Down
9 changes: 8 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
from setuptools.command.install import install
from setuptools.command.develop import develop

__version__ = "1.0-pre4"
__version__ = "1.0-pre5"
build_root = os.path.dirname(__file__)

with open("requirements.txt") as stdr:
install_requires = stdr.readlines()
Expand All @@ -29,6 +30,11 @@ def run(self):
command = ['./bin/setup-radiopadre-virtualenv', '--editable']
subprocess.check_call(command)

def readme():
"""Get readme content for package long description"""
with open(os.path.join(build_root, 'README.md')) as f:
return f.read()

setup(
name="radiopadre",
version=__version__,
Expand All @@ -38,6 +44,7 @@ def run(self):
author="Oleg Smirnov",
author_email="osmirnov@gmail.com",
description=("A data visualization framework for jupyter notebooks"),
long_description=readme(),
license="MIT",
keywords="ipython notebook jupyter fits dataset resultset visualisation",
url="http://github.com/ratt-ru/radiopadre",
Expand Down