Skip to content

Commit

Permalink
Merge pull request #76 from c3g/develop
Browse files Browse the repository at this point in the history
Release v0.5.0
  • Loading branch information
zxenia committed Feb 24, 2020
2 parents 6eed6a2 + 277942e commit 21b565a
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 15 deletions.
17 changes: 11 additions & 6 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,22 @@
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 0.4.0
version: 1

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/conf.py

# Optionally build your docs in additional formats such as PDF and ePub
formats: all
formats:
- epub
- pdf
- htmlzip

# Optionally set the version of Python and requirements required to build your docs
python:
version: 3.7
install:
- requirements: docs/requirements.txt
#python:
# version: 3.7
# install:
# - requirements: requirements.txt
# - requirements: docs/requirements.txt
# - method: pip
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ install:
script:
- export POSTGRES_USER="postgres" && export POSTGRES_PASSWORD="hj38f3Ntr" && export POSTGRES_PORT=5433
- python3 -m coverage run ./manage.py test
- codecov
- rm -rf chord_metadata_service
- python3 -m coverage run ./manage.py test chord_metadata_service
after_success:
- codecov
5 changes: 2 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
author = 'Ksenia Zaytseva, David Lougheed, Simon Chenard'

# The full version, including alpha/beta/rc tags
release = '0.3.0'

release = '0.5.0'

# -- General configuration ---------------------------------------------------

Expand All @@ -49,7 +48,7 @@
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = 'alabaster'
html_theme = 'sphinx_rtd_theme'

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
Welcome to metadata service's documentation!
Welcome to Metadata service's documentation!
============================================

.. toctree::
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Technical implementation
------------------------

The service is implemented in Python and Django and uses PostgreSQL database to store the data.
Besides PostgreSQL the data can be indexed queried in Elasticsearch.
Besides PostgreSQL the data can be indexed and queried in Elasticsearch.


Architecture
Expand Down
3 changes: 2 additions & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Sphinx==2.4.2
Sphinx==2.4.2
sphinx_rtd_theme
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

setuptools.setup(
name="chord_metadata_service",
version="0.4.0",
version="0.5.0",

python_requires=">=3.6",
install_requires=[
Expand Down

0 comments on commit 21b565a

Please sign in to comment.