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.

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

Bulk changes to the recipes and build order. #7

Merged
merged 4 commits into from
Jul 3, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
23 changes: 15 additions & 8 deletions ska_conda/build_order.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,29 @@ Ska.File
pyyaks
ska_path
testr
Ska.tdb
tables3_api
Chandra.Time
Ska.Matplotlib
Ska.tdb
Ska.ParseCM
parse_cm
Ska.DBI
Ska.ftp
Ska.Numpy
Quaternion
Ska.engarchive
kadi
Ska.Matplotlib
Ska.quatutil
Ska.Sun
Ska.engarchive
agasc
Chandra.Maneuver
cmd_states
kadi
Chandra.cmd_states
xija
maude
#agasc
#chandra_aca
ska
chandra_aca
Ska.arc5gl
Ska.astro
mica
cxotime
annie
ska-flight
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The interface doc specifies ska3-flight. I went back and forth about whether to try being consistent with ska3 branding instead of ska to make this distinction clear to ourselves and end-users. In a few years the 3 might seem superfluous, but for now when we say "Ska flight" that is really Ska2 flight, so probably worth being rigorous in here.

3 changes: 2 additions & 1 deletion ska_conda/pkg_defs/Chandra.Maneuver/build.sh
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
python setup.py install
python setup.py install

6 changes: 5 additions & 1 deletion ska_conda/pkg_defs/Chandra.Maneuver/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package:
version: {{ GIT_DESCRIBE_TAG }}

build:
noarch: python
script_env:
- SKA_TOP_SRC_DIR
preserve_egg_dir: yes # (default no)
Expand Down Expand Up @@ -30,12 +31,15 @@ requirements:
- python
- setuptools
- six
- testr
- quaternion
- chandra.time
- ska.sun

test:
requires:
- agasc
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a case where we have some involved testing that seems to need agasc and Ska.engarchive. I suppose it would be fine to just add those as runtime dependencies, but it seemed overkill (they don't really seem like run-time requirements for the package even if they are needed to complete all of its tests).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting web we are weaving. Agreed this is fine to leave as is.

- ska.engarchive
- testr
imports:
- Chandra.Maneuver

Expand Down
3 changes: 2 additions & 1 deletion ska_conda/pkg_defs/Chandra.Maneuver/run_test.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
import sys
import Chandra.Maneuver
Chandra.Maneuver.test()
sys.exit(Chandra.Maneuver.test())
5 changes: 3 additions & 2 deletions ska_conda/pkg_defs/Chandra.Time/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@ requirements:
- setuptools
- six
- numpy
- astropy
- testr

test:
requires:
- testr

imports:
- Chandra.Time

Expand Down
3 changes: 2 additions & 1 deletion ska_conda/pkg_defs/Chandra.Time/run_test.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
import sys
import Chandra.Time
Chandra.Time.test()
sys.exit(Chandra.Time.test())
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package:
name: cmd_states
name: chandra.cmd_states
version: {{ GIT_DESCRIBE_TAG }}

build:
noarch: python
script_env:
- SKA_TOP_SRC_DIR
preserve_egg_dir: yes # (default no)
Expand Down Expand Up @@ -45,6 +46,8 @@ requirements:
- kadi

test:
requires:
- testr
imports:
- Chandra.cmd_states

Expand Down
4 changes: 3 additions & 1 deletion ska_conda/pkg_defs/Quaternion/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package:
version: {{ GIT_DESCRIBE_TAG }}

build:
noarch: python
script_env:
- SKA_TOP_SRC_DIR

Expand All @@ -27,9 +28,10 @@ requirements:
- setuptools
- six
- numpy
- testr

test:
requires:
- testr
imports:
- Quaternion

Expand Down
3 changes: 2 additions & 1 deletion ska_conda/pkg_defs/Quaternion/run_test.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
import sys
import Quaternion
Quaternion.test()
sys.exit(Quaternion.test())
6 changes: 4 additions & 2 deletions ska_conda/pkg_defs/Ska.DBI/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package:
version: {{ GIT_DESCRIBE_TAG }}

build:
noarch: python
script_env:
- SKA_TOP_SRC_DIR
preserve_egg_dir: yes # (default no)
Expand All @@ -28,11 +29,12 @@ requirements:
- setuptools
- six
- sqlite
- pytest
- testr


test:
requires:
- pytest
- testr
- numpy
imports:
- Ska.DBI
Expand Down
3 changes: 2 additions & 1 deletion ska_conda/pkg_defs/Ska.DBI/run_test.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
import sys
import Ska.DBI
Ska.DBI.test()
sys.exit(Ska.DBI.test())
1 change: 1 addition & 0 deletions ska_conda/pkg_defs/Ska.File/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package:


build:
noarch: python
preserve_egg_dir: yes
script_env:
- SKA_TOP_SRC_DIR
Expand Down
1 change: 1 addition & 0 deletions ska_conda/pkg_defs/Ska.Matplotlib/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package:


build:
noarch: python
preserve_egg_dir: yes
script_env:
- SKA_TOP_SRC_DIR
Expand Down
7 changes: 4 additions & 3 deletions ska_conda/pkg_defs/Ska.Numpy/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ requirements:
- python
- setuptools
- six
- cython
- nose
- testr
- numpy

test:
requires:
- nose
- testr
imports:
- Ska.Numpy

Expand Down
3 changes: 2 additions & 1 deletion ska_conda/pkg_defs/Ska.Numpy/run_test.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
import sys
import Ska.Numpy
Ska.Numpy.test()
sys.exit(Ska.Numpy.test())
1 change: 1 addition & 0 deletions ska_conda/pkg_defs/Ska.ParseCM/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package:
version: {{ GIT_DESCRIBE_TAG }}

build:
noarch: python
script_env:
- SKA_TOP_SRC_DIR
preserve_egg_dir: yes # (default no)
Expand Down
3 changes: 3 additions & 0 deletions ska_conda/pkg_defs/Ska.Shell/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package:
version: {{ GIT_DESCRIBE_TAG }}

build:
noarch: python
preserve_egg_dir: yes
script_env:
- SKA_TOP_SRC_DIR
Expand All @@ -23,6 +24,8 @@ requirements:
- pexpect

test:
requires:
- testr
imports:
- Ska.Shell

Expand Down
3 changes: 3 additions & 0 deletions ska_conda/pkg_defs/Ska.Shell/run_test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import sys
import Ska.Shell
sys.exit(Ska.Shell.test())
3 changes: 3 additions & 0 deletions ska_conda/pkg_defs/Ska.Sun/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package:


build:
noarch: python
preserve_egg_dir: yes
script_env:
- SKA_TOP_SRC_DIR
Expand All @@ -21,12 +22,14 @@ requirements:
- quaternion
- chandra.time
- ska.quatutil
- numpy
run:
- python
- setuptools
- ska.quatutil
- chandra.time
- quaternion
- numpy

test:
imports:
Expand Down
1 change: 1 addition & 0 deletions ska_conda/pkg_defs/Ska.arc5gl/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python setup.py install
40 changes: 40 additions & 0 deletions ska_conda/pkg_defs/Ska.arc5gl/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package:
name: ska.arc5gl
version: {{ GIT_DESCRIBE_TAG }}

build:
noarch: python
script_env:
- SKA_TOP_SRC_DIR
preserve_egg_dir: yes # (default no)

source:
path: {{ SKA_TOP_SRC_DIR }}/Ska.arc5gl


# the build and runtime requirements. Dependencies of these requirements
# are included automatically.
requirements:
# Packages required to build the package. python and numpy must be
# listed explicitly if they are required.
build:
- python
- setuptools
- six
# Packages required to run the package. These are the dependencies that
# will be installed automatically whenever the package is installed.
run:
- python
- setuptools
- six
- pexpect
- testr

test:
imports:
- Ska.arc5gl


about:
home: https://github.com/sot/Ska.arc5gl

1 change: 1 addition & 0 deletions ska_conda/pkg_defs/Ska.astro/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python setup.py install
41 changes: 41 additions & 0 deletions ska_conda/pkg_defs/Ska.astro/meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package:
name: ska.astro
version: {{ GIT_DESCRIBE_TAG }}

build:
noarch: python
script_env:
- SKA_TOP_SRC_DIR
preserve_egg_dir: yes # (default no)

source:
path: {{ SKA_TOP_SRC_DIR }}/Ska.astro


# the build and runtime requirements. Dependencies of these requirements
# are included automatically.
requirements:
# Packages required to build the package. python and numpy must be
# listed explicitly if they are required.
build:
- python
- setuptools
- six
# Packages required to run the package. These are the dependencies that
# will be installed automatically whenever the package is installed.
run:
- python
- setuptools
- six
- numpy

test:
requires:
- testr
imports:
- Ska.astro


about:
home: https://github.com/sot/Ska.astro

5 changes: 4 additions & 1 deletion ska_conda/pkg_defs/Ska.engarchive/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package:
version: {{ GIT_DESCRIBE_TAG }}

build:
noarch: python
script_env:
- SKA_TOP_SRC_DIR
preserve_egg_dir: yes # (default no)
Expand Down Expand Up @@ -31,13 +32,15 @@ requirements:
- ipython
- ipyparallel
- pytables
- tables3_api
- chandra.time
- ska.numpy
- ska.dbi
- testr
- astropy

test:
requires:
- testr
imports:
- Ska.engarchive

Expand Down
3 changes: 2 additions & 1 deletion ska_conda/pkg_defs/Ska.engarchive/run_test.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
import sys
import Ska.engarchive
Ska.engarchive.test()
sys.exit(Ska.engarchive.test())
4 changes: 3 additions & 1 deletion ska_conda/pkg_defs/Ska.ftp/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package:
version: {{ GIT_DESCRIBE_TAG }}

build:
noarch: python
script_env:
- SKA_TOP_SRC_DIR
preserve_egg_dir: yes # (default no)
Expand All @@ -27,9 +28,10 @@ requirements:
- six
- pycrypto
- paramiko
- testr

test:
requires:
- testr
imports:
- Ska.ftp

Expand Down
Loading