Skip to content

Commit

Permalink
prepare release of v1.7.1
Browse files Browse the repository at this point in the history
use https links, correct dependency versions, update changelog
  • Loading branch information
dkriegner committed Jan 2, 2021
1 parent a7c45a4 commit 99fefbf
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 35 deletions.
3 changes: 3 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
v1.7.1, 2021-01-02

* harmonize dependency versions between README and setup.py
* remove PDF documentation and other generatable content from the GIT
repository
* new azure pipeline for documentation generation
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ its source folder and obtain the new sources by ::
git pull

or download the new tarball from sourceforge
(http://sf.net/projects/xrayutilities) if any code changed during the update you
(https://sf.net/projects/xrayutilities) if any code changed during the update you
need to reinstall the Python package. Thats easiest achieved by

pip install .
Expand Down
2 changes: 1 addition & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

# General information about the project.
project = 'xrayutilities'
copyright = '2020, Dominik Kriegner, Eugen Wintersberger'
copyright = '2021, Dominik Kriegner, Eugen Wintersberger'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Expand Down
2 changes: 1 addition & 1 deletion lib/xrayutilities/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7.0
1.7.1
31 changes: 2 additions & 29 deletions release.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ This document describes the process of making a new release of xrayutilities.
It is therefore not relevant for users, but only for developers and (maybe to
some extent also for) packagers.

Note: This procedure is intended for use on a Unix operating system.

CHECK EVERYTHING
================

Expand Down Expand Up @@ -41,33 +39,8 @@ Tarball and wheel generation

A tarball and wheels for multiple platforms are generated in the Azure
cibuildwheel pipeline
(https://dev.azure.com/dominikkriegner/xrayutilities/_build). These files
should be downloaded and deployed to PyPI. The whl-files can be downloaded
after the successful run of the pipeline by the following commands:

"""
az devops login
az devops configure -d organization=https://dev.azure.com/dominikkriegner/
az devops configure -d project=xrayutilities

# determine latest runId (make sure its a successful cibuildwheel one!)
az pipelines runs list --pipeline-ids 2 --output table --top 3
runid=$(az pipelines runs list --pipeline-ids 2 --output tsv --top 1 | cut -f 11)

# get artifact download URL
url=$(az pipelines runs artifact list --run-id $runid --output json | python -c "import sys, json; print(json.load(sys.stdin)[0]['resource']['downloadUrl'])")

wget -O drop.zip "$url"
unzip -j -d dist drop.zip
"""

UPDATE PyPI PACKAGE
-------------------

Upload new version to the Python package index after inspecting the dist
folder by

twine upload dist/*
(https://dev.azure.com/dominikkriegner/xrayutilities/_build). The deployment
is done via a release pipeline on Azure.


UPDATE DOCUMENTATION & WEBPAGE
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# Copyright (C) 2009 Eugen Wintersberger <[email protected]>
# Copyright (C) 2010-2020 Dominik Kriegner <[email protected]>
# Copyright (C) 2010-2021 Dominik Kriegner <[email protected]>

import glob
import os.path
Expand Down Expand Up @@ -199,15 +199,15 @@ def run(self):
},
python_requires='~=3.6',
setup_requires=['numpy', 'scipy', 'h5py'],
install_requires=['numpy>=1.9.2', 'scipy>=0.11.0', 'h5py'],
install_requires=['numpy>=1.9.2', 'scipy>=0.13.0', 'h5py'],
extras_require={
'plot': ["matplotlib>=3.1.0"],
'fit': ["lmfit>=1.0.1"],
},
include_dirs=[numpy.get_include()],
ext_modules=[extmodul],
cmdclass=cmdclass,
url="http://xrayutilities.sourceforge.net",
url="https://xrayutilities.sourceforge.io",
license="GPLv2",
script_args=args
)

0 comments on commit 99fefbf

Please sign in to comment.