Commit ab39af5f58fcbe8186f5c21897bde20ef9378c8b

Authored by Jürgen Knödlseder
2 parents 564ec524 2c69eb6a

Merge branch 'master' into integration

# Conflicts:
#	ChangeLog
#	NEWS
#	README.md
ChangeLog
... ... @@ -6,11 +6,12 @@
6 6 Add GTime.datetime() method and add optional precision to GTime.utc() (#2909)
7 7  
8 8  
9   -2019-06-25
  9 +2019-07-15
10 10  
11 11 * Bug fix version 1.6.2 released
12 12 ================================
13 13  
  14 + Set dependency library versions for conda build (#2958)
14 15  
15 16  
16 17 2019-06-05
... ...
dev/conda.recipe/meta.yaml.in
... ... @@ -17,13 +17,15 @@ requirements:
17 17 build:
18 18 - python
19 19 - setuptools
20   - - cfitsio
21   - - readline
  20 + - cfitsio ==3.430
  21 + - readline ==7.0
22 22 - ncurses
23 23 - swig
24 24 run:
25 25 - python
26   - - cfitsio
  26 + - cfitsio ==3.430
  27 + - readline ==7.0
  28 + - ncurses
27 29  
28 30 about:
29 31 home: http://cta.irap.omp.eu/gammalib
... ...
doc/source/admin/download.rst
... ... @@ -4,13 +4,14 @@ Download
4 4 ========
5 5  
6 6 The latest GammaLib release is
7   -`gammalib-1.6.1 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.6.1.tar.gz>`_
8   -(5 June 2019).
  7 +`gammalib-1.6.2 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.6.2.tar.gz>`_
  8 +(15 July 2019).
9 9  
10 10 Below a list of older GammaLib releases. Please read the :ref:`release` to
11 11 learn more about new features and corrected bugs in a given release.
12 12  
13 13 To download an older release, click on the corresponding release number:
  14 +`1.6.1 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.6.1.tar.gz>`_
14 15 `1.6.0 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.6.0.tar.gz>`_
15 16 `1.5.4 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.5.4.tar.gz>`_
16 17 `1.5.3 <http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-1.5.3.tar.gz>`_
... ...
doc/source/admin/release_history/1.6.2.rst
1 1 .. _1.6.2:
2 2  
3   -GammaLib 1.6.2 release (25 June 2019)
  3 +GammaLib 1.6.2 release (15 July 2019)
4 4 =====================================
5 5  
6 6 Overview
... ... @@ -10,4 +10,5 @@ GammaLib 1.6.2 is a bug fix release for GammaLib release 1.6.
10 10  
11 11 The following bugs were fixed:
12 12  
13   -* ...
  13 +* [`2958 <https://cta-redmine.irap.omp.eu/issues/2958>`_] -
  14 + Set dependency library versions for conda build
... ...