Skip to content

Commit

Permalink
Merge branch 'release/0.1.18'
Browse files Browse the repository at this point in the history
  • Loading branch information
aitgon committed Sep 23, 2020
2 parents ea6fca6 + eda78ef commit ab9a781
Show file tree
Hide file tree
Showing 30 changed files with 622 additions and 123 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@ doc/vtam.wrapper.rst
out
vtam.egg-info
vtam/tests/outdir
<<<<<<< HEAD
=======
example
>>>>>>> 2195a5d6bb2972454c238c6fd43a8da854059011
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ script:
# Your tests script goes here
- python --version
- pip --version
- coverage run_name -m unittest discover -v -f
- coverage run -m unittest discover -v -f

after_success:
- bash <(curl -s https://codecov.io/bash)
Expand Down
7 changes: 2 additions & 5 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
exclude _build
include Makefile environment.yml environment-dev.yml requirements.txt
recursive-include doc *.md Makefile *.tsv *.yml
include doc/data/*
include snakefile.yml
include tools/snake.tuto.data.yml
graft vtam/data
graft vtam/data/example
6 changes: 6 additions & 0 deletions RELEASE.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
CHANGES IN VERSION 0.1.18 (Sep 23, 2020)
--------------------------------------------------

- BUG bugs fixed
- ENH Added a 'vtam example' command to generate a file tree for a quick start

CHANGES IN VERSION 0.1.17 (Sep 19, 2020)
--------------------------------------------------

Expand Down
26 changes: 13 additions & 13 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@
# add these directories to sys.output here. If the directory is relative to the
# documentation root, use os.output.abspath to make it absolute, like shown here.
#
from configparser import RawConfigParser

import configparser
import os
import vtam
# import sys
# sys.path.insert(0, os.path.abspath('...'))
import sys

sys.path.insert(0, os.path.abspath('..'))
import vtam

# -- Project information -----------------------------------------------------

def read_setup_cfg_metadata(field):
"""Reads and gets information from setup.cfg."""
config = RawConfigParser()
config.read(os.path.join('..', 'setup.cfg'))
return str(config.get('metadata', field))

# General information about the project.
config = configparser.RawConfigParser()
config.read(os.path.join('..', 'setup.cfg'))
author = config['metadata']['author']
copyright = config['metadata']['copyright']

project = 'VTAM'
copyright = read_setup_cfg_metadata(field='copyright')
author = read_setup_cfg_metadata(field='author')
author = author
copyright = copyright

# The short X.Y version.
# version = '.'.join(read_setup_cfg_metadata(field='version').split('.')[0:2])
Expand Down Expand Up @@ -102,7 +102,7 @@ def read_setup_cfg_metadata(field):
# 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,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
# html_static_path = ['_static']

# Custom sidebar templates, must be a dictionary that maps document names
# to template names.
Expand Down
Binary file added doc/content/img/tuto_fig2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/content/img/tuto_fig3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit ab9a781

Please sign in to comment.