From b315c31cda0be1c69501c2745ce485c7cbd9c074 Mon Sep 17 00:00:00 2001 From: Jean Connelly Date: Sat, 17 Jun 2017 10:46:23 -0400 Subject: [PATCH 01/25] Reboot conda builds --- build_order.txt | 6 +++++ chandra.time/build.sh | 1 + chandra.time/meta.yaml | 47 ++++++++++++++++++++++++++++++++++++++++ chandra.time/run_test.py | 2 ++ pyyaks/build.sh | 1 + pyyaks/meta.yaml | 45 ++++++++++++++++++++++++++++++++++++++ ska.file/build.sh | 5 +++++ ska.file/meta.yaml | 34 +++++++++++++++++++++++++++++ ska.shell/build.sh | 5 +++++ ska.shell/meta.yaml | 33 ++++++++++++++++++++++++++++ ska_path/build.sh | 5 +++++ ska_path/meta.yaml | 31 ++++++++++++++++++++++++++ testr/build.sh | 1 + testr/meta.yaml | 45 ++++++++++++++++++++++++++++++++++++++ 14 files changed, 261 insertions(+) create mode 100644 build_order.txt create mode 100755 chandra.time/build.sh create mode 100644 chandra.time/meta.yaml create mode 100644 chandra.time/run_test.py create mode 100755 pyyaks/build.sh create mode 100644 pyyaks/meta.yaml create mode 100644 ska.file/build.sh create mode 100644 ska.file/meta.yaml create mode 100644 ska.shell/build.sh create mode 100644 ska.shell/meta.yaml create mode 100644 ska_path/build.sh create mode 100644 ska_path/meta.yaml create mode 100755 testr/build.sh create mode 100644 testr/meta.yaml diff --git a/build_order.txt b/build_order.txt new file mode 100644 index 00000000..df73b114 --- /dev/null +++ b/build_order.txt @@ -0,0 +1,6 @@ +ska.shell +ska.file +pyyaks +ska_path +testr +chandra.time diff --git a/chandra.time/build.sh b/chandra.time/build.sh new file mode 100755 index 00000000..aa8a1fc3 --- /dev/null +++ b/chandra.time/build.sh @@ -0,0 +1 @@ +python setup.py install \ No newline at end of file diff --git a/chandra.time/meta.yaml b/chandra.time/meta.yaml new file mode 100644 index 00000000..1f9fcb2d --- /dev/null +++ b/chandra.time/meta.yaml @@ -0,0 +1,47 @@ +{% set data = load_setup_py_data() %} + +package: + name: chandra.time + version: {{ data.get('version') }} + +build: + script_env: + - SKA_TOP_SRC_DIR + preserve_egg_dir: yes # (default no) + entry_points: + - entry = conda_version_test.manual_entry:main + +source: + path: {{ SKA_TOP_SRC_DIR }}/Chandra.Time + + +# 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 + - cython >=0.20.1 + - six + - numpy + # 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 + - astropy + - testr + +test: + imports: + - Chandra.Time + + +about: + home: https://github.com/sot/Chandra.Time + license: BSD + summary: Chandra Time package diff --git a/chandra.time/run_test.py b/chandra.time/run_test.py new file mode 100644 index 00000000..de657f16 --- /dev/null +++ b/chandra.time/run_test.py @@ -0,0 +1,2 @@ +import Chandra.Time +Chandra.Time.test() diff --git a/pyyaks/build.sh b/pyyaks/build.sh new file mode 100755 index 00000000..aa8a1fc3 --- /dev/null +++ b/pyyaks/build.sh @@ -0,0 +1 @@ +python setup.py install \ No newline at end of file diff --git a/pyyaks/meta.yaml b/pyyaks/meta.yaml new file mode 100644 index 00000000..9dc60dd2 --- /dev/null +++ b/pyyaks/meta.yaml @@ -0,0 +1,45 @@ +{% set data = load_setup_py_data() %} + +package: + name: pyyaks + version: {{ data.get('version') }} + +build: + script_env: + - SKA_TOP_SRC_DIR + +source: + path: {{ SKA_TOP_SRC_DIR }}/pyyaks + + +# 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 + # Packages required to run the package. These are the dependencies that + # will be installed automatically whenever the package is installed. + run: + - python + - setuptools + - jinja2 + +test: + requires: + - pytest + - six + imports: + - pyyaks + - pyyaks.context + - pyyaks.logger + - pyyaks.fileutil + - pyyaks.task + +about: + home: https://github.com/sot/pyyaks + license: BSD + summary: Pipeline running tools + diff --git a/ska.file/build.sh b/ska.file/build.sh new file mode 100644 index 00000000..deaad439 --- /dev/null +++ b/ska.file/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +# Build script for Ska.File + +$PYTHON setup.py install \ No newline at end of file diff --git a/ska.file/meta.yaml b/ska.file/meta.yaml new file mode 100644 index 00000000..085fda15 --- /dev/null +++ b/ska.file/meta.yaml @@ -0,0 +1,34 @@ +{% set data = load_setup_py_data() %} + +package: + name: ska.file # lower case name of package, may contain '-' but no spaces + version: {{ data.get('version') }} + + +build: + preserve_egg_dir: yes + script_env: + - SKA_TOP_SRC_DIR + +source: + path: {{ SKA_TOP_SRC_DIR }}/Ska.File + + + +requirements: + build: + - python + - setuptools + + run: + - python + - setuptools + +test: + imports: + - Ska.File + +about: + home: https://github.com/sot/Ska.File + license: BSD + summary: No summary available diff --git a/ska.shell/build.sh b/ska.shell/build.sh new file mode 100644 index 00000000..deaad439 --- /dev/null +++ b/ska.shell/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +# Build script for Ska.File + +$PYTHON setup.py install \ No newline at end of file diff --git a/ska.shell/meta.yaml b/ska.shell/meta.yaml new file mode 100644 index 00000000..7d516958 --- /dev/null +++ b/ska.shell/meta.yaml @@ -0,0 +1,33 @@ +{% set data = load_setup_py_data() %} + +package: + name: ska.shell # lower case name of package, may contain '-' but no spaces + version: {{ data.get('version') }} + +build: + preserve_egg_dir: yes + script_env: + - SKA_TOP_SRC_DIR + +source: + path: {{ SKA_TOP_SRC_DIR }}/Ska.Shell + +requirements: + build: + - python + - setuptools + - six + + run: + - python + - six + - pexpect + +test: + imports: + - Ska.Shell + +about: + home: https://github.com/sot/Ska.Shell + license: BSD + summary: No summary available diff --git a/ska_path/build.sh b/ska_path/build.sh new file mode 100644 index 00000000..deaad439 --- /dev/null +++ b/ska_path/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +# Build script for Ska.File + +$PYTHON setup.py install \ No newline at end of file diff --git a/ska_path/meta.yaml b/ska_path/meta.yaml new file mode 100644 index 00000000..f3a53e02 --- /dev/null +++ b/ska_path/meta.yaml @@ -0,0 +1,31 @@ +{% set data = load_setup_py_data() %} + +package: + name: ska_path # lower case name of package, may contain '-' but no spaces + version: {{ data.get('version') }} + + +build: + script_env: + - SKA_TOP_SRC_DIR + +source: + path: {{ SKA_TOP_SRC_DIR }}/ska_path + + + +requirements: + build: + - python + run: + - python + + +test: + imports: + - ska_path + +about: + home: https://github.com/sot/ska_path + license: BSD + summary: No summary available diff --git a/testr/build.sh b/testr/build.sh new file mode 100755 index 00000000..aa8a1fc3 --- /dev/null +++ b/testr/build.sh @@ -0,0 +1 @@ +python setup.py install \ No newline at end of file diff --git a/testr/meta.yaml b/testr/meta.yaml new file mode 100644 index 00000000..117a1268 --- /dev/null +++ b/testr/meta.yaml @@ -0,0 +1,45 @@ +{% set data = load_setup_py_data() %} + +package: + name: testr + version: {{ data.get('version') }} + +build: + entry_points: + - entry = conda_version_test.manual_entry:main + script_env: + - SKA_TOP_SRC_DIR + +source: + path: {{ SKA_TOP_SRC_DIR }}/testr + +build: + preserve_egg_dir: yes # (default no) + +# 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 + # Packages required to run the package. These are the dependencies that + # will be installed automatically whenever the package is installed. + run: + - python + - setuptools + - ska.file + - ska.shell + - pyyaks + - astropy + - pytest + +test: + imports: + - testr + + +about: + home: https://github.com/sot/testr + license: BSD + summary: Chandra Time package From 6afecc3415c506491c5057a966f46d574e1617cf Mon Sep 17 00:00:00 2001 From: Jean Connelly Date: Sat, 17 Jun 2017 18:15:55 -0400 Subject: [PATCH 02/25] Add more packages (kadi tests still don't pass) --- build_order.txt | 6 +++++ kadi/build.sh | 1 + kadi/meta.yaml | 53 ++++++++++++++++++++++++++++++++++++++ kadi/run_test.py | 3 +++ quaternion/build.sh | 1 + quaternion/meta.yaml | 42 ++++++++++++++++++++++++++++++ quaternion/run_test.py | 2 ++ ska.dbi/build.sh | 1 + ska.dbi/meta.yaml | 46 +++++++++++++++++++++++++++++++++ ska.dbi/run_test.py | 2 ++ ska.engarchive/build.sh | 1 + ska.engarchive/meta.yaml | 49 +++++++++++++++++++++++++++++++++++ ska.engarchive/run_test.py | 2 ++ ska.ftp/build.sh | 1 + ska.ftp/meta.yaml | 42 ++++++++++++++++++++++++++++++ ska.ftp/run_test.py | 2 ++ ska.numpy/build.sh | 1 + ska.numpy/meta.yaml | 45 ++++++++++++++++++++++++++++++++ ska.numpy/run_test.py | 2 ++ 19 files changed, 302 insertions(+) create mode 100755 kadi/build.sh create mode 100644 kadi/meta.yaml create mode 100644 kadi/run_test.py create mode 100755 quaternion/build.sh create mode 100644 quaternion/meta.yaml create mode 100644 quaternion/run_test.py create mode 100755 ska.dbi/build.sh create mode 100644 ska.dbi/meta.yaml create mode 100644 ska.dbi/run_test.py create mode 100755 ska.engarchive/build.sh create mode 100644 ska.engarchive/meta.yaml create mode 100644 ska.engarchive/run_test.py create mode 100755 ska.ftp/build.sh create mode 100644 ska.ftp/meta.yaml create mode 100644 ska.ftp/run_test.py create mode 100755 ska.numpy/build.sh create mode 100644 ska.numpy/meta.yaml create mode 100644 ska.numpy/run_test.py diff --git a/build_order.txt b/build_order.txt index df73b114..d7cbb076 100644 --- a/build_order.txt +++ b/build_order.txt @@ -4,3 +4,9 @@ pyyaks ska_path testr chandra.time +ska.dbi +ska.ftp +ska.numpy +quaternion +ska.engarchive +kadi diff --git a/kadi/build.sh b/kadi/build.sh new file mode 100755 index 00000000..aa8a1fc3 --- /dev/null +++ b/kadi/build.sh @@ -0,0 +1 @@ +python setup.py install \ No newline at end of file diff --git a/kadi/meta.yaml b/kadi/meta.yaml new file mode 100644 index 00000000..f402beec --- /dev/null +++ b/kadi/meta.yaml @@ -0,0 +1,53 @@ +{% set data = load_setup_py_data() %} + +package: + name: kadi + version: {{ data.get('version') }} + +build: + script_env: + - USER + - SKA_TOP_SRC_DIR + +source: + path: {{ SKA_TOP_SRC_DIR }}/kadi + + +# 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 + - six + # Packages required to run the package. These are the dependencies that + # will be installed automatically whenever the package is installed. + run: + - python + - six + - pytables + - configobj + - requests + - django + - pyyaks + - ska.dbi + - ska.file + - ska.ftp + - ska.numpy + - astropy + - quaternion + - chandra.time + - ska.engarchive + - numpy + - testr + +test: + imports: + - kadi + + +about: + home: https://github.com/sot/Chandra.Time + license: BSD + summary: Chandra Time package diff --git a/kadi/run_test.py b/kadi/run_test.py new file mode 100644 index 00000000..b9e6ddd5 --- /dev/null +++ b/kadi/run_test.py @@ -0,0 +1,3 @@ +import kadi +kadi.test() + diff --git a/quaternion/build.sh b/quaternion/build.sh new file mode 100755 index 00000000..aa8a1fc3 --- /dev/null +++ b/quaternion/build.sh @@ -0,0 +1 @@ +python setup.py install \ No newline at end of file diff --git a/quaternion/meta.yaml b/quaternion/meta.yaml new file mode 100644 index 00000000..f2a9eea0 --- /dev/null +++ b/quaternion/meta.yaml @@ -0,0 +1,42 @@ +{% set data = load_setup_py_data() %} + +package: + name: quaternion + version: {{ data.get('version') }} + +build: + script_env: + - SKA_TOP_SRC_DIR + +source: + path: {{ SKA_TOP_SRC_DIR }}/Quaternion + + +# 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 + - numpy + # 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 + - testr + +test: + imports: + - Quaternion + + +about: + home: https://github.com/sot/Quaternion + license: BSD + summary: Chandra Time package diff --git a/quaternion/run_test.py b/quaternion/run_test.py new file mode 100644 index 00000000..ba7390f8 --- /dev/null +++ b/quaternion/run_test.py @@ -0,0 +1,2 @@ +import Quaternion +Quaternion.test() diff --git a/ska.dbi/build.sh b/ska.dbi/build.sh new file mode 100755 index 00000000..aa8a1fc3 --- /dev/null +++ b/ska.dbi/build.sh @@ -0,0 +1 @@ +python setup.py install \ No newline at end of file diff --git a/ska.dbi/meta.yaml b/ska.dbi/meta.yaml new file mode 100644 index 00000000..ee860999 --- /dev/null +++ b/ska.dbi/meta.yaml @@ -0,0 +1,46 @@ +{% set data = load_setup_py_data() %} + +package: + name: ska.dbi + version: {{ data.get('version') }} + +build: + script_env: + - SKA_TOP_SRC_DIR + preserve_egg_dir: yes # (default no) + +source: + path: {{ SKA_TOP_SRC_DIR }}/Ska.DBI + + +# 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 + - sqlite + # Packages required to run the package. These are the dependencies that + # will be installed automatically whenever the package is installed. + run: + - python + - setuptools + - six + - sqlite + - pytest + - testr + +test: + requires: + - numpy + imports: + - Ska.DBI + + +about: + home: https://github.com/sot/Ska.DBI + license: BSD + summary: Chandra Time package diff --git a/ska.dbi/run_test.py b/ska.dbi/run_test.py new file mode 100644 index 00000000..c62de10a --- /dev/null +++ b/ska.dbi/run_test.py @@ -0,0 +1,2 @@ +import Ska.DBI +Ska.DBI.test() diff --git a/ska.engarchive/build.sh b/ska.engarchive/build.sh new file mode 100755 index 00000000..aa8a1fc3 --- /dev/null +++ b/ska.engarchive/build.sh @@ -0,0 +1 @@ +python setup.py install \ No newline at end of file diff --git a/ska.engarchive/meta.yaml b/ska.engarchive/meta.yaml new file mode 100644 index 00000000..446797e5 --- /dev/null +++ b/ska.engarchive/meta.yaml @@ -0,0 +1,49 @@ +{% set data = load_setup_py_data() %} + +package: + name: ska.engarchive + version: {{ data.get('version') }} + +build: + script_env: + - SKA_TOP_SRC_DIR + preserve_egg_dir: yes # (default no) + +source: + path: {{ SKA_TOP_SRC_DIR }}/eng_archive + + +# 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 + - numpy + # 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 + - ipython + - ipyparallel + - pytables + - chandra.time + - ska.numpy + - ska.dbi + - testr + +test: + imports: + - Ska.engarchive + + +about: + home: https://github.com/sot/Ska.engarchive + license: BSD + summary: Chandra Time package diff --git a/ska.engarchive/run_test.py b/ska.engarchive/run_test.py new file mode 100644 index 00000000..20b19cc5 --- /dev/null +++ b/ska.engarchive/run_test.py @@ -0,0 +1,2 @@ +import Ska.engarchive +Ska.engarchive.test() diff --git a/ska.ftp/build.sh b/ska.ftp/build.sh new file mode 100755 index 00000000..aa8a1fc3 --- /dev/null +++ b/ska.ftp/build.sh @@ -0,0 +1 @@ +python setup.py install \ No newline at end of file diff --git a/ska.ftp/meta.yaml b/ska.ftp/meta.yaml new file mode 100644 index 00000000..b47a32be --- /dev/null +++ b/ska.ftp/meta.yaml @@ -0,0 +1,42 @@ +{% set data = load_setup_py_data() %} + +package: + name: ska.ftp + version: {{ data.get('version') }} + +build: + script_env: + - SKA_TOP_SRC_DIR + preserve_egg_dir: yes # (default no) + +source: + path: {{ SKA_TOP_SRC_DIR }}/Ska.ftp + + +# 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 + # Packages required to run the package. These are the dependencies that + # will be installed automatically whenever the package is installed. + run: + - python + - setuptools + - six + - pycrypto + - paramiko + - testr + +test: + imports: + - Ska.ftp + + +about: + home: https://github.com/sot/Ska.ftp + license: BSD + summary: Chandra Time package diff --git a/ska.ftp/run_test.py b/ska.ftp/run_test.py new file mode 100644 index 00000000..d518796e --- /dev/null +++ b/ska.ftp/run_test.py @@ -0,0 +1,2 @@ +import Ska.ftp +Ska.ftp.test() diff --git a/ska.numpy/build.sh b/ska.numpy/build.sh new file mode 100755 index 00000000..aa8a1fc3 --- /dev/null +++ b/ska.numpy/build.sh @@ -0,0 +1 @@ +python setup.py install \ No newline at end of file diff --git a/ska.numpy/meta.yaml b/ska.numpy/meta.yaml new file mode 100644 index 00000000..cf1e3a1d --- /dev/null +++ b/ska.numpy/meta.yaml @@ -0,0 +1,45 @@ +{% set data = load_setup_py_data() %} + +package: + name: ska.numpy + version: {{ data.get('version') }} + +build: + script_env: + - SKA_TOP_SRC_DIR + preserve_egg_dir: yes # (default no) + +source: + path: {{ SKA_TOP_SRC_DIR }}/Ska.Numpy + + +# 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 + - numpy + - cython + - 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 + - cython + - nose + - testr + +test: + imports: + - Ska.Numpy + + +about: + home: https://github.com/sot/Ska.Numpy + license: BSD + summary: Chandra Time package diff --git a/ska.numpy/run_test.py b/ska.numpy/run_test.py new file mode 100644 index 00000000..04ca48b9 --- /dev/null +++ b/ska.numpy/run_test.py @@ -0,0 +1,2 @@ +import Ska.Numpy +Ska.Numpy.test() From d34054b0dd3b0f5c9e4e7fed22b6c1c2cac6db0b Mon Sep 17 00:00:00 2001 From: Jean Connelly Date: Sat, 17 Jun 2017 18:27:10 -0400 Subject: [PATCH 03/25] Remove some meta.yaml text copied in error --- quaternion/meta.yaml | 2 -- ska.dbi/meta.yaml | 5 ++--- ska.engarchive/meta.yaml | 4 ++-- ska.file/meta.yaml | 2 -- ska.ftp/meta.yaml | 2 -- ska.numpy/meta.yaml | 3 +-- ska.shell/meta.yaml | 3 +-- ska_path/meta.yaml | 2 -- testr/meta.yaml | 5 +---- 9 files changed, 7 insertions(+), 21 deletions(-) diff --git a/quaternion/meta.yaml b/quaternion/meta.yaml index f2a9eea0..535b9b37 100644 --- a/quaternion/meta.yaml +++ b/quaternion/meta.yaml @@ -38,5 +38,3 @@ test: about: home: https://github.com/sot/Quaternion - license: BSD - summary: Chandra Time package diff --git a/ska.dbi/meta.yaml b/ska.dbi/meta.yaml index ee860999..cfcb4263 100644 --- a/ska.dbi/meta.yaml +++ b/ska.dbi/meta.yaml @@ -39,8 +39,7 @@ test: imports: - Ska.DBI - about: home: https://github.com/sot/Ska.DBI - license: BSD - summary: Chandra Time package + + diff --git a/ska.engarchive/meta.yaml b/ska.engarchive/meta.yaml index 446797e5..e427771a 100644 --- a/ska.engarchive/meta.yaml +++ b/ska.engarchive/meta.yaml @@ -45,5 +45,5 @@ test: about: home: https://github.com/sot/Ska.engarchive - license: BSD - summary: Chandra Time package + + diff --git a/ska.file/meta.yaml b/ska.file/meta.yaml index 085fda15..2db8ff52 100644 --- a/ska.file/meta.yaml +++ b/ska.file/meta.yaml @@ -30,5 +30,3 @@ test: about: home: https://github.com/sot/Ska.File - license: BSD - summary: No summary available diff --git a/ska.ftp/meta.yaml b/ska.ftp/meta.yaml index b47a32be..a0fc36c5 100644 --- a/ska.ftp/meta.yaml +++ b/ska.ftp/meta.yaml @@ -38,5 +38,3 @@ test: about: home: https://github.com/sot/Ska.ftp - license: BSD - summary: Chandra Time package diff --git a/ska.numpy/meta.yaml b/ska.numpy/meta.yaml index cf1e3a1d..b541600b 100644 --- a/ska.numpy/meta.yaml +++ b/ska.numpy/meta.yaml @@ -41,5 +41,4 @@ test: about: home: https://github.com/sot/Ska.Numpy - license: BSD - summary: Chandra Time package + diff --git a/ska.shell/meta.yaml b/ska.shell/meta.yaml index 7d516958..20314ac6 100644 --- a/ska.shell/meta.yaml +++ b/ska.shell/meta.yaml @@ -29,5 +29,4 @@ test: about: home: https://github.com/sot/Ska.Shell - license: BSD - summary: No summary available + diff --git a/ska_path/meta.yaml b/ska_path/meta.yaml index f3a53e02..a362dab5 100644 --- a/ska_path/meta.yaml +++ b/ska_path/meta.yaml @@ -27,5 +27,3 @@ test: about: home: https://github.com/sot/ska_path - license: BSD - summary: No summary available diff --git a/testr/meta.yaml b/testr/meta.yaml index 117a1268..2c820d48 100644 --- a/testr/meta.yaml +++ b/testr/meta.yaml @@ -13,8 +13,6 @@ build: source: path: {{ SKA_TOP_SRC_DIR }}/testr -build: - preserve_egg_dir: yes # (default no) # the build and runtime requirements. Dependencies of these requirements # are included automatically. @@ -41,5 +39,4 @@ test: about: home: https://github.com/sot/testr - license: BSD - summary: Chandra Time package + From 27f723452c8a1358f598e05bf3ac8be241f93605 Mon Sep 17 00:00:00 2001 From: Jean Connelly Date: Fri, 30 Jun 2017 14:22:32 -0400 Subject: [PATCH 04/25] WIP: Add more packages (untested builds / wip) --- agasc/build.sh | 1 + agasc/meta.yaml | 45 ++++++++++++++++++++++++++++++++++++ agasc/run_test.py | 3 +++ chandra_aca/build.sh | 1 + chandra_aca/meta.yaml | 49 ++++++++++++++++++++++++++++++++++++++++ chandra_aca/run_test.py | 3 +++ ska.matplotlib/build.sh | 5 ++++ ska.matplotlib/meta.yaml | 38 +++++++++++++++++++++++++++++++ ska.quatutil/build.sh | 1 + ska.quatutil/meta.yaml | 42 ++++++++++++++++++++++++++++++++++ ska.sun/build.sh | 5 ++++ ska.sun/meta.yaml | 35 ++++++++++++++++++++++++++++ 12 files changed, 228 insertions(+) create mode 100755 agasc/build.sh create mode 100644 agasc/meta.yaml create mode 100644 agasc/run_test.py create mode 100755 chandra_aca/build.sh create mode 100644 chandra_aca/meta.yaml create mode 100644 chandra_aca/run_test.py create mode 100644 ska.matplotlib/build.sh create mode 100644 ska.matplotlib/meta.yaml create mode 100755 ska.quatutil/build.sh create mode 100644 ska.quatutil/meta.yaml create mode 100644 ska.sun/build.sh create mode 100644 ska.sun/meta.yaml diff --git a/agasc/build.sh b/agasc/build.sh new file mode 100755 index 00000000..aa8a1fc3 --- /dev/null +++ b/agasc/build.sh @@ -0,0 +1 @@ +python setup.py install \ No newline at end of file diff --git a/agasc/meta.yaml b/agasc/meta.yaml new file mode 100644 index 00000000..3ce517da --- /dev/null +++ b/agasc/meta.yaml @@ -0,0 +1,45 @@ +{% set data = load_setup_py_data() %} + +package: + name: agasc + version: {{ data.get('version') }} + +build: + script_env: + - USER + - SKA_TOP_SRC_DIR + +source: + path: {{ SKA_TOP_SRC_DIR }}/agasc + + +# 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 + - six + - pytables + - numpy + - numexpr + - chandra.time + - ska_path + - astropy + - testr + +test: + imports: + - agasc + + +about: + home: https://github.com/sot/agasc + diff --git a/agasc/run_test.py b/agasc/run_test.py new file mode 100644 index 00000000..1fa91e78 --- /dev/null +++ b/agasc/run_test.py @@ -0,0 +1,3 @@ +import agasc +agasc.test() + diff --git a/chandra_aca/build.sh b/chandra_aca/build.sh new file mode 100755 index 00000000..aa8a1fc3 --- /dev/null +++ b/chandra_aca/build.sh @@ -0,0 +1 @@ +python setup.py install \ No newline at end of file diff --git a/chandra_aca/meta.yaml b/chandra_aca/meta.yaml new file mode 100644 index 00000000..fd0146f7 --- /dev/null +++ b/chandra_aca/meta.yaml @@ -0,0 +1,49 @@ +{% set data = load_setup_py_data() %} + +package: + name: chandra_aca + version: {{ data.get('version') }} + +build: + script_env: + - USER + - SKA_TOP_SRC_DIR + +source: + path: {{ SKA_TOP_SRC_DIR }}/chandra_aca + + +# 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 + - six + # Packages required to run the package. These are the dependencies that + # will be installed automatically whenever the package is installed. + run: + - python + - numpy + - testr + - numba + - scipy + - chandra.time + - ska.numpy + - quaternion + - astropy + - agasc + - ska.quatutil + - matplotlib + - six + + +test: + imports: + - chandra_aca + + +about: + home: https://github.com/sot/chandra_aca + diff --git a/chandra_aca/run_test.py b/chandra_aca/run_test.py new file mode 100644 index 00000000..d3e74980 --- /dev/null +++ b/chandra_aca/run_test.py @@ -0,0 +1,3 @@ +import chandra_aca +chandra_aca.test() + diff --git a/ska.matplotlib/build.sh b/ska.matplotlib/build.sh new file mode 100644 index 00000000..deaad439 --- /dev/null +++ b/ska.matplotlib/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +# Build script for Ska.File + +$PYTHON setup.py install \ No newline at end of file diff --git a/ska.matplotlib/meta.yaml b/ska.matplotlib/meta.yaml new file mode 100644 index 00000000..1f2b0423 --- /dev/null +++ b/ska.matplotlib/meta.yaml @@ -0,0 +1,38 @@ +{% set data = load_setup_py_data() %} + +package: + name: ska.matplotlib # lower case name of package, may contain '-' but no spaces + version: {{ data.get('version') }} + + +build: + preserve_egg_dir: yes + script_env: + - SKA_TOP_SRC_DIR + +source: + path: {{ SKA_TOP_SRC_DIR }}/Ska.Matplotlib + + + +requirements: + build: + - python + - setuptools + - six + - matplotlib + + run: + - python + - setuptools + - six + - matplotlib + - chandra.time + - numpy + +test: + imports: + - Ska.Matplotlib + +about: + home: https://github.com/sot/Ska.Matplotlib diff --git a/ska.quatutil/build.sh b/ska.quatutil/build.sh new file mode 100755 index 00000000..aa8a1fc3 --- /dev/null +++ b/ska.quatutil/build.sh @@ -0,0 +1 @@ +python setup.py install \ No newline at end of file diff --git a/ska.quatutil/meta.yaml b/ska.quatutil/meta.yaml new file mode 100644 index 00000000..12495c17 --- /dev/null +++ b/ska.quatutil/meta.yaml @@ -0,0 +1,42 @@ +{% set data = load_setup_py_data() %} + +package: + name: ska.quatutil + version: {{ data.get('version') }} + +build: + script_env: + - SKA_TOP_SRC_DIR + preserve_egg_dir: yes # (default no) + +source: + path: {{ SKA_TOP_SRC_DIR }}/Ska.quatutil + + +# 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 + - quaternion + - testr + +test: + imports: + - Ska.quatutil + + +about: + home: https://github.com/sot/Ska.quatutil + diff --git a/ska.sun/build.sh b/ska.sun/build.sh new file mode 100644 index 00000000..deaad439 --- /dev/null +++ b/ska.sun/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +# Build script for Ska.File + +$PYTHON setup.py install \ No newline at end of file diff --git a/ska.sun/meta.yaml b/ska.sun/meta.yaml new file mode 100644 index 00000000..4afa64ac --- /dev/null +++ b/ska.sun/meta.yaml @@ -0,0 +1,35 @@ +{% set data = load_setup_py_data() %} + +package: + name: ska.sun # lower case name of package, may contain '-' but no spaces + version: {{ data.get('version') }} + + +build: + preserve_egg_dir: yes + script_env: + - SKA_TOP_SRC_DIR + +source: + path: {{ SKA_TOP_SRC_DIR }}/Ska.Sun + + + +requirements: + build: + - python + - setuptools + + run: + - python + - setuptools + - ska.quatutil + - chandra.time + - quaternion + +test: + imports: + - Ska.Sun + +about: + home: https://github.com/sot/Ska.Sun From e09d57e11e98ad058c4b4d31c5e71d0443122ce0 Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Fri, 30 Jun 2017 14:46:58 -0400 Subject: [PATCH 05/25] Update the build order list --- build_order.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build_order.txt b/build_order.txt index d7cbb076..af362ee4 100644 --- a/build_order.txt +++ b/build_order.txt @@ -10,3 +10,8 @@ ska.numpy quaternion ska.engarchive kadi +ska.matplotlib +ska.quatutil +ska.sun +agasc +chandra_aca From 67676db91872a063cd630876a48e0ddf57dc0e08 Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Fri, 30 Jun 2017 15:14:03 -0400 Subject: [PATCH 06/25] Add ska.tdb --- ska.tdb/build.sh | 1 + ska.tdb/meta.yaml | 41 +++++++++++++++++++++++++++++++++++++++++ ska.tdb/run_test.py | 2 ++ 3 files changed, 44 insertions(+) create mode 100755 ska.tdb/build.sh create mode 100644 ska.tdb/meta.yaml create mode 100644 ska.tdb/run_test.py diff --git a/ska.tdb/build.sh b/ska.tdb/build.sh new file mode 100755 index 00000000..aa8a1fc3 --- /dev/null +++ b/ska.tdb/build.sh @@ -0,0 +1 @@ +python setup.py install \ No newline at end of file diff --git a/ska.tdb/meta.yaml b/ska.tdb/meta.yaml new file mode 100644 index 00000000..3b226ab7 --- /dev/null +++ b/ska.tdb/meta.yaml @@ -0,0 +1,41 @@ +{% set data = load_setup_py_data() %} + +package: + name: ska.tdb + version: {{ data.get('version') }} + +build: + script_env: + - SKA_TOP_SRC_DIR + +source: + path: {{ SKA_TOP_SRC_DIR }}/Ska.tdb + + +# 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 + - numpy + # 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 + - astropy + - testr + +test: + imports: + - Ska.tdb + + +about: + home: https://github.com/sot/Ska.tdb diff --git a/ska.tdb/run_test.py b/ska.tdb/run_test.py new file mode 100644 index 00000000..698656ec --- /dev/null +++ b/ska.tdb/run_test.py @@ -0,0 +1,2 @@ +import Ska.tdb +Ska.tdb.test() From 0a58345395a683eb01d9e2d6daddbbe1c56e664b Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Fri, 30 Jun 2017 15:44:07 -0400 Subject: [PATCH 07/25] Add Ska.ParseCM --- ska.parsecm/build.sh | 1 + ska.parsecm/meta.yaml | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100755 ska.parsecm/build.sh create mode 100644 ska.parsecm/meta.yaml diff --git a/ska.parsecm/build.sh b/ska.parsecm/build.sh new file mode 100755 index 00000000..aa8a1fc3 --- /dev/null +++ b/ska.parsecm/build.sh @@ -0,0 +1 @@ +python setup.py install \ No newline at end of file diff --git a/ska.parsecm/meta.yaml b/ska.parsecm/meta.yaml new file mode 100644 index 00000000..22eec6fc --- /dev/null +++ b/ska.parsecm/meta.yaml @@ -0,0 +1,40 @@ +{% set data = load_setup_py_data() %} + +package: + name: ska.parsecm + version: {{ data.get('version') }} + +build: + script_env: + - SKA_TOP_SRC_DIR + preserve_egg_dir: yes # (default no) + +source: + path: {{ SKA_TOP_SRC_DIR }}/Ska.ParseCM + + +# 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 + - chandra.time + +test: + imports: + - Ska.ParseCM + + +about: + home: https://github.com/sot/Ska.ParseCM + From 018ad042b5d7f99ca4d5f6a8854c9e0f8e88f6fb Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Wed, 5 Jul 2017 13:48:12 -0400 Subject: [PATCH 08/25] Add Chandra.Maneuver --- chandra.maneuver/build.sh | 1 + chandra.maneuver/meta.yaml | 45 ++++++++++++++++++++++++++++++++++++ chandra.maneuver/run_test.py | 2 ++ 3 files changed, 48 insertions(+) create mode 100755 chandra.maneuver/build.sh create mode 100644 chandra.maneuver/meta.yaml create mode 100644 chandra.maneuver/run_test.py diff --git a/chandra.maneuver/build.sh b/chandra.maneuver/build.sh new file mode 100755 index 00000000..aa8a1fc3 --- /dev/null +++ b/chandra.maneuver/build.sh @@ -0,0 +1 @@ +python setup.py install \ No newline at end of file diff --git a/chandra.maneuver/meta.yaml b/chandra.maneuver/meta.yaml new file mode 100644 index 00000000..6b43f89f --- /dev/null +++ b/chandra.maneuver/meta.yaml @@ -0,0 +1,45 @@ +{% set data = load_setup_py_data() %} + +package: + name: chandra.maneuver + version: {{ data.get('version') }} + +build: + script_env: + - SKA_TOP_SRC_DIR + preserve_egg_dir: yes # (default no) + +source: + path: {{ SKA_TOP_SRC_DIR }}/Chandra.Maneuver + + +# 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 + - numpy + - 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 + - cython + - testr + - quaternion + - chandra.time + - ska.sun + +test: + imports: + - Chandra.Maneuver + + +about: + home: https://github.com/sot/Chandra.Maneuver + diff --git a/chandra.maneuver/run_test.py b/chandra.maneuver/run_test.py new file mode 100644 index 00000000..6a443809 --- /dev/null +++ b/chandra.maneuver/run_test.py @@ -0,0 +1,2 @@ +import Chandra.Maneuver +Chandra.Maneuver.test() From e5c16f225d3400026214c854977c3a188b18c12c Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Wed, 5 Jul 2017 14:03:57 -0400 Subject: [PATCH 09/25] Add cmd_states package --- cmd_states/build.sh | 1 + cmd_states/meta.yaml | 49 ++++++++++++++++++++++++++++++++++++++++++ cmd_states/run_test.py | 2 ++ 3 files changed, 52 insertions(+) create mode 100755 cmd_states/build.sh create mode 100644 cmd_states/meta.yaml create mode 100644 cmd_states/run_test.py diff --git a/cmd_states/build.sh b/cmd_states/build.sh new file mode 100755 index 00000000..aa8a1fc3 --- /dev/null +++ b/cmd_states/build.sh @@ -0,0 +1 @@ +python setup.py install \ No newline at end of file diff --git a/cmd_states/meta.yaml b/cmd_states/meta.yaml new file mode 100644 index 00000000..739abe2b --- /dev/null +++ b/cmd_states/meta.yaml @@ -0,0 +1,49 @@ +{% set data = load_setup_py_data() %} + +package: + name: cmd_states + version: {{ data.get('version') }} + +build: + script_env: + - SKA_TOP_SRC_DIR + preserve_egg_dir: yes # (default no) + +source: + path: {{ SKA_TOP_SRC_DIR }}/cmd_states + + +# 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 + - chandra.time + - ska.dbi + - ska.file + - chandra.maneuver + - quaternion + - ska.sun + - ska.parsecm + - ska.numpy + - ska.ftp + - kadi + - ska.table + +test: + imports: + - Chandra.cmd_states + + +about: + home: https://github.com/sot/cmd_states diff --git a/cmd_states/run_test.py b/cmd_states/run_test.py new file mode 100644 index 00000000..b127194b --- /dev/null +++ b/cmd_states/run_test.py @@ -0,0 +1,2 @@ +import Chandra.cmd_states +Chandra.cmd_states.test() From 40b4d957e195989ed97477e9355f0d02f65d14d1 Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Fri, 7 Jul 2017 16:23:45 -0400 Subject: [PATCH 10/25] Add xija recipe --- xija/build.sh | 1 + xija/meta.yaml | 44 ++++++++++++++++++++++++++++++++++++++++++++ xija/run_test.py | 3 +++ 3 files changed, 48 insertions(+) create mode 100755 xija/build.sh create mode 100644 xija/meta.yaml create mode 100644 xija/run_test.py diff --git a/xija/build.sh b/xija/build.sh new file mode 100755 index 00000000..aa8a1fc3 --- /dev/null +++ b/xija/build.sh @@ -0,0 +1 @@ +python setup.py install \ No newline at end of file diff --git a/xija/meta.yaml b/xija/meta.yaml new file mode 100644 index 00000000..ad5fd370 --- /dev/null +++ b/xija/meta.yaml @@ -0,0 +1,44 @@ +{% set data = load_setup_py_data() %} + +package: + name: xija + version: {{ data.get('version') }} + +build: + script_env: + - USER + - SKA_TOP_SRC_DIR + +source: + path: {{ SKA_TOP_SRC_DIR }}/xija + + +# 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 + - testr + - matplotlib + - pyyaks + - sherpa + - chandra.time + +test: + imports: + - xija + + +about: + home: https://github.com/sot/xija diff --git a/xija/run_test.py b/xija/run_test.py new file mode 100644 index 00000000..a7b6b10a --- /dev/null +++ b/xija/run_test.py @@ -0,0 +1,3 @@ +import xija +xija.test() + From a4176945bbaef02516d955842b33803e21c28ad9 Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Fri, 7 Jul 2017 16:23:55 -0400 Subject: [PATCH 11/25] Update build order --- build_order.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build_order.txt b/build_order.txt index af362ee4..bfd187fa 100644 --- a/build_order.txt +++ b/build_order.txt @@ -3,7 +3,9 @@ ska.file pyyaks ska_path testr +ska.tdb chandra.time +ska.parsecm ska.dbi ska.ftp ska.numpy @@ -13,5 +15,7 @@ kadi ska.matplotlib ska.quatutil ska.sun +chandra.maneuver +cmd_states agasc chandra_aca From c17313e83f479174ee45e9b32c5365c02ba98afe Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Wed, 19 Jul 2017 16:45:25 -0400 Subject: [PATCH 12/25] Bash script to build all of the packages --- build_all_packages.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 build_all_packages.sh diff --git a/build_all_packages.sh b/build_all_packages.sh new file mode 100644 index 00000000..3fb2ed9c --- /dev/null +++ b/build_all_packages.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +CONDA_ROOT="$HOME/Projects/ska/builds" + +while IFS='' read -r line || [[ -n "$line" ]]; do + echo "Building $line." + conda-build --croot $CONDA_ROOT --old-build-string $line +done < "build_order.txt" \ No newline at end of file From 3e530b16943a2689f90d4753eca3520a986f1131 Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Fri, 21 Jul 2017 10:39:30 -0400 Subject: [PATCH 13/25] Use GIT_DESCRIBE_TAG to get version number --- agasc/meta.yaml | 4 +--- chandra.maneuver/meta.yaml | 4 +--- chandra.time/meta.yaml | 4 +--- chandra_aca/meta.yaml | 4 +--- cmd_states/meta.yaml | 4 +--- kadi/meta.yaml | 4 +--- pyyaks/meta.yaml | 4 +--- quaternion/meta.yaml | 4 +--- ska.dbi/meta.yaml | 4 +--- ska.engarchive/meta.yaml | 4 +--- ska.file/meta.yaml | 4 +--- ska.ftp/meta.yaml | 4 +--- ska.matplotlib/meta.yaml | 4 +--- ska.numpy/meta.yaml | 4 +--- ska.parsecm/meta.yaml | 5 ++--- ska.quatutil/meta.yaml | 4 +--- ska.shell/meta.yaml | 3 +-- ska.sun/meta.yaml | 3 +-- ska.tdb/meta.yaml | 4 +--- ska_path/meta.yaml | 4 +--- testr/meta.yaml | 4 +--- xija/meta.yaml | 4 +--- 22 files changed, 23 insertions(+), 64 deletions(-) diff --git a/agasc/meta.yaml b/agasc/meta.yaml index 3ce517da..e1542a64 100644 --- a/agasc/meta.yaml +++ b/agasc/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: agasc - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: script_env: diff --git a/chandra.maneuver/meta.yaml b/chandra.maneuver/meta.yaml index 6b43f89f..e713a3ad 100644 --- a/chandra.maneuver/meta.yaml +++ b/chandra.maneuver/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: chandra.maneuver - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: script_env: diff --git a/chandra.time/meta.yaml b/chandra.time/meta.yaml index 1f9fcb2d..826d5a12 100644 --- a/chandra.time/meta.yaml +++ b/chandra.time/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: chandra.time - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: script_env: diff --git a/chandra_aca/meta.yaml b/chandra_aca/meta.yaml index fd0146f7..2108c709 100644 --- a/chandra_aca/meta.yaml +++ b/chandra_aca/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: chandra_aca - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: script_env: diff --git a/cmd_states/meta.yaml b/cmd_states/meta.yaml index 739abe2b..141a7575 100644 --- a/cmd_states/meta.yaml +++ b/cmd_states/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: cmd_states - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: script_env: diff --git a/kadi/meta.yaml b/kadi/meta.yaml index f402beec..ab3eb4d3 100644 --- a/kadi/meta.yaml +++ b/kadi/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: kadi - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: script_env: diff --git a/pyyaks/meta.yaml b/pyyaks/meta.yaml index 9dc60dd2..9aa91e43 100644 --- a/pyyaks/meta.yaml +++ b/pyyaks/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: pyyaks - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: script_env: diff --git a/quaternion/meta.yaml b/quaternion/meta.yaml index 535b9b37..8fbf055c 100644 --- a/quaternion/meta.yaml +++ b/quaternion/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: quaternion - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: script_env: diff --git a/ska.dbi/meta.yaml b/ska.dbi/meta.yaml index cfcb4263..0da2f199 100644 --- a/ska.dbi/meta.yaml +++ b/ska.dbi/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: ska.dbi - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: script_env: diff --git a/ska.engarchive/meta.yaml b/ska.engarchive/meta.yaml index e427771a..0628c638 100644 --- a/ska.engarchive/meta.yaml +++ b/ska.engarchive/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: ska.engarchive - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: script_env: diff --git a/ska.file/meta.yaml b/ska.file/meta.yaml index 2db8ff52..7d51fb15 100644 --- a/ska.file/meta.yaml +++ b/ska.file/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: ska.file # lower case name of package, may contain '-' but no spaces - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: diff --git a/ska.ftp/meta.yaml b/ska.ftp/meta.yaml index a0fc36c5..a3d41802 100644 --- a/ska.ftp/meta.yaml +++ b/ska.ftp/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: ska.ftp - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: script_env: diff --git a/ska.matplotlib/meta.yaml b/ska.matplotlib/meta.yaml index 1f2b0423..10ddaaf1 100644 --- a/ska.matplotlib/meta.yaml +++ b/ska.matplotlib/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: ska.matplotlib # lower case name of package, may contain '-' but no spaces - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: diff --git a/ska.numpy/meta.yaml b/ska.numpy/meta.yaml index b541600b..dccaf0d7 100644 --- a/ska.numpy/meta.yaml +++ b/ska.numpy/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: ska.numpy - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: script_env: diff --git a/ska.parsecm/meta.yaml b/ska.parsecm/meta.yaml index 22eec6fc..9da40d59 100644 --- a/ska.parsecm/meta.yaml +++ b/ska.parsecm/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: ska.parsecm - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: script_env: @@ -22,6 +20,7 @@ requirements: - python - setuptools - six + - chandra.time # Packages required to run the package. These are the dependencies that # will be installed automatically whenever the package is installed. run: diff --git a/ska.quatutil/meta.yaml b/ska.quatutil/meta.yaml index 12495c17..9dfb468b 100644 --- a/ska.quatutil/meta.yaml +++ b/ska.quatutil/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: ska.quatutil - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: script_env: diff --git a/ska.shell/meta.yaml b/ska.shell/meta.yaml index 20314ac6..5fa46cc2 100644 --- a/ska.shell/meta.yaml +++ b/ska.shell/meta.yaml @@ -1,8 +1,7 @@ -{% set data = load_setup_py_data() %} package: name: ska.shell # lower case name of package, may contain '-' but no spaces - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: preserve_egg_dir: yes diff --git a/ska.sun/meta.yaml b/ska.sun/meta.yaml index 4afa64ac..16b85c23 100644 --- a/ska.sun/meta.yaml +++ b/ska.sun/meta.yaml @@ -1,8 +1,7 @@ -{% set data = load_setup_py_data() %} package: name: ska.sun # lower case name of package, may contain '-' but no spaces - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: diff --git a/ska.tdb/meta.yaml b/ska.tdb/meta.yaml index 3b226ab7..767fca7d 100644 --- a/ska.tdb/meta.yaml +++ b/ska.tdb/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: ska.tdb - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: script_env: diff --git a/ska_path/meta.yaml b/ska_path/meta.yaml index a362dab5..2ef3d478 100644 --- a/ska_path/meta.yaml +++ b/ska_path/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: ska_path # lower case name of package, may contain '-' but no spaces - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: diff --git a/testr/meta.yaml b/testr/meta.yaml index 2c820d48..775884f7 100644 --- a/testr/meta.yaml +++ b/testr/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: testr - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: entry_points: diff --git a/xija/meta.yaml b/xija/meta.yaml index ad5fd370..dd825b24 100644 --- a/xija/meta.yaml +++ b/xija/meta.yaml @@ -1,8 +1,6 @@ -{% set data = load_setup_py_data() %} - package: name: xija - version: {{ data.get('version') }} + version: {{ GIT_DESCRIBE_TAG }} build: script_env: From 16c86813278427aaad2344d311a9fd2229a09a56 Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Fri, 21 Jul 2017 11:40:03 -0400 Subject: [PATCH 14/25] Clean up this script and simplify it --- build_all_packages.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build_all_packages.sh b/build_all_packages.sh index 3fb2ed9c..c811b842 100644 --- a/build_all_packages.sh +++ b/build_all_packages.sh @@ -1,8 +1,10 @@ #!/bin/bash -CONDA_ROOT="$HOME/Projects/ska/builds" + +SKA_CONDA_ROOT="$HOME/Projects/ska" +export SKA_TOP_SRC_DIR="${SKA_CONDA_ROOT}/src" while IFS='' read -r line || [[ -n "$line" ]]; do echo "Building $line." - conda-build --croot $CONDA_ROOT --old-build-string $line + conda-build --croot ${SKA_CONDA_ROOT}/builds $line done < "build_order.txt" \ No newline at end of file From f7d41fcaf4febcef2b0423d2d9d447cc82866ae1 Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Mon, 24 Jul 2017 10:51:18 -0400 Subject: [PATCH 15/25] Separate the function of building the package into another script --- build_all_packages.sh | 7 +------ build_one_package.sh | 8 ++++++++ 2 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 build_one_package.sh diff --git a/build_all_packages.sh b/build_all_packages.sh index c811b842..534f1afb 100644 --- a/build_all_packages.sh +++ b/build_all_packages.sh @@ -1,10 +1,5 @@ #!/bin/bash - -SKA_CONDA_ROOT="$HOME/Projects/ska" -export SKA_TOP_SRC_DIR="${SKA_CONDA_ROOT}/src" - while IFS='' read -r line || [[ -n "$line" ]]; do - echo "Building $line." - conda-build --croot ${SKA_CONDA_ROOT}/builds $line + . build_one_package.sh $line done < "build_order.txt" \ No newline at end of file diff --git a/build_one_package.sh b/build_one_package.sh new file mode 100644 index 00000000..e13e036a --- /dev/null +++ b/build_one_package.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +SKA_CONDA_ROOT="$HOME/Projects/ska" +export SKA_TOP_SRC_DIR="${SKA_CONDA_ROOT}/src" +export MACOSX_DEPLOYMENT_TARGET="10.9" + +echo "Building $1." +conda-build --croot ${SKA_CONDA_ROOT}/builds --no-anaconda-upload $1 From 29397655505a046fa30eb3ff2b1a2a3ea9918adf Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Tue, 25 Jul 2017 12:37:35 -0400 Subject: [PATCH 16/25] For now, use AstroPy 1.3 --- kadi/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kadi/meta.yaml b/kadi/meta.yaml index ab3eb4d3..a082693b 100644 --- a/kadi/meta.yaml +++ b/kadi/meta.yaml @@ -33,7 +33,7 @@ requirements: - ska.file - ska.ftp - ska.numpy - - astropy + - astropy 1.3 - quaternion - chandra.time - ska.engarchive From 78dba2535e2ae756ff280a2afcda2a6493b64be1 Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Tue, 25 Jul 2017 12:37:46 -0400 Subject: [PATCH 17/25] These are required to get this package to build --- ska.matplotlib/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ska.matplotlib/meta.yaml b/ska.matplotlib/meta.yaml index 10ddaaf1..e3bba089 100644 --- a/ska.matplotlib/meta.yaml +++ b/ska.matplotlib/meta.yaml @@ -19,6 +19,8 @@ requirements: - setuptools - six - matplotlib + - chandra.time + - numpy run: - python From 3b843e0fb3e97af540c809fe624f0806587c6356 Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Tue, 25 Jul 2017 12:55:25 -0400 Subject: [PATCH 18/25] Adding more build packages to several packages --- chandra.maneuver/meta.yaml | 4 +++- ska.quatutil/meta.yaml | 2 ++ ska.sun/meta.yaml | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/chandra.maneuver/meta.yaml b/chandra.maneuver/meta.yaml index e713a3ad..c3900864 100644 --- a/chandra.maneuver/meta.yaml +++ b/chandra.maneuver/meta.yaml @@ -21,13 +21,15 @@ requirements: - setuptools - numpy - six + - chandra.time + - quaternion + - ska.sun # Packages required to run the package. These are the dependencies that # will be installed automatically whenever the package is installed. run: - python - setuptools - six - - cython - testr - quaternion - chandra.time diff --git a/ska.quatutil/meta.yaml b/ska.quatutil/meta.yaml index 9dfb468b..f6cdef52 100644 --- a/ska.quatutil/meta.yaml +++ b/ska.quatutil/meta.yaml @@ -20,6 +20,8 @@ requirements: - python - setuptools - six + - numpy + - quaternion # Packages required to run the package. These are the dependencies that # will be installed automatically whenever the package is installed. run: diff --git a/ska.sun/meta.yaml b/ska.sun/meta.yaml index 16b85c23..288b8ee4 100644 --- a/ska.sun/meta.yaml +++ b/ska.sun/meta.yaml @@ -18,7 +18,9 @@ requirements: build: - python - setuptools - + - quaternion + - chandra.time + - ska.quatutil run: - python - setuptools From f60d9b5886b9cc40b58ecb25bda73d64f2762366 Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Tue, 25 Jul 2017 13:24:36 -0400 Subject: [PATCH 19/25] Comment these last two out for now until we can build them --- build_order.txt | 4 ++-- cmd_states/meta.yaml | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build_order.txt b/build_order.txt index bfd187fa..5f3c9ff8 100644 --- a/build_order.txt +++ b/build_order.txt @@ -17,5 +17,5 @@ ska.quatutil ska.sun chandra.maneuver cmd_states -agasc -chandra_aca +#agasc +#chandra_aca diff --git a/cmd_states/meta.yaml b/cmd_states/meta.yaml index 141a7575..4ca400b4 100644 --- a/cmd_states/meta.yaml +++ b/cmd_states/meta.yaml @@ -20,6 +20,13 @@ requirements: - python - setuptools - six + - numpy + - ska.file + - ska.dbi + - chandra.time + - chandra.maneuver + - ska.parsecm + - ska.numpy # Packages required to run the package. These are the dependencies that # will be installed automatically whenever the package is installed. run: @@ -36,7 +43,6 @@ requirements: - ska.numpy - ska.ftp - kadi - - ska.table test: imports: From 683ac9cac770e93b77f06aa25d945706bd9c65d1 Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Tue, 25 Jul 2017 13:24:57 -0400 Subject: [PATCH 20/25] Don't build something in build_order.txt which is commented out --- build_all_packages.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build_all_packages.sh b/build_all_packages.sh index 534f1afb..0be46571 100644 --- a/build_all_packages.sh +++ b/build_all_packages.sh @@ -1,5 +1,7 @@ #!/bin/bash while IFS='' read -r line || [[ -n "$line" ]]; do - . build_one_package.sh $line + if [[ line != \#* ]]; then + . build_one_package.sh $line + fi done < "build_order.txt" \ No newline at end of file From 1223ac274b005aa776445193f91a6131cd77e719 Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Tue, 25 Jul 2017 13:25:14 -0400 Subject: [PATCH 21/25] Added build requirements for agasc --- agasc/meta.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/agasc/meta.yaml b/agasc/meta.yaml index e1542a64..d1ce13bd 100644 --- a/agasc/meta.yaml +++ b/agasc/meta.yaml @@ -20,6 +20,11 @@ requirements: - python - setuptools - six + - numpy + - numexpr + - pytables + - ska_path + - chandra.time # Packages required to run the package. These are the dependencies that # will be installed automatically whenever the package is installed. run: From 83a74246824f6e9fe93fcae9b9a867adb2a8a7e8 Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Tue, 25 Jul 2017 13:52:44 -0400 Subject: [PATCH 22/25] Add in xija --- build_order.txt | 1 + xija/meta.yaml | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/build_order.txt b/build_order.txt index 5f3c9ff8..39f43ffd 100644 --- a/build_order.txt +++ b/build_order.txt @@ -17,5 +17,6 @@ ska.quatutil ska.sun chandra.maneuver cmd_states +xija #agasc #chandra_aca diff --git a/xija/meta.yaml b/xija/meta.yaml index dd825b24..081a7524 100644 --- a/xija/meta.yaml +++ b/xija/meta.yaml @@ -20,15 +20,21 @@ requirements: - python - setuptools - six + - numpy + - scipy + - pyyaks # Packages required to run the package. These are the dependencies that # will be installed automatically whenever the package is installed. run: - python - setuptools - six + - scipy - numpy - testr - matplotlib + - ska.matplotlib + - ska.numpy - pyyaks - sherpa - chandra.time From b1dd89b261362a514a308167d405d28f7d661304 Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Tue, 25 Jul 2017 13:57:34 -0400 Subject: [PATCH 23/25] This way actually skips commented lines --- build_all_packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_all_packages.sh b/build_all_packages.sh index 0be46571..9e94b39a 100644 --- a/build_all_packages.sh +++ b/build_all_packages.sh @@ -1,7 +1,7 @@ #!/bin/bash while IFS='' read -r line || [[ -n "$line" ]]; do - if [[ line != \#* ]]; then + if [[ ${line:0:1} != '#' ]]; then . build_one_package.sh $line fi done < "build_order.txt" \ No newline at end of file From acc4fc7af97ce4a0b41e19c7874ca958a2a48dad Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Tue, 25 Jul 2017 14:29:34 -0400 Subject: [PATCH 24/25] Add notes file --- ska-conda-notes.txt | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 ska-conda-notes.txt diff --git a/ska-conda-notes.txt b/ska-conda-notes.txt new file mode 100644 index 00000000..4248c0ca --- /dev/null +++ b/ska-conda-notes.txt @@ -0,0 +1,39 @@ +ska.parsecm: no tests to run by testr + +ska.ftp: two errors on Mac: + +============================================================= ERRORS ============================================================== +__________________________________________ ERROR collecting Ska/ftp/tests/test_basic.py ___________________________________________ +Ska/ftp/tests/test_basic.py:12: in + USER = NETRC['lucky']['login'] +E KeyError: 'lucky' +___________________________________________ ERROR collecting Ska/ftp/tests/test_tar.py ____________________________________________ +test_tar.py:12: in + USER = NETRC['lucky']['login'] +E KeyError: 'lucky' +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Interrupted: 2 errors during collection !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +Presumably due to lack of proper netrc file on my machine + +kadi: will only pass tests if AstroPy < 2.0 is used due to no AstroPy 2.0 config file in /proj/sot/ska/data/config/astropy + +ska.matplotlib: no tests to run by testr +ska.quatutil: no tests to run by testr +ska.sun: no tests to run by testr + +agasc: tests failed with: + +===== testing package: agasc-3.5-py36hf76bb57_0 ===== +running run_test.py +Traceback (most recent call last): + File "/Users/jzuhone/Projects/ska/builds/agasc_1501006954379/test_tmp/run_test.py", line 6, in + agasc.test() + File "/Users/jzuhone/Projects/ska/builds/agasc_1501006954379/_test_env_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_/lib/python3.6/site-packages/agasc-3.5.1-py3.6.egg/agasc/__init__.py", line 11, in test + File "/Users/jzuhone/Projects/ska/builds/agasc_1501006954379/_test_env_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_/lib/python3.6/site-packages/testr/runner.py", line 116, in test + with chdir(os.path.join(*pkg_paths)): + File "/Users/jzuhone/Projects/ska/builds/agasc_1501006954379/_test_env_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_/lib/python3.6/contextlib.py", line 81, in __enter__ + return next(self.gen) + File "/Users/jzuhone/Projects/ska/builds/agasc_1501006954379/_test_env_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_/lib/python3.6/site-packages/testr/runner.py", line 78, in chdir + os.chdir(dirname) +NotADirectoryError: [Errno 20] Not a directory: '/Users/jzuhone/Projects/ska/builds/agasc_1501006954379/_test_env_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_/lib/python3.6/site-packages/agasc-3.5.1-py3.6.egg/agasc/..' +TESTS FAILED: agasc-3.5-py36hf76bb57_0.tar.bz2 From da54819c16ecb62a0ec8508fcedabf43ceb247bd Mon Sep 17 00:00:00 2001 From: John ZuHone Date: Tue, 25 Jul 2017 16:09:15 -0400 Subject: [PATCH 25/25] Use AstroPy 2.0 instead --- kadi/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kadi/meta.yaml b/kadi/meta.yaml index a082693b..ab3eb4d3 100644 --- a/kadi/meta.yaml +++ b/kadi/meta.yaml @@ -33,7 +33,7 @@ requirements: - ska.file - ska.ftp - ska.numpy - - astropy 1.3 + - astropy - quaternion - chandra.time - ska.engarchive