Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  Add conda packaging.
  Upgrade dev-cycle to c0020.001
  • Loading branch information
tribeiro committed May 26, 2021
2 parents 5d76e55 + e4e9216 commit 03d0641
Show file tree
Hide file tree
Showing 7 changed files with 77 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ cycle=c0014
#
# Development cycle to build
#
dev_cycle=c0018.001
dev_cycle=c0020.001
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pipeline {
registryCredential = "dockerhub-inriachile"
dockerImageName = "lsstts/love-commander:"
dockerImage = ""
dev_cycle = "c0018.001"
dev_cycle = "c0020.001"
user_ci = credentials('lsst-io')
LTD_USERNAME="${user_ci_USR}"
LTD_PASSWORD="${user_ci_PSW}"
Expand Down
2 changes: 2 additions & 0 deletions Jenkinsfile.conda
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@Library('JenkinsShared')_
CondaPipeline([], "love-commander", "commander")
7 changes: 7 additions & 0 deletions commander/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from .app import *
from .commands import *
from .efd import *
from .heartbeats import *
from .lovecsc import *
from .salinfo import *
from .tcs import *
25 changes: 25 additions & 0 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{% set data= load_setup_py_data() %}
package:
name: love-commander
version: {{ data.get('version') }}

source:
path: ../

build:
script: python -m pip install --no-deps --ignore-installed .

requirements:
host:
- python
- pip
- setuptools_scm
- setuptools
run:
- python
- setuptools
- setuptools_scm
- astroquery
- ts-salobj
- ts-idl
- ts-observatory-control
14 changes: 14 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[flake8]
ignore=E133, E203, E226, E228, N802, N803, N806, N812, N813, N815, N816, W503
exclude=__init__.py
max-line-length=110

[tool:pytest]
addopts = --flake8 --black
flake8-ignore = E133 E203 E226 E228 N802 N803 N806 N812 N813 N815 N816 W503

[metadata]
version = attr: setuptools_scm.get_version

[options]
setup_requires=setuptools_scm
27 changes: 27 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# This install file works with `pip install .`
# but not with `python setup.py install`.
import glob
import pathlib
import setuptools
import sys

scm_version_template = """# Generated by setuptools_scm
__all__ = ["__version__"]
__version__ = "{version}"
"""

setuptools.setup(
name="love-commander",
description="LSST Operators Visualization Environment (LOVE) service to send SAL commands from http endpoints using salobj.",
use_scm_version={
"write_to": "commander/version.py",
"write_to_template": scm_version_template,
},
py_modules=["commander"],
license="GPL",
project_url={
"Bug Tracker": "https://jira.lsstcorp.org/secure/Dashboard.jspa",
"Source Code": "https://github.com/lsst-ts/LOVE-commander",
},
)

0 comments on commit 03d0641

Please sign in to comment.