Skip to content

Commit 45ab1a3

Browse files
committed
Merge branch 'fathon-dev'
2 parents 2e4092d + 7db828a commit 45ab1a3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+3406
-1123
lines changed

CONTRIBUTING.md

+10-65
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,23 @@
11
# Contributing to fathon
22

3+
If you have found bugs, or you want to propose a new feature:
34

5+
1. describe the problem and specify the details of your setup (OS, Python version, environment, etc.);
6+
2. provide a minimal working example that can be easily reproduced and tested;
7+
3. open an issue with the previous information in the GitHub repository with tag <code>bug</code> or <code>proposed feature</code>.
48

5-
## Bug fixes and new features
9+
PRs are also welcomed.
610

7-
If you have found or fixed bugs, or you want to propose or add a new feature, please follow these instructions.
8-
9-
#### To report a bug:
10-
11-
1. Describe the problem accurately and specify the details of your setup (OS, Python version, environment, etc.);
12-
2. Provide a minimal working example that can be easily reproduced and tested;
13-
3. Open an issue with the previous information in the Github repository with tag <code>bug</code>.
14-
15-
#### To fix a bug:
16-
17-
1. Fork the repository;
18-
2. If the bug involves Cython code and you know Cython:
19-
- Fix the bug;
20-
- Describe the bug, provide a minimal working example that can be easily reproduced and tested to reproduce the bug, and explain how you fixed it;
21-
- Create a pull request including what described in the previous point.
22-
3. If the bug involves Cython code and you do not know Cython:
23-
- Simply report the bug as described in "To report a bug".
24-
4. If the bug involves Python code:
25-
- Follow the same instructions given in point 2.
26-
27-
#### To propose a new feature:
28-
29-
1. Open an issue in the Github repository with tag <code>proposed feature</code>;
30-
2. Please try to give a detailed description of the feature, providing references if available.
31-
32-
#### To add a new feature:
33-
34-
1. Fork the repository;
35-
36-
2. If the new feature needs to be written in Cython and you know Cython:
37-
38-
- Develop the new code;
39-
40-
- Describe the new feature and provide references if available, provide a minimal working example that can be easily reproduced and tested, and list all the added or modified repository's files;
41-
42-
- Create a pull request including what described in the previous point.
43-
44-
3. If the new feature needs to be written in Cython and you do not know Cython:
45-
46-
- Develop the new code in Python;
47-
- Describe the new feature and provide references if available, provide the new code with information on where to include it, and provide a minimal working example that can be easily reproduced and tested;
48-
- Open an issue with the previous information in the Github repository with tag <code>new feature</code>;
49-
- I will review it and translate the code to Cython.
50-
51-
4. If the new feature can be written in Python:
52-
53-
- Follow the same instructions given in point 2.
54-
55-
#### For any other question regarding the package:
56-
57-
1. Open an issue as described in "To report a bug", but with tag <code>question</code>, or write to [email protected].
58-
59-
60-
61-
## Code formatting
62-
63-
The current code is formatted using tabs.
64-
65-
In case you are going to modify `fathon`, please use the same docstring format already present in the source files.
11+
For any other question, open an issue with tag <code>question</code>.
6612

6713

6814

6915
## Documentation
7016

71-
Documentation is written in [reStructuredText](http://docutils.sourceforge.net/rst.html), built with <code>sphinx</code> and placed in the <code>docs</code> folder. If you have contributed, please update also the documentation.
17+
Documentation is written in [reStructuredText](http://docutils.sourceforge.net/rst.html), built with <code>sphinx</code> and placed in the <code>docs</code> folder.
18+
19+
The script <code>docs_gen.sh</code> generates `.py` files with only docstrings, since `sphinx` does not support Cython.
7220

73-
- Add or modify the function/class in the corresponding <code>.rst</code> file in the folder <code>fun_class</code>, and follow the same naming convention if a new file is needed;
74-
- In case of a new file, add it at the end of <code>index.rst</code>;
75-
- Install <code>sphinx</code> and <code>numpydoc</code>;
76-
- Run <code>docs_gen.sh</code> inside the <code>docs</code> folder (the variable `SPHINXBUILD` in the `Makefile` should be probably changed), and check the result file <code>_build/html/index.html</code>.
21+
The variable `SPHINXBUILD` in the `Makefile` depends on the particular user's system and should be probably changed.
7722

7823
For any problem with the documentation, open an issue with tag <code>documentation</code>.

README.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# fathon [![Build Status](https://travis-ci.org/stfbnc/fathon.svg?branch=master)](https://travis-ci.org/stfbnc/fathon) [![Build status](https://ci.appveyor.com/api/projects/status/tl2a8c84bbvxu37p?svg=true)](https://ci.appveyor.com/project/stfbnc/fathon)
1+
# fathon [![Build Status](https://travis-ci.com/stfbnc/fathon.svg?branch=master)](https://travis-ci.com/stfbnc/fathon) [![Build status](https://ci.appveyor.com/api/projects/status/tl2a8c84bbvxu37p?svg=true)](https://ci.appveyor.com/project/stfbnc/fathon)
22

33
[![Issues](https://img.shields.io/github/issues-raw/stfbnc/fathon.svg?maxAge=25000)](https://github.com/stfbnc/fathon/issues) [![GitHub stars](https://img.shields.io/github/stars/stfbnc/fathon.svg?style=social&label=Stars&style=plastic)]() [![GitHub forks](https://img.shields.io/github/forks/stfbnc/fathon.svg?style=social&label=Fork&style=plastic)]() [![Python 3.7+](https://img.shields.io/badge/python-3.7+-blue.svg)](https://www.python.org/)
44

@@ -62,10 +62,14 @@ Bianchi, S., (2020). fathon: A Python package for a fast computation of detrend
6262

6363
## Version [![PyPI version](https://badge.fury.io/py/fathon.svg)](https://badge.fury.io/py/fathon)
6464

65-
fathon v1.3
65+
fathon v1.3.1
6666

6767
## Changelog
6868

69+
#### v1.3.1
70+
71+
- faster algorithms
72+
6973
#### v1.3
7074

7175
- <code>MFDCCA</code> algorithm

docs/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# You can set these variables from the command line, and also
55
# from the environment for the first two.
66
SPHINXOPTS ?=
7-
SPHINXBUILD ?= "/anaconda3/bin/sphinx-build"
7+
SPHINXBUILD ?= "/opt/anaconda3/envs/fathon-env/bin/sphinx-build"
88
SOURCEDIR = .
99
BUILDDIR = _build
1010

2.76 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
1.95 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

docs/_build/doctrees/index.doctree

272 Bytes
Binary file not shown.

docs/_build/html/.buildinfo

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: db3f5bea255d2777e941c20da7e7babc
3+
config: f90c25076383ba83e2a381309ccdd14a
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

docs/_build/html/_sources/index.rst.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
You can adapt this file completely to your liking, but it should at least
44
contain the root `toctree` directive.
55
6-
fathon (v1.3)
6+
fathon (v1.3.1)
77
***************
88

99
Current version is available for Linux (x86_64 and ARM64), macOS, and Windows (64bit).

0 commit comments

Comments
 (0)