Skip to content

Commit 08a61d1

Browse files
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 version
2 parents 63242a5 + 4bb5517 commit 08a61d1

File tree

3 files changed

+16
-1
lines changed

3 files changed

+16
-1
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ matrix:
1313
exclude:
1414
- os: osx
1515
env: MYUSEMC=true MYPYTHON_VERSION=2.7
16+
- os: osx
17+
env: MYUSEMC=false
1618

1719
git:
1820
depth: 999999

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Release notes
22

3+
## Version 2021.1.1 - 2021-06-04
4+
5+
### Added
6+
7+
- Add 3D crystal visualization widget using py3Dmol.
8+
9+
### Changed
10+
11+
- Improve the indexing functions.
12+
- Better access to some global optimisation variables.
13+
- Expose the ZScatterer2Molecule function inside Molecule.h.
14+
- Add a cylindrical absorption correction (Lobanov & Alte da Veiga).
15+
316
## Version 2017.2.3 - 2020-06-15
417

518
### Added

site_scons/fallback_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
Update FALLBACK_VERSION when tagging a new release.
88
'''
99

10-
FALLBACK_VERSION = '2017.2.3.post0'
10+
FALLBACK_VERSION = '2021.1.1.post0'

0 commit comments

Comments
 (0)