Merge pull request #1695 from takluyver/rever-3.0

Preparation for 3.0.0rc1

Author: takluyver

.authors.yml

@@ -10,43 +10,68 @@
 # gives no duplicates.
 
 Andrew Collette <[email protected]> andrewcollette <[email protected]>
+Thomas Kluyver <[email protected]> Thomas Kluyver <[email protected]>
+Thomas Kluyver <[email protected]> Thomas Kluyver <[email protected]>
 Thomas A Caswell <[email protected]> Thomas A Caswell <[email protected]>
 Thomas A Caswell <[email protected]> Thomas A Caswell <[email protected]>
 James Tocknell <[email protected]> James Tocknell <[email protected]>
-Thomas Kluyver <[email protected]> Thomas Kluyver <[email protected]>
-Thomas Kluyver <[email protected]> Thomas Kluyver <[email protected]>
+Jerome Kieffer <[email protected]> Jerome Kieffer <[email protected]>
 Андрей Парамонов <[email protected]>
+Henri Payno <[email protected]> payno <[email protected]>
+Henri Payno <[email protected]> payno <[email protected]>
+Henri Payno <[email protected]> payno <[email protected]>
 Darren Dale <[email protected]> ddale <[email protected]>
-Aleksandar Jelenak <[email protected]>
+Aleksandar Jelenak <[email protected]> Aleksandar Jelenak <[email protected]>
+Pierlauro Sciarelli <[email protected]> Pierlauro Sciarelli <[email protected]>
+Pierlauro Sciarelli <[email protected]> Pierlauro Sciarelli <[email protected]>
+Thomas VINCENT <[email protected]>
+Anthony Scopatz <[email protected]>
 Valentin Valls <[email protected]>
+Chen <[email protected]> chenguoping <[email protected]>
+Chen <[email protected]> Chenguoping <[email protected]>
 Ulrik Kofoed Pedersen <[email protected]>
+Stan West <[email protected]> Stan West <[email protected]>
 Martin Raspaud <[email protected]>
-Anthony Scopatz <[email protected]>
 John Kirkham <[email protected]>
 Aaron Parsons <[email protected]>
+Julia Garriga Ferrer <[email protected]> juliagarriga <[email protected]>
+Jerome Kieffer <[email protected]> Jerome Kieffer <[email protected]>
+Hameer Abbasi <[email protected]>
+John Readey <[email protected]>
 Lawrence Chan <[email protected]> Lawrence Chan <[email protected]>
 Andrey Paramonov <[email protected]>
+Cyril Danilevski <[email protected]>
+Yu Feng <[email protected]> Yu Feng <[email protected]>
+Yu Feng <[email protected]> Yu Feng <[email protected]>
 Liu JiaLin <[email protected]> valiantljk <[email protected]>
 lhole <[email protected]>
 Ghislain Antony Vaillant <[email protected]> Ghislain Antony Vaillant <[email protected]>
-Yu Feng <[email protected]> Yu Feng <[email protected]>
 Seth R Johnson <[email protected]>
 Matthieu Brucher <[email protected]>
 Andrea Bedini <[email protected]> Andrea Bedini <[email protected]>
 Martin Teichmann <[email protected]>
-Stan West <[email protected]> Stan West <[email protected]>
 Axel Huebl <[email protected]>
 Pierre de Buyl <[email protected]>
+miketrumpis <[email protected]>
+Vladimir Brankov <[email protected]>
+V. Armando Solé <[email protected]>
 Florian Rathgeber <[email protected]>
 Chris Billington <[email protected]>
-Thomas VINCENT <[email protected]>
 Max Dietz <[email protected]>
+Silas-Asamoah <[email protected]>
+tmichela <[email protected]>
+Anna Padee <[email protected]>
+nitrocalcite <[email protected]>
 Konrad Hinsen <[email protected]> khinsen <[email protected]>
 Toon Verstraelen <[email protected]>
-Jerome Kieffer <[email protected]> Jerome Kieffer <[email protected]>
 Markus Gerstel <[email protected]>
 Machine User <Machine User@WINBUILD>
 Geoff Wright <[email protected]>
+Jordan Farquhar <[email protected]> jordan-farq <[email protected]>
+Clemens Weninger <[email protected]> Clemens Weninger <[email protected]>
+Robin De Schepper <[email protected]>
+aporter <[email protected]>
+Kai Muehlbauer <[email protected]>
 Kit Choi <[email protected]>
 lucasb-eyer <[email protected]>
 Matthew Brett <[email protected]>
@@ -59,6 +84,8 @@ Chen Yufei <[email protected]> Chen Yufei <[email protected]>
 Simon Mutch <[email protected]>
 Christian Sachs <[email protected]>
 ebner <[email protected]>
+egachen <[email protected]>
+Gary Yendell <[email protected]>
 Sajid Ali <[email protected]>
 Noel Dawe <[email protected]>
 John Tyree <[email protected]>
@@ -71,7 +98,6 @@ Will Parkin <[email protected]>
 Devin <>
 Nathan Goldbaum <[email protected]>
 paulmueller <[email protected]>
-Hameer Abbasi <[email protected]>
 Andy Salnikov <[email protected]>
 amcnicho <[email protected]>
 Jonah Bernhard <[email protected]>
@@ -85,6 +111,13 @@ Michael Boyle <[email protected]>
 Sam Mason <[email protected]>
 Peter H. Li <[email protected]>
 jialin <[email protected]>
+Alex Porter <[email protected]> bomber8013 <[email protected]>
+jhofinger <[email protected]>
+Aaron Meurer <[email protected]>
+Guinnes Singh <[email protected]>
+Jonathan Okasinski <[email protected]>
+mattip <[email protected]>
+Daniel Berke <[email protected]>
 joydeep bhattacharjee <[email protected]>
 pharshalp <[email protected]>
 Matthias Geier <[email protected]>
@@ -131,3 +164,16 @@ Jens Timmerman <[email protected]>
 Niru Maheswaranathan <[email protected]>
 Paco Hope <[email protected]>
 Felix Yan <[email protected]>
+Alex Migon <[email protected]> alemigo <[email protected]>
+Alex Migon <[email protected]> alemigo <[email protected]>
+Alex Migon <[email protected]> alemig <[email protected]>
+Alex Migon <[email protected]> alemig <[email protected]>
+Lisandro Dalcin <[email protected]>
+Alexei Colin <[email protected]>
+Marco Paolini <[email protected]>
+pierlauro <[email protected]>
+Philipp A <[email protected]>
+Csaba Kertész <[email protected]>
+Thomas Michelat <[email protected]>
+Luke Tudge <[email protected]>
+Gang Chen <[email protected]>

.mailmap

@@ -2,41 +2,61 @@ All of the people who have made at least one contribution to h5py.
 Authors are sorted by number of commits.
 
 * Andrew Collette
+* Thomas Kluyver
 * Thomas A Caswell
 * James Tocknell
-* Thomas Kluyver
+* Jerome Kieffer
 * Андрей Парамонов
+* Henri Payno
 * Darren Dale
 * Aleksandar Jelenak
+* Pierlauro Sciarelli
+* Thomas VINCENT
+* Anthony Scopatz
 * Valentin Valls
+* Chen
 * Ulrik Kofoed Pedersen
+* Stan West
 * Martin Raspaud
-* Anthony Scopatz
 * John Kirkham
 * Aaron Parsons
+* Julia Garriga Ferrer
+* Jerome Kieffer
+* Hameer Abbasi
+* John Readey
 * Lawrence Chan
 * Andrey Paramonov
+* Cyril Danilevski
+* Yu Feng
 * Liu JiaLin
 * lhole
 * Ghislain Antony Vaillant
-* Yu Feng
 * Seth R Johnson
 * Matthieu Brucher
 * Andrea Bedini
 * Martin Teichmann
-* Stan West
 * Axel Huebl
 * Pierre de Buyl
+* miketrumpis
+* Vladimir Brankov
+* V. Armando Solé
 * Florian Rathgeber
 * Chris Billington
-* Thomas VINCENT
 * Max Dietz
+* Silas-Asamoah
+* tmichela
+* Anna Padee
+* nitrocalcite
 * Konrad Hinsen
 * Toon Verstraelen
-* Jerome Kieffer
 * Markus Gerstel
 * Machine User
 * Geoff Wright
+* Jordan Farquhar
+* Clemens Weninger
+* Robin De Schepper
+* aporter
+* Kai Muehlbauer
 * Kit Choi
 * lucasb-eyer
 * Matthew Brett
@@ -49,6 +69,8 @@ Authors are sorted by number of commits.
 * Simon Mutch
 * Christian Sachs
 * ebner
+* egachen
+* Gary Yendell
 * Sajid Ali
 * Noel Dawe
 * John Tyree
@@ -61,7 +83,6 @@ Authors are sorted by number of commits.
 * Devin
 * Nathan Goldbaum
 * paulmueller
-* Hameer Abbasi
 * Andy Salnikov
 * amcnicho
 * Jonah Bernhard
@@ -75,6 +96,13 @@ Authors are sorted by number of commits.
 * Sam Mason
 * Peter H. Li
 * jialin
+* Alex Porter
+* jhofinger
+* Aaron Meurer
+* Guinnes Singh
+* Jonathan Okasinski
+* mattip
+* Daniel Berke
 * joydeep bhattacharjee
 * pharshalp
 * Matthias Geier
@@ -121,3 +149,13 @@ Authors are sorted by number of commits.
 * Niru Maheswaranathan
 * Paco Hope
 * Felix Yan
+* Alex Migon
+* Lisandro Dalcin
+* Alexei Colin
+* Marco Paolini
+* pierlauro
+* Philipp A
+* Csaba Kertész
+* Thomas Michelat
+* Luke Tudge
+* Gang Chen

AUTHORS

@@ -36,8 +36,10 @@
 
 intersphinx_mapping = {'low': ('https://api.h5py.org', None)}
 
-extlinks = {'issue': ('https://github.com/h5py/h5py/issues/%s',
-                      'GH')}
+extlinks = {
+    'issue': ('https://github.com/h5py/h5py/issues/%s', 'GH'),
+    'pr': ('https://github.com/h5py/h5py/pull/%s', 'PR '),
+}
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
@@ -59,7 +61,7 @@
 # built documents.
 #
 # The full version, including alpha/beta/rc tags.
-release = '2.10.0'
+release = '3.0.0rc1'
 # The short X.Y version.
 version = '.'.join(release.split('.')[:2])
 

docs/conf.py

@@ -331,7 +331,8 @@ Reference
 
 .. class:: File(name, mode=None, driver=None, libver=None, \
     userblock_size=None, swmr=False, rdcc_nslots=None, rdcc_nbytes=None, \
-    rdcc_w0=None, track_order=None, **kwds)
+    rdcc_w0=None, track_order=None, fs_strategy=None, fs_persist=False, \
+    fs_threshold=1, **kwds)
 
     Open or create a new file.
 
@@ -360,6 +361,15 @@ Reference
     :param track_order:  Track dataset/group/attribute creation order under
                     root group if ``True``.  Default is
                     ``h5.get_config().track_order``.
+    :param fs_strategy: The file space handling strategy to be used.
+            Only allowed when creating a new file. One of "fsm", "page",
+            "aggregate", "none", or None (to use the HDF5 default).
+    :param fs_persist: A boolean to indicate whether free space should be
+            persistent or not. Only allowed when creating a new file. The
+            default is False.
+    :param fs_threshold: The smallest free-space section size that the free
+            space manager will track. Only allowed when creating a new file.
+            The default is 1.
     :param kwds:    Driver-specific keywords; see :ref:`file_driver`.
 
     .. method:: __bool__()
@@ -397,6 +407,11 @@ Reference
         ("r+").  Will always be one of these two values, regardless of the
         mode used to open the file.
 
+    .. attribute:: swmr_mode
+
+       True if the file access is using :doc:`/swmr`. Use :attr:`mode` to
+       distinguish SWMR read from write.
+
     .. attribute:: driver
 
         String giving the driver used to open the file.  Refer to

docs/high/file.rst

@@ -74,9 +74,9 @@ Unicode strings are used exclusively for object names in the file::
     >>> f.name
     '/'
 
-You can supply either byte or unicode strings (on both Python 2 and Python 3)
+You can supply either byte or unicode strings
 when creating or retrieving objects. If a byte string is supplied,
-it will be used as-is; Unicode strings will be encoded down to UTF-8.
+it will be used as-is; Unicode strings will be encoded as UTF-8.
 
 In the file, h5py uses the most-compatible representation; H5T_CSET_ASCII for
 characters in the ASCII range; H5T_CSET_UTF8 otherwise.