Merge pull request #1695 from takluyver/rever-3.0

Preparation for 3.0.0rc1

.mailmap

@@ -10,43 +10,68 @@
 # gives no duplicates.
 
 Andrew Collette <andrew.collette@gmail.com> andrewcollette <andrew.collette@gmail.com>
+Thomas Kluyver <thomas@kluyver.me.uk> Thomas Kluyver <thomas.kluyver@xfel.eu>
+Thomas Kluyver <thomas@kluyver.me.uk> Thomas Kluyver <takowl@gmail.com>
 Thomas A Caswell <tcaswell@bnl.gov> Thomas A Caswell <tcaswell@uchicago.edu>
 Thomas A Caswell <tcaswell@bnl.gov> Thomas A Caswell <tcaswell@gmail.com>
 James Tocknell <aragilar@gmail.com> James Tocknell <aragilar+github@gmail.com>
-Thomas Kluyver <thomas@kluyver.me.uk> Thomas Kluyver <thomas.kluyver@xfel.eu>
-Thomas Kluyver <thomas@kluyver.me.uk> Thomas Kluyver <takowl@gmail.com>
+Jerome Kieffer <jerome.kieffer@esrf.fr> Jerome Kieffer <github@terre-adelie.org>
 Андрей Парамонов <paramon@lims.acdlabs.ru>
+Henri Payno <henri.payno@esrf.fr> payno <payno@linazimov.esrf.fr>
+Henri Payno <henri.payno@esrf.fr> payno <payno@users.noreply.github.com>
+Henri Payno <henri.payno@esrf.fr> payno <henri.payno@gmail.com>
 Darren Dale <dsdale24@gmail.com> ddale <darren@f2-analysis-2.chess.cornell.edu>
-Aleksandar Jelenak <ajelenak@hdfgroup.org>
+Aleksandar Jelenak <ajelenak@hdfgroup.org> Aleksandar Jelenak <ajelenak@users.noreply.github.com>
+Pierlauro Sciarelli <foss@pstux.dev> Pierlauro Sciarelli <pierlauro@users.noreply.github.com>
+Pierlauro Sciarelli <foss@pstux.dev> Pierlauro Sciarelli <sciarellip@gmail.com>
+Thomas VINCENT <thomas.vincent@esrf.fr>
+Anthony Scopatz <scopatz@gmail.com>
 Valentin Valls <valentin.valls@esrf.fr>
+Chen <chenguopingdota@163.com> chenguoping <chenguopingdota@163.com>
+Chen <chenguopingdota@163.com> Chenguoping <chenguopingdota@163.com>
 Ulrik Kofoed Pedersen <ulrik.pedersen@diamond.ac.uk>
+Stan West <countrycaptain@verizon.net> Stan West <38358698+stanwest@users.noreply.github.com>
 Martin Raspaud <martin.raspaud@smhi.se>
-Anthony Scopatz <scopatz@gmail.com>
 John Kirkham <kirkhamj@janelia.hhmi.org>
 Aaron Parsons <aaron.parsons@diamond.ac.uk>
+Julia Garriga Ferrer <julia.garriga@esrf.fr> juliagarriga <juliiaa28@gmail.com>
+Jerome Kieffer <kieffer@esrf.fr> Jerome Kieffer <jerome.kieffer@terre-adelie.org>
+Hameer Abbasi <hameerabbasi@yahoo.com>
+John Readey <jreadey@hdfgroup.org>
 Lawrence Chan <element103@gmail.com> Lawrence Chan <lchan@jumptrading.com>
 Andrey Paramonov <cmr.pent@gmail.com>
+Cyril Danilevski <cydanil@gmail.com>
+Yu Feng <yfeng1@waterfall.dyn.berkeley.edu> Yu Feng <rainwoodman@gmail.com>
+Yu Feng <yfeng1@waterfall.dyn.berkeley.edu> Yu Feng <feyu@google.com>
 Liu JiaLin <jaln.liu@ttu.edu> valiantljk <jaln.liu@ttu.edu>
 lhole <laurence.hole@gmail.com>
 Ghislain Antony Vaillant <ghisvail@gmail.com> Ghislain Antony Vaillant <ghisvail@users.noreply.github.com>
-Yu Feng <yfeng1@waterfall.dyn.berkeley.edu> Yu Feng <rainwoodman@gmail.com>
 Seth R Johnson <johnsonsr@ornl.gov>
 Matthieu Brucher <matthieu.brucher@gmail.com>
 Andrea Bedini <andrea.bedini@curtin.edu.au> Andrea Bedini <andreabedini@users.noreply.github.com>
 Martin Teichmann <lkb.teichmann@gmail.com>
-Stan West <countrycaptain@verizon.net> Stan West <38358698+stanwest@users.noreply.github.com>
 Axel Huebl <axel.huebl@plasma.ninja>
 Pierre de Buyl <pdebuyl@ulb.ac.be>
+miketrumpis <mtrumpis@gmail.com>
+Vladimir Brankov <vbrankov@janestreet.com>
+V. Armando Solé <sole@esrf.fr>
 Florian Rathgeber <florian.rathgeber@gmail.com>
 Chris Billington <chrisjbillington@gmail.com>
-Thomas VINCENT <thomas.vincent@esrf.fr>
 Max Dietz <maxwell.r.dietz@gmail.com>
+Silas-Asamoah <silasbempong@gmail.com>
+tmichela <thomas.michelat@gmail.com>
+Anna Padee <anna.padee@gmail.com>
+nitrocalcite <jonathan.okasinski@gmail.com>
 Konrad Hinsen <konrad.hinsen@fastmail.net> khinsen <konrad.hinsen@fastmail.net>
 Toon Verstraelen <Toon.Verstraelen@UGent.be>
-Jerome Kieffer <jerome.kieffer@esrf.fr> Jerome Kieffer <github@terre-adelie.org>
 Markus Gerstel <markus.gerstel@diamond.ac.uk>
 Machine User <Machine User@WINBUILD>
 Geoff Wright <gpwright@gmail.com>
+Jordan Farquhar <jordan.a.farquhar@gmail.com> jordan-farq <jordan.a.farquhar@gmail.com>
+Clemens Weninger <clemens.weninger@maxiv.lu.se> Clemens Weninger <clemens@m-info.de>
+Robin De Schepper <robin.deschepper93@gmail.com>
+aporter <aporter@blueorigin.com>
+Kai Muehlbauer <kai.muehlbauer@uni-bonn.de>
 Kit Choi <kit@kychoi.org>
 lucasb-eyer <lucasb.eyer.be@gmail.com>
 Matthew Brett <matthew.brett@gmail.com>
@@ -59,6 +84,8 @@ Chen Yufei <cyf@ruitiancapital.com> Chen Yufei <cyfdecyf@gmail.com>
 Simon Mutch <smutch@unimelb.edu.au>
 Christian Sachs <sachs.christian@gmail.com>
 ebner <simon.ebner@psi.ch>
+egachen <ramon.chen2014@gmail.com>
+Gary Yendell <gary.yendell@diamond.ac.uk>
 Sajid Ali <30510036+s-sajid-ali@users.noreply.github.com>
 Noel Dawe <Noel.Dawe@cern.ch>
 John Tyree <johntyree@gmail.com>
@@ -71,7 +98,6 @@ Will Parkin <wmparkin@gmail.com>
 Devin <>
 Nathan Goldbaum <ngoldbau@illinois.edu>
 paulmueller <paulmueller@users.noreply.github.com>
-Hameer Abbasi <hameerabbasi@yahoo.com>
 Andy Salnikov <a_salnikov@yahoo.com>
 amcnicho <andrew.mcnichols@gmail.com>
 Jonah Bernhard <jonah.bernhard@gmail.com>
@@ -85,6 +111,13 @@ Michael Boyle <michael.oliver.boyle@gmail.com>
 Sam Mason <sam@samason.uk>
 Peter H. Li <phli@google.com>
 jialin <jalnliu@lbl.gov>
+Alex Porter <bomber8013@gmail.com> bomber8013 <bomber8013@gmail.com>
+jhofinger <jonathan.hofinger@gmx.de>
+Aaron Meurer <asmeurer@gmail.com>
+Guinnes Singh <gswebspace@gmail.com>
+Jonathan Okasinski <nitrocalcite@users.noreply.github.com>
+mattip <matti.picus@gmail.com>
+Daniel Berke <berke.daniel@gmail.com>
 joydeep bhattacharjee <joydeepubuntu@gmail.com>
 pharshalp <pharshalp@gmail.com>
 Matthias Geier <Matthias.Geier@gmail.com>
@@ -131,3 +164,16 @@ Jens Timmerman <jens.timmerman@ugent.be>
 Niru Maheswaranathan <nirum@users.noreply.github.com>
 Paco Hope <pacohope@amazon.co.uk>
 Felix Yan <felixonmars@archlinux.org>
+Alex Migon <alexmigon@gmail.com> alemigo <alemigo@github.com>
+Alex Migon <alexmigon@gmail.com> alemigo <32462069+alemigo@users.noreply.github.com>
+Alex Migon <alexmigon@gmail.com> alemig <alemigo@github.com>
+Alex Migon <alexmigon@gmail.com> alemig <32462069+alemigo@users.noreply.github.com>
+Lisandro Dalcin <dalcinl@gmail.com>
+Alexei Colin <acolin@isi.edu>
+Marco Paolini <markopaolini@gmail.com>
+pierlauro <pierlauro.sciarelli@bsc.es>
+Philipp A <flying-sheep@web.de>
+Csaba Kertész <csaba.kertesz@gmail.com>
+Thomas Michelat <32831491+tmichela@users.noreply.github.com>
+Luke Tudge <luketudge@gmail.com>
+Gang Chen <gang.chen@zenuity.com>

AUTHORS

@@ -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

docs/conf.py

@@ -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/high/file.rst

@@ -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/strings.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.