mirror of https://github.com/phonopy/phonopy.git
Merge branch 'rc'
This commit is contained in:
commit
32d3d52902
18
.travis.yml
18
.travis.yml
|
@ -12,15 +12,15 @@ matrix:
|
|||
DOCKER_DEPLOY='manylinux1_x86_64'
|
||||
TRAVIS_PYTHON_VERSION='3.6'
|
||||
PLAT=manylinux1_x86_64
|
||||
- python: '3.6'
|
||||
sudo: required
|
||||
services:
|
||||
- docker
|
||||
env: DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
|
||||
PRE_CMD=linux32
|
||||
DOCKER_DEPLOY='manylinux1_i686'
|
||||
TRAVIS_PYTHON_VERSION='3.6'
|
||||
PLAT=manylinux1_i686
|
||||
# - python: '3.6'
|
||||
# sudo: required
|
||||
# services:
|
||||
# - docker
|
||||
# env: DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
|
||||
# PRE_CMD=linux32
|
||||
# DOCKER_DEPLOY='manylinux1_i686'
|
||||
# TRAVIS_PYTHON_VERSION='3.6'
|
||||
# PLAT=manylinux1_i686
|
||||
- python: '3.6'
|
||||
sudo: required
|
||||
services:
|
||||
|
|
|
@ -1,23 +1,23 @@
|
|||
#!/bin/bash
|
||||
set -e -x
|
||||
|
||||
yum install -y hdf5 freetype-devel
|
||||
yum install -y hdf5 freetype freetype-devel pkgconfig libpng-devel
|
||||
|
||||
for PYBIN in /opt/python/*/bin; do
|
||||
if [[ $PYBIN == *"27"* ]] || [[ $PYBIN == *"35"* ]] || [[ $PYBIN == *"36"* ]] || [[ $PYBIN == *"37"* ]]; then
|
||||
if [[ ! $PYBIN == *"34"* ]]; then
|
||||
"${PYBIN}/pip" install -r /io/dev-requirements.txt
|
||||
"${PYBIN}/pip" wheel /io/ -w wheelhouse/
|
||||
fi
|
||||
done
|
||||
|
||||
# Bundle external shared libraries into the wheels
|
||||
for whl in wheelhouse/*.whl; do
|
||||
for whl in wheelhouse/phonopy*.whl; do
|
||||
auditwheel repair "$whl" --plat $PLAT -w /io/wheelhouse/
|
||||
done
|
||||
|
||||
# Install packages and test
|
||||
for PYBIN in /opt/python/*/bin/; do
|
||||
if [[ $PYBIN == *"27"* ]] || [[ $PYBIN == *"35"* ]] || [[ $PYBIN == *"36"* ]] || [[ $PYBIN == *"37"* ]]; then
|
||||
if [[ ! $PYBIN == *"34"* ]]; then
|
||||
"${PYBIN}/pip" install phonopy --no-index -f /io/wheelhouse
|
||||
(cd "$HOME"; "${PYBIN}/nosetests" phonopy)
|
||||
fi
|
||||
|
|
|
@ -4,13 +4,14 @@ export LBL=$1
|
|||
export TKN=$2
|
||||
export GIT_BRANCH=$3
|
||||
|
||||
|
||||
cd conda
|
||||
sed s/version_from_shell/`git describe --tags --dirty | sed -e 's/-\(.*\)-g.*/+\1/' -e 's/^[vr]//g' -e 's/rc-/rc./' -e 's/dirty/0/'`/ meta.yaml > meta.tmp.yaml
|
||||
sed s/version_from_shell/`git describe --tags --dirty | sed -e 's/-\(.*\)-g.*/+\1/' -e 's/^[vr]//g' -e 's/rc-/rc./' -e 's/-dirty//'`/ meta.yaml > meta.tmp.yaml
|
||||
mv meta.tmp.yaml meta.yaml
|
||||
echo "-----------------------"
|
||||
echo "GIT_BRANCH: $GIT_BRANCH"
|
||||
echo "-----------------------"
|
||||
cd ..
|
||||
conda install -c conda-forge conda-build --yes
|
||||
conda install anaconda-client --yes
|
||||
conda install conda-build anaconda-client --yes
|
||||
conda build conda --no-anaconda-upload
|
||||
TRG=`conda build conda --output |sed -e 's/--/-*-/'`
|
||||
echo "Uploading: $TRG"
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
git checkout $GIT_BRANCH
|
||||
|
||||
./get_nanoversion.sh
|
||||
|
||||
$PYTHON setup.py install
|
||||
|
|
|
@ -32,7 +32,6 @@ requirements:
|
|||
- pyyaml
|
||||
- h5py
|
||||
- setuptools
|
||||
- setuptools_scm
|
||||
|
||||
run:
|
||||
- python
|
||||
|
|
|
@ -3,6 +3,10 @@
|
|||
Change Log
|
||||
==========
|
||||
|
||||
May-3-2020: Version 2.6.1
|
||||
-------------------------
|
||||
* Release for pypi and conda packaging
|
||||
|
||||
May-2-2020: Version 2.6.0
|
||||
-------------------------
|
||||
* Collection of minor fixes and internal updates
|
||||
|
|
|
@ -45,9 +45,9 @@ copyright = u'2009, Atsushi Togo'
|
|||
# built documents.
|
||||
#
|
||||
# The short X.Y version.
|
||||
version = '2.5'
|
||||
version = '2.6'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '2.5.0'
|
||||
release = '2.6.1'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
|
|
@ -1,15 +1,17 @@
|
|||
#!/bin/bash
|
||||
|
||||
br=`git branch |tail -n1`
|
||||
br=`git rev-parse HEAD`
|
||||
echo $br
|
||||
read o u f <<< `git remote -v |grep origin |grep fetch`
|
||||
echo "Repo: $o $u $br"
|
||||
git describe --tags --dirty
|
||||
TD=`mktemp -d`
|
||||
WD=`pwd`
|
||||
git branch
|
||||
git clone $u $TD
|
||||
cd $TD
|
||||
echo $u $br
|
||||
git checkout $br
|
||||
echo $u $br
|
||||
git describe --tags --dirty | sed -e 's/\([.0-9]*\)-\(.*\)-g.*/\2/' -e 's/^[vr]//g' -e 's/rc-//g' > $WD/__nanoversion__.txt
|
||||
cd $WD
|
||||
rm -rf "$TD"
|
||||
|
|
|
@ -32,4 +32,4 @@
|
|||
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
# POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
__version__ = "2.6.0"
|
||||
__version__ = "2.6.1"
|
||||
|
|
5
setup.py
5
setup.py
|
@ -151,14 +151,15 @@ if __name__ == '__main__':
|
|||
|
||||
# # To deploy to pypi/conda by travis-CI
|
||||
if os.path.isfile("__nanoversion__.txt"):
|
||||
nanoversion = 0
|
||||
with open('__nanoversion__.txt') as nv:
|
||||
try:
|
||||
for line in nv:
|
||||
nanoversion = int(line.strip())
|
||||
break
|
||||
except ValueError:
|
||||
nanoversion = 0
|
||||
if nanoversion:
|
||||
pass
|
||||
if nanoversion != 0:
|
||||
version_nums.append(nanoversion)
|
||||
elif git_num:
|
||||
version_nums.append(git_num)
|
||||
|
|
Loading…
Reference in New Issue