From f59c92994fa29181dbde26c0cc7b3317fc39082d Mon Sep 17 00:00:00 2001 From: Jean Connelly Date: Fri, 27 Jul 2018 10:13:13 -0400 Subject: [PATCH 1/8] Add astropy 3.0.3 and test deps to ska3-core --- ska_conda/pkg_defs/ska3-core/meta.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ska_conda/pkg_defs/ska3-core/meta.yaml b/ska_conda/pkg_defs/ska3-core/meta.yaml index 9ad150d2..478a3045 100644 --- a/ska_conda/pkg_defs/ska3-core/meta.yaml +++ b/ska_conda/pkg_defs/ska3-core/meta.yaml @@ -12,7 +12,7 @@ requirements: - appnope ==0.1.0 [osx] - asn1crypto ==0.22.0 - astroid ==1.5.3 - - astropy ==2.0.1 + - astropy ==3.0.3 - babel ==2.5.0 - beautifulsoup4 ==4.6.0 - bkcharts ==0.2 @@ -121,6 +121,11 @@ requirements: - pyqt ==5.6.0 - pytables ==3.4.2 - pytest ==3.2.1 + - pytest-arraydiff ==0.2 + - pytest-astropy ==0.4.0 + - pytest-doctestplus ==0.1.3 + - pytest-openfiles ==0.3.0 + - pytest-remotedata ==0.3.0 - python ==3.6.2 - python-dateutil ==2.6.1 - python.app ==1.2 [osx] From ec39176de5397957f2eb2ff6e7ba345d82e78f93 Mon Sep 17 00:00:00 2001 From: Jean Connelly Date: Fri, 27 Jul 2018 10:14:35 -0400 Subject: [PATCH 2/8] Update ska3-core version to 2018.07.27 --- ska_conda/pkg_defs/ska3-core/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ska_conda/pkg_defs/ska3-core/meta.yaml b/ska_conda/pkg_defs/ska3-core/meta.yaml index 478a3045..39849676 100644 --- a/ska_conda/pkg_defs/ska3-core/meta.yaml +++ b/ska_conda/pkg_defs/ska3-core/meta.yaml @@ -1,6 +1,6 @@ package: name: ska3-core - version: 2018.07.26 + version: 2018.07.27 requirements: # Packages required to run the package. These are the dependencies that From e224c62c34f2d63c44422cfc459ffa23d4422a49 Mon Sep 17 00:00:00 2001 From: Jean Connelly Date: Fri, 27 Jul 2018 10:15:06 -0400 Subject: [PATCH 3/8] Update maude to 3.2 in ska3-flight --- ska_conda/pkg_defs/ska3-flight/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ska_conda/pkg_defs/ska3-flight/meta.yaml b/ska_conda/pkg_defs/ska3-flight/meta.yaml index d6f2daa2..896b5476 100644 --- a/ska_conda/pkg_defs/ska3-flight/meta.yaml +++ b/ska_conda/pkg_defs/ska3-flight/meta.yaml @@ -20,7 +20,7 @@ requirements: - cxotime ==3.1 - hopper ==0.3 - kadi ==3.15.4 - - maude ==3.1 + - maude ==3.2 - mica ==3.14.0 - parse_cm ==3.3.2 - pyyaks ==3.3.4 From 67b1dbffeb6d1d91aecdbac0a02aa477ad8539ac Mon Sep 17 00:00:00 2001 From: Jean Connelly Date: Fri, 27 Jul 2018 10:19:04 -0400 Subject: [PATCH 4/8] Update kadi to 3.15.5 (fixes tests) --- ska_conda/pkg_defs/ska3-flight/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ska_conda/pkg_defs/ska3-flight/meta.yaml b/ska_conda/pkg_defs/ska3-flight/meta.yaml index 896b5476..587e0bee 100644 --- a/ska_conda/pkg_defs/ska3-flight/meta.yaml +++ b/ska_conda/pkg_defs/ska3-flight/meta.yaml @@ -19,7 +19,7 @@ requirements: - chandra.time ==3.20.1 - cxotime ==3.1 - hopper ==0.3 - - kadi ==3.15.4 + - kadi ==3.15.5 - maude ==3.2 - mica ==3.14.0 - parse_cm ==3.3.2 From 174ef72fc0957237b277f0411f80fc7adc7500e7 Mon Sep 17 00:00:00 2001 From: Jean Connelly Date: Fri, 27 Jul 2018 10:19:59 -0400 Subject: [PATCH 5/8] Update cmd_states to 3.14.1 (fixes tests) --- ska_conda/pkg_defs/ska3-flight/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ska_conda/pkg_defs/ska3-flight/meta.yaml b/ska_conda/pkg_defs/ska3-flight/meta.yaml index 587e0bee..ddf65e1a 100644 --- a/ska_conda/pkg_defs/ska3-flight/meta.yaml +++ b/ska_conda/pkg_defs/ska3-flight/meta.yaml @@ -14,7 +14,7 @@ requirements: - agasc ==3.5.2 - annie ==0.5 - chandra_aca ==3.22 - - chandra.cmd_states ==3.14 + - chandra.cmd_states ==3.14.1 - chandra.maneuver ==3.7 - chandra.time ==3.20.1 - cxotime ==3.1 From cf69aa3d57cc41c78e9167ce2d120408b4d18b95 Mon Sep 17 00:00:00 2001 From: Jean Connelly Date: Fri, 27 Jul 2018 10:20:29 -0400 Subject: [PATCH 6/8] Update xija to 3.11 --- ska_conda/pkg_defs/ska3-flight/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ska_conda/pkg_defs/ska3-flight/meta.yaml b/ska_conda/pkg_defs/ska3-flight/meta.yaml index ddf65e1a..a57d33dd 100644 --- a/ska_conda/pkg_defs/ska3-flight/meta.yaml +++ b/ska_conda/pkg_defs/ska3-flight/meta.yaml @@ -42,4 +42,4 @@ requirements: - ska.tdb ==3.5.1 - tables3_api ==0.1 - testr ==3.2 - - xija ==3.10 + - xija ==3.11 From b3e7fd819120ace03f166001966e40dbad544cc9 Mon Sep 17 00:00:00 2001 From: Jean Connelly Date: Fri, 27 Jul 2018 10:22:14 -0400 Subject: [PATCH 7/8] Update eng_archive to 3.43.2 --- ska_conda/pkg_defs/ska3-flight/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ska_conda/pkg_defs/ska3-flight/meta.yaml b/ska_conda/pkg_defs/ska3-flight/meta.yaml index a57d33dd..b88713a2 100644 --- a/ska_conda/pkg_defs/ska3-flight/meta.yaml +++ b/ska_conda/pkg_defs/ska3-flight/meta.yaml @@ -29,7 +29,7 @@ requirements: - ska.arc5gl ==3.1.1 - ska.astro ==3.2.1 - ska.dbi ==3.8.2 - - ska.engarchive ==3.43.1 + - ska.engarchive ==3.43.2 - ska.file ==3.4.1 - ska.ftp ==3.5 - ska.numpy ==3.8.1 From 23a8b5371d1bd63f1f48db5aef3c619b313f4722 Mon Sep 17 00:00:00 2001 From: Jean Connelly Date: Fri, 27 Jul 2018 10:23:21 -0400 Subject: [PATCH 8/8] Update ska3-flight with recent ska3-core/ska3-template and cut version --- ska_conda/pkg_defs/ska3-flight/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ska_conda/pkg_defs/ska3-flight/meta.yaml b/ska_conda/pkg_defs/ska3-flight/meta.yaml index b88713a2..732729f8 100644 --- a/ska_conda/pkg_defs/ska3-flight/meta.yaml +++ b/ska_conda/pkg_defs/ska3-flight/meta.yaml @@ -1,6 +1,6 @@ package: name: ska3-flight - version: 2018.07.26 + version: 2018.07.27 build: noarch: generic @@ -9,8 +9,8 @@ requirements: # Packages required to run the package. These are the dependencies that # will be installed automatically whenever the package is installed. run: - - ska3-core ==2018.07.26 - - ska3-template ==0.1 + - ska3-core ==2018.07.27 + - ska3-template ==2018.07.27 - agasc ==3.5.2 - annie ==0.5 - chandra_aca ==3.22