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

ska3-matlab update for 2020_005 #297

Merged
merged 8 commits into from
Apr 18, 2020
Merged

ska3-matlab update for 2020_005 #297

merged 8 commits into from
Apr 18, 2020

Conversation

jeanconn
Copy link
Contributor

@jeanconn jeanconn commented Feb 9, 2020

Here is a list of all documented PRs for packages in ska3-matlab between versions 2019.11.20 and 2020.02.27 (this one).

Core changes

  • Django 1.11.3 -> 3.0.1
  • setuptools_scm 1.15.0 -> 3.3.3
  • asgiref 3.2.3 (added)
  • spyder (removed)
  • sqlparse 0.3.0 (added)

Ska3 package changes

acdc: 4.3.1 -> 4.4.1 (all versions: 4.4 -> 4.4.1 -> 4.3.1)

acis_taco: 4.0.1 -> 4.1.0 (all versions: 4.1.0 -> 4.0.1)

acis_thermal_check: v2.9.0 -> 2.9.1 (all versions: 2.9.1 -> v2.9.0)

  • PR 23: Code changes necessary for SCM versioning

acisfp_check: v2.7.0 -> 2.7.1 (all versions: 2.7.1 -> v2.7.0)

  • PR 17: Code changes necessary for SCM versioning

agasc: 4.7 -> 4.8.0 (all versions: 4.8.0 -> 4.7)

  • PR 38: Make proseco-optimized AGASC file
  • PR 39: Use setuptools_scm for single-source version
  • PR 40: Add get_stars() function to get multiple ids / dates

annie: 0.8.2 -> 0.9.1 (all versions: 0.9 -> 0.9.1 -> 0.8.2)

backstop_history: v1.1.0 -> 1.1.1 (all versions: 1.1.1 -> v1.1.0)

  • PR 6: Code changes needed for SCM versioning

Chandra.Maneuver: 3.7.1 -> 3.7.2 (all versions: 3.7.2 -> 3.7.1)

  • PR 15: Use setuptools_scm for single-source version
  • PR 14: Cast number of steps to int

Chandra.Time: 3.20.3 -> 3.20.4 (all versions: 3.20.4 -> 3.20.3)

  • PR 35: Revert "Added changes to use setuptools_scm"
  • PR 34: Add compile arg for building on MacOS Catalina / Xcode 11.2

chandra_aca: 4.27 -> 4.29.0 (all versions: 4.28 -> 4.28.1 -> 4.29.0 -> 4.27)

cmd_states: 3.15 -> 3.15.1 (all versions: 3.15.1 -> 3.15)

  • PR 47: Use setuptools_scm for single-source version

cxotime: 3.1 -> 3.1.1 (all versions: 3.1.1 -> 3.1)

dea_check: v2.3.0 -> 2.3.1 (all versions: 2.3.1 -> v2.3.0)

  • PR 18: Code changes needed for SCM versioning

dpa_check: v2.4.0 -> 2.5.1 (all versions: v2.5.0 -> 2.5.1 -> v2.4.0)

  • PR 17: Fall 2019 recalibration
  • PR 18: Code changes needed for SCM versioning

eng_archive: 4.47.3 -> 4.47.4 (all versions: 4.47.4 -> 4.47.3)

  • PR 187: Use setuptools_scm for single-source version

hopper: 4.4 -> 4.4.1 (all versions: 4.4.1 -> 4.4)

kadi: 4.18.1 -> 5.0.1 (all versions: 5.0.0 -> 5.0.1 -> 4.18.1)

  • PR 139: Update_cmds fixes for py3
  • PR 138: Fix ingest of non-load commands during a load stoppage (anomaly)
  • PR 146: Migrate update_cmds task_schedule to ska3 idiom
  • PR 147: Update mid-manvr test to use column comparisons and isclose
  • PR 152: Add ACIS raw-mode SI modes to ACIS states
  • PR 143: Py3 server with + event/cmd cron jobs processing with django 3.0
  • PR 154: Alerts to aca@head and remove OCC task_schedule configs
  • PR 156: Add .gitattributes and .git_archival.txt for setuptools_scm use
  • PR 157: Setting up automated builds

maude: 3.2 -> 3.3.1 (all versions: 3.3 -> 3.3.1 -> 3.2)

mica: 4.19 -> 4.20.0 (all versions: 4.20.0 -> 4.19)

  • PR 212: Fix an issue in PCAD table viewer with django 2+
  • PR 213: Small fix for PCAD table generation + SCM version changes

parse_cm: 3.5 -> 3.5.1 (all versions: 3.5.1 -> 3.5)

proseco: 4.7.1 -> 4.8.0 (all versions: 4.7.2 -> 4.8.0 -> 4.7.1)

  • PR 314: Implementation of setuptools_scm usage as described in Use setuptools_scm to set package versions #240
  • PR 315: Apply temperature scaling to guide faint mag limit
  • PR 316: Update penalty limit to -8.1C (to support -7.1C planning limit).
  • PR 297: Allow optimizing acq halfw for included star
  • PR 320: Update tests for 2020-02 acq model update
  • PR 319: Setting up automated builds
  • PR 321: Fix optimizing halfw for case of many include_ids
  • PR 322: Add a test of calc_p_safe for two identical catalogs

psmc_check: v1.2.0 -> 1.3.0 (all versions: 1.2.1 -> 1.3.0 -> v1.2.0)

  • PR 16: Code changes necessary for SCM versioning
  • PR 17: Updated fits for 2019/2020

pyyaks: 4.4 -> 4.4.1 (all versions: 4.4.1 -> 4.4)

Quaternion: 3.4.1 -> 3.5.1 (all versions: 3.5.0 -> 3.5.1 -> 3.4.1)

Ska.arc5gl: 3.1.1 -> 3.1.3 (all versions: 3.1.2 -> 3.1.3 -> 3.1.1)

Ska.astro: 3.2.1 -> 3.2.3 (all versions: 3.2.2 -> 3.2.3 -> 3.2.1)

Ska.DBI: 4.0 -> 4.0.1 (all versions: 4.0.1 -> 4.0)

Ska.File: 3.4.1 -> 3.4.3 (all versions: 3.4.2 -> 3.4.3 -> 3.4.1)

Ska.ftp: 3.5.1 -> 3.5.2 (all versions: 3.5.2 -> 3.5.1)

Ska.Matplotlib: 3.11.2 -> 3.11.3 (all versions: 3.11.3 -> 3.11.2)

Ska.Numpy: 3.8.1 -> 3.8.2 (all versions: 3.8.2 -> 3.8.1)

Ska.ParseCM: 3.3.1 -> 3.3.3 (all versions: 3.3.2 -> 3.3.3 -> 3.3.1)

Ska.quatutil: 3.3.1 -> 3.3.2 (all versions: 3.3.2 -> 3.3.1)

Ska.Shell: 3.3.4 -> 3.4.0 (all versions: 3.4.0 -> 3.3.4)

  • PR 15: Fix bash support on catalina + modernize

Ska.Sun: 3.5 -> 3.5.2 (all versions: 3.5.1 -> 3.5.2 -> 3.5)

Ska.tdb: 3.5.1 -> 3.5.2 (all versions: 3.5.2 -> 3.5.1)

ska_path: 3.1 -> 3.1.1 (all versions: 3.1.1 -> 3.1)

ska_sync: 4.5 -> 4.6.0 (all versions: 4.6.0 -> 4.5)

  • PR 14: Use setuptools_scm for single-source version
  • PR 15: Add kadi/events3.db3, remove eng_archive in favor of cheta_sync

sparkles: 4.3 -> 4.5.0 (all versions: 4.4.0 -> 4.5.0 -> 4.3)

starcheck: 13.5 -> 13.5.1 (all versions: 13.5.1 -> 13.5)

tables3_api: 0.1 -> 0.1.1 (all versions: 0.1.1 -> 0.1)

testr: 4.3 -> 4.3.1 (all versions: 4.3.1 -> 4.3)

xija: 4.15 -> 4.17.1 (all versions: 4.16.0 -> 4.17.0 -> 4.17.1 -> 4.15)

@jeanconn jeanconn requested a review from taldcroft February 19, 2020 22:18
@jeanconn
Copy link
Contributor Author

@arthegost and @mbaski This is the PR I have on the Linux side for the updates we would like for Ska for the 2020_005 matlab release. I've called out the critical updates at the top, including the ACA limit items -> chandra_aca, proseco, and sparkles. We have also basically updated every package at this point with small updates related to use of setuptools_scm and the new ska_helpers module.

There are also "core" updates on the Linux side, including the Django update (and a couple of dependencies). I think those can be seen in the last ska3-core change

https://github.com/sot/skare3/pull/254/files#diff-76c25cdb962bf28b9653ff92af31e0cb

(which was promoted along with a ska3-flight update).

Copy link
Member

@taldcroft taldcroft left a comment

Choose a reason for hiding this comment

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

I have not verified the version of each package but this looks generally about right.

@taldcroft
Copy link
Member

@javierggt - do you have the capability to auto-generate the full change report for this release? I.e. the full release content (every included PR) for each package relative to the previous ska3-matlab release.

@jeanconn
Copy link
Contributor Author

And I forgot that I didn't have a 32bit version of the core changes (Django) ready-to-go, so this isn't quite ready.

@@ -3,6 +3,7 @@ package:
version: {{ SKA_PKG_VERSION }}

build:
number: 1
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@taldcroft do you want to remove find_attitude from ska3-matlab or just remove the sherpa dependence? Don't have a 32bit sherpa

Copy link
Member

Choose a reason for hiding this comment

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

Remove find_attitude. We can put it back when we don't support 32-bit. I'd like to be able to call find_attitude from MATLAB tools using MAUDE telemetry ala Mark's attitude finder. But not for this release!

Copy link
Member

Choose a reason for hiding this comment

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

But to be clear, find_attitude does have a hard requirement for sherpa and it is useless without it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, as far as I could tell... by removing the dependence from the meta you just allow the package to be installed. So you'd end up with find_attitude installed and non-functional on 32bit,and find_attitude installed and functional on 64bit.

So this is just a lazy hack to avoid needing to put find_attitude into ska3-core (arch specific) and still gives you find_attitude on 64 bit.

But of course also fine to just pull it from ska3-matlab if you don't really care.

Copy link
Member

Choose a reason for hiding this comment

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

The truth is that I don't really care either way. But it just occurred to me that kadi 5.0 might be unhappy without find_attitude at least installed? Find_attitude will definitely import without sherpa, so maybe that is good enough. So maybe the recipe hack is the right way?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I built with this recipe hack (package presently in the test channel) and will just test it then and come back to this if it broke anything.

@javierggt
Copy link
Contributor

@javierggt - do you have the capability to auto-generate the full change report for this release? I.e. the full release content (every included PR) for each package relative to the previous ska3-matlab release.

I do. That is if I understood correctly: what we need is the list of PR merges between the two versions for each package in ska3-matlab. Of course, if people committed to master I would miss those messages.

@jeanconn
Copy link
Contributor Author

For the briefing in FMTCB, I think this is still:

  1. new ode solver for xija to make it available for use in new models
  2. chandra_aca acquisition model update
  3. proseco and sparkles updates for the limit increase
  4. misc

@sot sot deleted a comment from javierggt Apr 16, 2020
@taldcroft
Copy link
Member

I moved the list from @javierggt to the top description and bolded the items to mention in the briefing (which I can do). The thing to remember is that the MATLAB Ska3 is no longer strictly used in MATLAB tools. People are using this standalone so we highlight any features that might be of general use (but in the FMTCB, I won't dwell on them).

And it makes my heart sing to see this wonderful organized list with all our work.

@jeanconn
Copy link
Contributor Author

Do you want to call out the core package updates in the top of the PR too? They are in the conversation.

@jeanconn jeanconn merged commit 5c9f6e8 into master Apr 18, 2020
@jeanconn jeanconn deleted the matlab_2020_005 branch April 18, 2020 14:54
@jeanconn
Copy link
Contributor Author

jeanconn commented Apr 18, 2020

I note that I think I'm getting this in the tests when I run again for record after installing to matlab/flight.

Ska/engarchive/tests/test_sync.py::test_sync[pcad13eng] 
Test dir: /tmp/pytest-of-SOT/pytest-1/test_sync_pcad13eng_0
Updating server sync for pcad13eng
Making stub archive for pcad13eng
Updating client archive pcad13eng
Checking pcad13eng ['ASPAGYC2A']
FAILED

I think this is OBE in Ska.engarchive, but did think this kind of thing was why we wanted standalone users really to just use ska3-flight.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants