Commit 08a61d1
committed
Merge branch 'master' of https://github.com/diffpy/libobjcryst
* 'master' of https://github.com/diffpy/libobjcryst:
BLD: bump version to 2021.1.1
BLD: exclude `osx MYUSEMC=false` case in travis
BLD: delete the `osx_image: xcode12.4` and `CONDA_BUILD_SYSROOT` in build config and .travis.yml
BLD: specify macos SDK in CFLAGS variable in .travis.yml
BLD: CONDA_BUILD_SYSROOT especially for osx
BLD: add CONDA_BUILD_SYSROOT in conda_build_config.yaml for the macos sdk
BLD: use xcode12.4 in .travis.yml
Revert "BLD: update .travis.yml, add softwareupdate for osx"
BLD: update .travis.yml, add softwareupdate for osx
BLD: edit fallback version3 files changed
Lines changed: 16 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
| 17 | + | |
16 | 18 | | |
17 | 19 | | |
18 | 20 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
3 | 16 | | |
4 | 17 | | |
5 | 18 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
0 commit comments