Skip to content

Commit

Permalink
Merge fc6f551 into 9133fff
Browse files Browse the repository at this point in the history
  • Loading branch information
raybellwaves committed Aug 18, 2020
2 parents 9133fff + fc6f551 commit fb3ebbf
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 12 deletions.
4 changes: 2 additions & 2 deletions HOWTORELEASE.rst
@@ -1,7 +1,7 @@
Release Procedure
-----------------

#. Create a new branch ``release-vX.x.x`` with the version for the release.
#. Create a new branch ``release-v0.0.x`` with the version for the release.

* Update ``CHANGELOG.rst``
* Make sure all new changes, features are reflected in the documentation.
Expand All @@ -12,7 +12,7 @@ Release Procedure

#. Tag a release and push to github::

$ git tag -a v1.0.0 -m "Version 1.0.0"
$ git tag -a v0.0.17 -m "Version 0.0.17"
$ git push origin master --tags

#. Build and publish release on PyPI::
Expand Down
14 changes: 14 additions & 0 deletions ci/doc.yml
@@ -0,0 +1,14 @@
name: xskillscore-docs
channels:
- conda-forge
dependencies:
- python=3.6
- bottleneck
- importlib_metadata
- nbsphinx
- numpy
- sphinx
- sphinxcontrib-napoleon
- sphinx_rtd_theme
- toolz
- xarray
9 changes: 0 additions & 9 deletions docs/requirements.txt

This file was deleted.

18 changes: 17 additions & 1 deletion docs/source/conf.py
Expand Up @@ -6,11 +6,27 @@

import datetime
import os
import pathlib
import subprocess
import sys

root = pathlib.Path(__file__).absolute().parent.parent
os.environ["PYTHONPATH"] = str(root)
sys.path.insert(0, str(root))

import xskillscore

sys.path.insert(0, os.path.abspath('../..'))
print("python exec:", sys.executable)
print("sys.path:", sys.path)

if "conda" in sys.executable:
print("conda environment:")
subprocess.run(["conda", "list"])
else:
print("pip environment:")
subprocess.run(["pip", "list"])

print("xskillscore: %s, %s" % (xskillscore.__version__, xskillscore.__file__))

# -- Project information -----------------------------------------------------
current_year = datetime.datetime.now().year
Expand Down
12 changes: 12 additions & 0 deletions readthedocs.yml
@@ -0,0 +1,12 @@
version: 2

build:
image: latest

conda:
environment: ci/doc.yml

sphinx:
fail_on_warning: true

formats: []

0 comments on commit fb3ebbf

Please sign in to comment.