Skip to content

Commit bf2a779

Browse files
authored
Merge pull request #1296 from dolfinus/fix_docs
Fix documentation issues
2 parents 92e0022 + f3250ef commit bf2a779

File tree

5 files changed

+4
-62
lines changed

5 files changed

+4
-62
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ VM underneath.
339339
This git repository contains `pytest` based tests that you can run locally.
340340
Depending on your development setup, you may want to run different kind of
341341
tests. You can get some hints on what tests to run and how by inspecting
342-
`.travis.yaml`.
342+
`.github`.
343343

344344
### Environment variables influencing tests
345345
- `BINDER_URL`: An address of an already running BinderHub as reachable from the

binderhub/tests/conftest.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
K8S_NAMESPACE = subprocess.check_output([
3535
"kubectl", "config", "view", "--minify", "--output", "jsonpath={..namespace}"
3636
], text=True).strip() or "default"
37-
ON_TRAVIS = os.environ.get('TRAVIS')
3837

3938
# set BINDER_URL to run tests against an already-running binderhub
4039
# this will skip launching BinderHub internally in the app fixture
@@ -145,8 +144,6 @@ def _binderhub_config():
145144
except Exception:
146145
cfg.BinderHub.builder_required = False
147146
K8S_AVAILABLE = False
148-
if ON_TRAVIS:
149-
pytest.fail("Kubernetes should be available on Travis")
150147
else:
151148
K8S_AVAILABLE = True
152149
if REMOTE_BINDER:
@@ -157,8 +154,6 @@ def _binderhub_config():
157154
requests.get(cfg.BinderHub.hub_url, timeout=5, allow_redirects=False)
158155
except Exception as e:
159156
print(f"JupyterHub not available at {cfg.BinderHub.hub_url}: {e}")
160-
if ON_TRAVIS:
161-
pytest.fail("JupyterHub should be available on Travis")
162157
cfg.BinderHub.hub_url = ''
163158
else:
164159
print(f"JupyterHub available at {cfg.BinderHub.hub_url}")

doc/developer/repoproviders.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ Currently supported providers, their prefixes and specs are:
3030
+------------+--------------------+-------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
3131
| Zenodo | ``zenodo`` | ``<zenodo-DOI>`` | `Zenodo <https://zenodo.org/>`_ is a non-profit provider of scholarly artifacts (such as code repositories) run in partnership with CERN. |
3232
+------------+--------------------+-------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
33-
| Figshare | ``figshare`` | ``<figshare-DOI>`` | `FigShare <https://figshare.com/>`_ is a company that offers hosting for scholarly artifacts (such as code repositories). |
33+
| Figshare | ``figshare`` | ``<figshare-DOI>`` | `FigShare <https://figshare.com/>`_ is a company that offers hosting for scholarly artifacts (such as code repositories). |
3434
+------------+--------------------+-------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
35-
| HydroShare | ``hydroshare`` | ``<hydroshare-DOI-or-ResourceID>`` | `HydroShare <https://www.hydroshare.org/>`_ is a hydrologic information system for users to share and publish data and models. |
35+
| HydroShare | ``hydroshare`` | ``<hydroshare-DOI-or-ResourceID>`` | `HydroShare <https://www.hydroshare.org/>`_ is a hydrologic information system for users to share and publish data and models. |
3636
+------------+--------------------+-------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
3737
| Dataverse | ``dataverse`` | ``<dataverse-DOI>`` | `Dataverse <https://dataverse.org/>`_ is open source research data repository software installed all over the world. |
3838
+------------+--------------------+-------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+

doc/doc-requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
# environment, which it is on ReadTheDocs.
1010

1111
# Documentation specific packages
12+
https://github.com/jupyterhub/autodoc-traits/archive/75885ee24636efbfebfceed1043459715049cd84.zip
1213
myst-parser
1314
pydata-sphinx-theme
1415
sphinx-copybutton

doc/sphinxext/autodoc_traits.py

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)