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

Add compile arg for building on MacOS Catalina / Xcode 11.2 #34

Merged
merged 3 commits into from
Jan 9, 2020

Conversation

taldcroft
Copy link
Member

@taldcroft taldcroft commented Dec 12, 2019

This is apparently needed to allow building Chandra.Time with the latest OS / tools on MacOS.

This includes and thus supercedes #36.

Testing

  • CentOS-5: python setup.py test in a clean directory builds OK and passes tests on presto
  • MacOS Catalina / Xcode 11.2
  • MacOS High Sierra / Xcode (on machine aca@zero)
  • MacOS Mojave [TA will do]

Closes #36

@taldcroft
Copy link
Member Author

This passes python setup.py test on all build platforms + Catalina and Mojave.

@jeanconn
Copy link
Contributor

jeanconn commented Jan 7, 2020

Great. I assume the setuptools_scm is good to go as well. Will this make Chandra.Time 3.20.4 or 3.21 or ?

@taldcroft taldcroft force-pushed the fix-build-on-catalina branch from 114d1c8 to d237dd2 Compare January 7, 2020 19:58
@taldcroft
Copy link
Member Author

I just checked on the setuptools_scm working (it does) but noticed there is a conflict between the two. So I just rebased this on scm_version and resolved the conflict. So as with the other PRs I have been developing, this will supercede scm_version and close it.

About the version, 3.20.4. I'm working on getting all the skare3 issues in to reflect package updates and version numbers.

@jeanconn jeanconn merged commit 8e8d8fc into master Jan 9, 2020
@jeanconn jeanconn deleted the fix-build-on-catalina branch January 9, 2020 19:13
@jeanconn jeanconn mentioned this pull request Jan 10, 2020
22 tasks
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