From 272d66818227abd415ca1a9e046d5987abd41a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20de=20Menten?= <gdementen@gmail.com>
Date: Fri, 7 Feb 2020 16:42:21 +0100
Subject: [PATCH 01/13] bump version to 0.32.2-dev
---
condarecipe/larray/meta.yaml | 4 +-
doc/source/changes.rst | 14 ++++++
doc/source/changes/version_0_32_2.rst.inc | 58 +++++++++++++++++++++++
larray/__init__.py | 2 +-
setup.py | 2 +-
5 files changed, 76 insertions(+), 4 deletions(-)
create mode 100644 doc/source/changes/version_0_32_2.rst.inc
diff --git a/condarecipe/larray/meta.yaml b/condarecipe/larray/meta.yaml
index 150cdd70a..0e16f54e2 100644
--- a/condarecipe/larray/meta.yaml
+++ b/condarecipe/larray/meta.yaml
@@ -1,9 +1,9 @@
package:
name: larray
- version: 0.32.1
+ version: 0.32.2-dev
source:
- git_tag: 0.32.1
+ git_tag: 0.32.2-dev
git_url: https://github.com/larray-project/larray.git
# git_tag: master
# git_url: file://c:/Users/gdm/devel/larray/.git
diff --git a/doc/source/changes.rst b/doc/source/changes.rst
index e531b1f51..be49956e0 100644
--- a/doc/source/changes.rst
+++ b/doc/source/changes.rst
@@ -1,6 +1,20 @@
Change log
##########
+Version 0.32.2
+==============
+
+In development.
+
+CORE
+----
+.. include:: ./changes/version_0_32_2.rst.inc
+
+EDITOR
+------
+.. include:: ./changes/editor/version_0_32_2.rst.inc
+
+
Version 0.32.1
==============
diff --git a/doc/source/changes/version_0_32_2.rst.inc b/doc/source/changes/version_0_32_2.rst.inc
new file mode 100644
index 000000000..a23f5c467
--- /dev/null
+++ b/doc/source/changes/version_0_32_2.rst.inc
@@ -0,0 +1,58 @@
+.. py:currentmodule:: larray
+
+
+Syntax changes
+^^^^^^^^^^^^^^
+
+* renamed ``Array.old_method_name()`` to :py:obj:`Array.new_method_name()` (closes :issue:`1`).
+
+* renamed ``old_argument_name`` argument of :py:obj:`Array.method_name()` to ``new_argument_name``.
+
+
+Backward incompatible changes
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* other backward incompatible changes
+
+
+New features
+^^^^^^^^^^^^
+
+* added a feature (see the :ref:`miscellaneous section <misc>` for details). It works on :ref:`api-axis` and
+ :ref:`api-group` objects.
+
+ Here is an example of the new feature:
+
+ >>> arr = ndtest((2, 3))
+ >>> arr
+ a\b b0 b1 b2
+ a0 0 1 2
+ a1 3 4 5
+
+ And it can also be used like this:
+
+ >>> arr = ndtest("a=a0..a2")
+ >>> arr
+ a a0 a1 a2
+ 0 1 2
+
+* added another feature in the editor (closes :editor_issue:`1`).
+
+ .. note::
+
+ - It works for foo bar !
+ - It does not work for foo baz !
+
+
+.. _misc:
+
+Miscellaneous improvements
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* improved something.
+
+
+Fixes
+^^^^^
+
+* fixed something (closes :issue:`1`).
diff --git a/larray/__init__.py b/larray/__init__.py
index 3310c1824..346387c7e 100644
--- a/larray/__init__.py
+++ b/larray/__init__.py
@@ -1,6 +1,6 @@
from __future__ import absolute_import, division, print_function
-__version__ = '0.32.1'
+__version__ = '0.32.2-dev'
from larray.core.axis import Axis, AxisCollection, X
diff --git a/setup.py b/setup.py
index 6160da31b..ea3c579e1 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ def readlocal(fname):
DISTNAME = 'larray'
-VERSION = '0.32.1'
+VERSION = '0.32.2-dev'
AUTHOR = 'Gaetan de Menten, Geert Bryon, Johan Duyck, Alix Damman'
AUTHOR_EMAIL = 'gdementen@gmail.com'
DESCRIPTION = "N-D labeled arrays in Python"
From 8424774041f7472213baa730e290e4ece790ca17 Mon Sep 17 00:00:00 2001
From: Alix Damman <ald@plan.be>
Date: Wed, 8 Jan 2020 11:03:55 +0100
Subject: [PATCH 02/13] fixed test_init_session_xlsx()
---
larray/tests/test_session.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/larray/tests/test_session.py b/larray/tests/test_session.py
index 55fbb0a99..06fb7bc78 100644
--- a/larray/tests/test_session.py
+++ b/larray/tests/test_session.py
@@ -67,7 +67,8 @@ def test_init_session(meta):
@needs_xlwings
def test_init_session_xlsx():
s = Session(inputpath('demography_eurostat.xlsx'))
- assert s.names == ['births', 'deaths', 'immigration', 'pop', 'pop_benelux']
+ assert s.names == ['births', 'deaths', 'immigration', 'population',
+ 'population_5_countries', 'population_benelux']
@needs_pytables
From 153e524b62b6978cb1a5d3bb4c7b9769a1c9a4b9 Mon Sep 17 00:00:00 2001
From: Alix Damman <ald@plan.be>
Date: Wed, 15 Jan 2020 15:46:57 +0100
Subject: [PATCH 03/13] .travis.yml: workaround for Python 2.7 to install tqdm
explicitly before updating conda
---
.travis.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 3e3e20017..72e6a9cdf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,10 @@ before_install:
- hash -r
- conda config --add channels conda-forge
- conda config --set always_yes yes --set changeps1 no
+ # workaround for conda >= 4.8
+ - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
+ pip install tqdm;
+ fi
- conda update -q conda
# Useful for debugging any issues with conda
From 5fa715bb898d40e80a84c553dd5cc5d1832b6d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20de=20Menten?= <gdementen@gmail.com>
Date: Fri, 31 Jan 2020 11:49:10 +0100
Subject: [PATCH 04/13] fixed using Pandas >= 1.0 (closes #845)
---
doc/source/changes/version_0_32_2.rst.inc | 2 +-
larray/inout/pandas.py | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/source/changes/version_0_32_2.rst.inc b/doc/source/changes/version_0_32_2.rst.inc
index a23f5c467..9ff45a3fe 100644
--- a/doc/source/changes/version_0_32_2.rst.inc
+++ b/doc/source/changes/version_0_32_2.rst.inc
@@ -55,4 +55,4 @@ Miscellaneous improvements
Fixes
^^^^^
-* fixed something (closes :issue:`1`).
+* fixed using Pandas >= 1.0 (closes :issue:`845`).
diff --git a/larray/inout/pandas.py b/larray/inout/pandas.py
index 36dc563b5..f8680a179 100644
--- a/larray/inout/pandas.py
+++ b/larray/inout/pandas.py
@@ -39,13 +39,13 @@ def index_to_labels(idx, sort=True):
r"""
Returns unique labels for each dimension.
"""
- if isinstance(idx, pd.core.index.MultiIndex):
+ if isinstance(idx, pd.MultiIndex):
if sort:
return list(idx.levels)
else:
return [list(unique(idx.get_level_values(l))) for l in range(idx.nlevels)]
else:
- assert isinstance(idx, pd.core.index.Index)
+ assert isinstance(idx, pd.Index)
labels = list(idx.values)
return [sorted(labels) if sort else labels]
@@ -53,7 +53,7 @@ def index_to_labels(idx, sort=True):
def cartesian_product_df(df, sort_rows=False, sort_columns=False, fill_value=nan, **kwargs):
idx = df.index
labels = index_to_labels(idx, sort=sort_rows)
- if isinstance(idx, pd.core.index.MultiIndex):
+ if isinstance(idx, pd.MultiIndex):
if sort_rows:
new_index = pd.MultiIndex.from_product(labels)
else:
@@ -118,14 +118,14 @@ def from_series(s, sort_rows=False, fill_value=nan, meta=None, **kwargs):
a1 b0 4.0 5.0
a1 b1 6.0 7.0
"""
- if isinstance(s.index, pd.core.index.MultiIndex):
+ if isinstance(s.index, pd.MultiIndex):
# TODO: use argument sort=False when it will be available
# (see https://github.com/pandas-dev/pandas/issues/15105)
df = s.unstack(level=-1, fill_value=fill_value)
# pandas (un)stack and pivot(_table) methods return a Dataframe/Series with sorted index and columns
if not sort_rows:
labels = index_to_labels(s.index, sort=False)
- if isinstance(df.index, pd.core.index.MultiIndex):
+ if isinstance(df.index, pd.MultiIndex):
index = pd.MultiIndex.from_tuples(list(product(*labels[:-1])), names=s.index.names[:-1])
else:
index = labels[0]
From 4f923072dade8bc229c312001a741fa5457f9062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20de=20Menten?= <gdementen@gmail.com>
Date: Fri, 7 Feb 2020 15:47:31 +0100
Subject: [PATCH 05/13] fixed edge case on python 2.7 + Linux
---
larray/core/axis.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/larray/core/axis.py b/larray/core/axis.py
index a250d85af..c203e4e7d 100644
--- a/larray/core/axis.py
+++ b/larray/core/axis.py
@@ -2830,7 +2830,7 @@ def _key_to_raw_and_axes(self, key, collapse_slices=False, translate_key=True):
# transform non-Array advanced keys (list and ndarray) to Array
def to_la_ikey(axis, axis_key):
- if isinstance(axis_key, (int, np.integer, slice, Array)):
+ if isinstance(axis_key, (int, long, np.integer, slice, Array)):
return axis_key
else:
assert isinstance(axis_key, (list, np.ndarray))
From 12c2b3d14413b2d784da4a8caa0423b37604aab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20de=20Menten?= <gdementen@gmail.com>
Date: Fri, 7 Feb 2020 16:10:58 +0100
Subject: [PATCH 06/13] fixed tests on python 2.7
pytest --deselect argument requires pytest 3.5+ and for whatever reason conda gave use an older version by default
---
.travis.yml | 2 +-
doc/source/changes/version_0_32_2.rst.inc | 53 +----------------------
2 files changed, 3 insertions(+), 52 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 72e6a9cdf..9c6bfa121 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,7 +45,7 @@ install:
# (issue 702 : fixed bug when writing metadata using HDF format)
- conda create -n travisci --yes python=${TRAVIS_PYTHON_VERSION:0:3}
"numpy>=1.13" "pandas>=0.20" pytables matplotlib xlrd openpyxl
- xlsxwriter pytest pytest-pep8
+ xlsxwriter "pytest>=3.5" pytest-pep8
- source activate travisci
script:
diff --git a/doc/source/changes/version_0_32_2.rst.inc b/doc/source/changes/version_0_32_2.rst.inc
index 9ff45a3fe..2d1cebd67 100644
--- a/doc/source/changes/version_0_32_2.rst.inc
+++ b/doc/source/changes/version_0_32_2.rst.inc
@@ -1,58 +1,9 @@
.. py:currentmodule:: larray
-Syntax changes
-^^^^^^^^^^^^^^
-
-* renamed ``Array.old_method_name()`` to :py:obj:`Array.new_method_name()` (closes :issue:`1`).
-
-* renamed ``old_argument_name`` argument of :py:obj:`Array.method_name()` to ``new_argument_name``.
-
-
-Backward incompatible changes
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* other backward incompatible changes
-
-
-New features
-^^^^^^^^^^^^
-
-* added a feature (see the :ref:`miscellaneous section <misc>` for details). It works on :ref:`api-axis` and
- :ref:`api-group` objects.
-
- Here is an example of the new feature:
-
- >>> arr = ndtest((2, 3))
- >>> arr
- a\b b0 b1 b2
- a0 0 1 2
- a1 3 4 5
-
- And it can also be used like this:
-
- >>> arr = ndtest("a=a0..a2")
- >>> arr
- a a0 a1 a2
- 0 1 2
-
-* added another feature in the editor (closes :editor_issue:`1`).
-
- .. note::
-
- - It works for foo bar !
- - It does not work for foo baz !
-
-
-.. _misc:
-
-Miscellaneous improvements
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-* improved something.
-
-
Fixes
^^^^^
* fixed using Pandas >= 1.0 (closes :issue:`845`).
+
+* fixed a few issues for Python 2.7 and/or Linux.
From b73246f814f0e1c24f96cfc9382f6eed1c1c7225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20de=20Menten?= <gdementen@gmail.com>
Date: Mon, 9 Mar 2020 18:07:38 +0100
Subject: [PATCH 07/13] fix #849: workaround to fix the missing space between
parameters name and type in API doc
---
doc/source/_static/custom.css | 13 +++++++++++++
doc/source/changes/version_0_32_2.rst.inc | 2 ++
doc/source/conf.py | 11 ++++++++++-
3 files changed, 25 insertions(+), 1 deletion(-)
create mode 100644 doc/source/_static/custom.css
diff --git a/doc/source/_static/custom.css b/doc/source/_static/custom.css
new file mode 100644
index 000000000..2dbf54ecb
--- /dev/null
+++ b/doc/source/_static/custom.css
@@ -0,0 +1,13 @@
+.classifier {
+ font-style: oblique;
+}
+
+/*
+Workaround for an incompatibility between read the docs theme and sphinx 2.0+
+See: https://github.com/larray-project/larray/issues/849
+*/
+.classifier:before {
+ font-style: normal;
+ margin: 0.5em;
+ content: ":";
+}
diff --git a/doc/source/changes/version_0_32_2.rst.inc b/doc/source/changes/version_0_32_2.rst.inc
index 2d1cebd67..21d2f9f13 100644
--- a/doc/source/changes/version_0_32_2.rst.inc
+++ b/doc/source/changes/version_0_32_2.rst.inc
@@ -6,4 +6,6 @@ Fixes
* fixed using Pandas >= 1.0 (closes :issue:`845`).
+* fixed the missing space between parameters name and type in API documentation (closes :issue:`849`).
+
* fixed a few issues for Python 2.7 and/or Linux.
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 49d30e398..e6ed243f5 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -104,7 +104,7 @@
# General information about the project.
project = 'LArray'
-copyright = '2014-2017, Gaëtan de Menten, Geert Bryon, Johan Duyck, Alix Damman'
+copyright = '2014-2020, Gaëtan de Menten, Geert Bryon, Johan Duyck, Alix Damman'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
@@ -190,6 +190,15 @@
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
+# Workaround for an incompatibility between read the docs theme and sphinx 2.0+.
+# See: https://github.com/larray-project/larray/issues/849
+
+# These paths are either relative to html_static_path
+# or fully qualified paths (eg. https://...)
+html_css_files = [
+ 'custom.css',
+]
+
# Add any extra paths that contain custom files (such as robots.txt or
# .htaccess) here, relative to this directory. These files are copied
# directly to the root of the documentation.
From f231827f14a00d1e5e111c6bf976d707a962c5a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20de=20Menten?= <gdementen@gmail.com>
Date: Wed, 1 Apr 2020 11:21:05 +0200
Subject: [PATCH 08/13] fixed releasing from a branch
---
doc/source/fetch_changelogs.py | 12 ++++++------
make_release.py | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/doc/source/fetch_changelogs.py b/doc/source/fetch_changelogs.py
index 9ef3e7031..1a7a33b01 100644
--- a/doc/source/fetch_changelogs.py
+++ b/doc/source/fetch_changelogs.py
@@ -30,13 +30,13 @@ def fetch_changelog(section_name, release_name, github_rep, rel_changes_dir='/do
['git', 'commit', '-m', f'fetched {section_name} changelog for {short(release_name)}', str(fpath)])
-def fetch_changelogs(release_name):
- fetch_changelog('editor', release_name, EDITOR_GITHUB_REP)
+def fetch_changelogs(release_name, branch='master'):
+ fetch_changelog('editor', release_name, EDITOR_GITHUB_REP, branch=branch)
- print(echocall(['git', 'log', 'upstream/master..HEAD']))
+ print(echocall(['git', 'log', f'origin/{branch}..HEAD']))
if yes('Are the above commits ready to be pushed?', default='n'):
doechocall('Pushing changes to GitHub',
- ['git', 'push', 'upstream', 'master', '--follow-tags'])
+ ['git', 'push', 'origin', branch, '--follow-tags'])
if __name__ == '__main__':
@@ -44,7 +44,7 @@ def fetch_changelogs(release_name):
argv = sys.argv
if len(argv) < 2:
- print(f"Usage: {argv[0]} release_name")
+ print(f"Usage: {argv[0]} release_name [branch]")
sys.exit()
- fetch_changelogs(argv[1])
+ fetch_changelogs(*argv[1:])
diff --git a/make_release.py b/make_release.py
index b808e3b4b..06bf02846 100644
--- a/make_release.py
+++ b/make_release.py
@@ -46,13 +46,13 @@ def update_metapackage(public_release, repository, release_name, **extra_kwargs)
'--summary', "'Package installing larray and all sub-projects and optional dependencies'"])
-def merge_changelogs(build_dir, src_documentation, release_name, public_release, **extra_kwargs):
+def merge_changelogs(build_dir, src_documentation, release_name, public_release, branch='master', **extra_kwargs):
chdir(join(build_dir, src_documentation))
if not public_release:
return
- check_call(['python', 'fetch_changelogs.py', release_name])
+ check_call(['python', 'fetch_changelogs.py', release_name, branch])
insert_step_func(merge_changelogs, msg='append changelogs from larray-editor project', before='update_changelog')
From c408673f7f7af15fbbc94b0c49303c3fb149b9c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20de=20Menten?= <gdementen@gmail.com>
Date: Fri, 3 Apr 2020 10:37:20 +0200
Subject: [PATCH 09/13] bump version to 0.32.2
---
condarecipe/larray/meta.yaml | 4 ++--
larray/__init__.py | 2 +-
setup.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/condarecipe/larray/meta.yaml b/condarecipe/larray/meta.yaml
index 0e16f54e2..25e9f69d6 100644
--- a/condarecipe/larray/meta.yaml
+++ b/condarecipe/larray/meta.yaml
@@ -1,9 +1,9 @@
package:
name: larray
- version: 0.32.2-dev
+ version: 0.32.2
source:
- git_tag: 0.32.2-dev
+ git_tag: 0.32.2
git_url: https://github.com/larray-project/larray.git
# git_tag: master
# git_url: file://c:/Users/gdm/devel/larray/.git
diff --git a/larray/__init__.py b/larray/__init__.py
index 346387c7e..914fdf04d 100644
--- a/larray/__init__.py
+++ b/larray/__init__.py
@@ -1,6 +1,6 @@
from __future__ import absolute_import, division, print_function
-__version__ = '0.32.2-dev'
+__version__ = '0.32.2'
from larray.core.axis import Axis, AxisCollection, X
diff --git a/setup.py b/setup.py
index ea3c579e1..fb4d4dc02 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ def readlocal(fname):
DISTNAME = 'larray'
-VERSION = '0.32.2-dev'
+VERSION = '0.32.2'
AUTHOR = 'Gaetan de Menten, Geert Bryon, Johan Duyck, Alix Damman'
AUTHOR_EMAIL = 'gdementen@gmail.com'
DESCRIPTION = "N-D labeled arrays in Python"
From 88aa687654d12947f1b47aae479c0c35c5926f3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20de=20Menten?= <gdementen@gmail.com>
Date: Fri, 3 Apr 2020 10:37:22 +0200
Subject: [PATCH 10/13] fetched editor changelog for 0.32.2
---
doc/source/changes/editor/version_0_32_2.rst.inc | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 doc/source/changes/editor/version_0_32_2.rst.inc
diff --git a/doc/source/changes/editor/version_0_32_2.rst.inc b/doc/source/changes/editor/version_0_32_2.rst.inc
new file mode 100644
index 000000000..fb03061e7
--- /dev/null
+++ b/doc/source/changes/editor/version_0_32_2.rst.inc
@@ -0,0 +1,8 @@
+.. py:currentmodule:: larray_editor
+
+Fixes
+^^^^^
+
+* fixed spurious warning in the console when an expression results in an empty sequence (array, list, tuple).
+
+* fixed displaying arrays entirely filled with NaN.
From e2d46dd9a26f349bd95f1e49b70441c78823db8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20de=20Menten?= <gdementen@gmail.com>
Date: Fri, 3 Apr 2020 10:37:38 +0200
Subject: [PATCH 11/13] update release date for 0.32.2
---
doc/source/changes.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/source/changes.rst b/doc/source/changes.rst
index be49956e0..3968e6a11 100644
--- a/doc/source/changes.rst
+++ b/doc/source/changes.rst
@@ -4,7 +4,7 @@
Version 0.32.2
==============
-In development.
+Released on 2020-04-03.
CORE
----
From 89ac207b2377311fc032f5d3f8c08924482be3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20de=20Menten?= <gdementen@gmail.com>
Date: Fri, 3 Apr 2020 12:40:18 +0200
Subject: [PATCH 12/13] fixed metapackage creation
---
make_release.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/make_release.py b/make_release.py
index 06bf02846..a68b468cb 100644
--- a/make_release.py
+++ b/make_release.py
@@ -25,11 +25,11 @@
LARRAY_USERS_GROUP = "larray-users@googlegroups.com"
-def update_metapackage(public_release, repository, release_name, **extra_kwargs):
+def update_metapackage(public_release, local_repository, release_name, **extra_kwargs):
if not public_release:
return
- chdir(repository)
+ chdir(local_repository)
version = short(release_name)
# TODO: this should be echocall(redirect_stdout=False)
From 725a2b29f937f581395c44fee5fb50a02fbf9845 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20de=20Menten?= <gdementen@gmail.com>
Date: Fri, 3 Apr 2020 16:27:27 +0200
Subject: [PATCH 13/13] use pip to install packages on read the docs (as
recommended by them) to fix the memory issues
---
doc/requirements.txt | 12 ++++++++++++
readthedocs.yml | 13 +++++++++----
2 files changed, 21 insertions(+), 4 deletions(-)
create mode 100644 doc/requirements.txt
diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 000000000..1b1121016
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,12 @@
+numpy
+pandas
+matplotlib
+tables # ==pytables
+xlrd
+openpyxl
+sphinx
+numpydoc
+pandoc
+ipython
+ipykernel
+nbsphinx
diff --git a/readthedocs.yml b/readthedocs.yml
index 359e95f11..de31c9be9 100644
--- a/readthedocs.yml
+++ b/readthedocs.yml
@@ -13,12 +13,17 @@ sphinx:
formats:
- pdf
-conda:
- environment: doc/environment.yml
+# we do not use conda anymore because it consumes too much memory and thus crashes our builds
+# see:
+# - https://docs.readthedocs.io/en/stable/guides/build-using-too-many-resources.html#use-pip-when-possible
+# - https://github.com/readthedocs/readthedocs.org/issues/6692
+#conda:
+# environment: doc/environment.yml
# Optionally set the version of Python and requirements required to build your docs
python:
- version: 3.6
+ version: 3.7
install:
- - method: setuptools
+ - requirements: doc/requirements.txt
+ - method: pip
path: .