Skip to content

Commit 6d09c69

Browse files
authored
Merge pull request #31 from ulf1/dev
Fixes
2 parents bdf4c37 + eedf5a8 commit 6d09c69

File tree

8 files changed

+41
-10
lines changed

8 files changed

+41
-10
lines changed

.github/workflows/pythonapp.yml renamed to .github/workflows/syntax-and-unit-tests.yml

+10-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,19 @@ jobs:
77

88
runs-on: ubuntu-18.04
99

10+
strategy:
11+
matrix:
12+
python-version: ['3.6', '3.7', '3.8', '3.x']
13+
14+
name: Python ${{ matrix.python-version }} Tests
15+
1016
steps:
1117
- uses: actions/checkout@v1
12-
- name: Set up Python 3.6
18+
- name: Setup python
1319
uses: actions/setup-python@v1
1420
with:
15-
python-version: 3.6
21+
python-version: ${{ matrix.python-version }}
22+
architecture: x64
1623
- name: Install dependencies
1724
run: |
1825
python -m pip install --upgrade pip
@@ -21,6 +28,6 @@ jobs:
2128
- name: Lint with flake8
2229
run: |
2330
flake8 --ignore=F401 --exclude=$(grep -v '^#' .gitignore | xargs | sed -e 's/ /,/g')
24-
- name: Test with unittest
31+
- name: Unit Test with pytest
2532
run: |
2633
pytest

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,5 @@ venv.bak/
108108
.vscode
109109
profile/data*
110110

111-
examples/data
111+
examples/data
112+
README.rst

CHANGES.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 0.3.3 / 2020-04-23
2+
3+
* Test multiple python versions
4+
* Installation problems: remove pandoc from setup.py
5+
16
# 0.3.1 / 2021-04-08
27

38
* MIT License changed to Apache 2.0

MANIFEST.in

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
include README.md
2+
include README.rst
23
recursive-include test *.py

README.md

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
[![PyPI version](https://badge.fury.io/py/numpy-fracdiff.svg)](https://badge.fury.io/py/numpy-fracdiff)
2+
[![numpy-fracdiff](https://snyk.io/advisor/python/numpy-fracdiff/badge.svg)](https://snyk.io/advisor/python/numpy-fracdiff)
3+
[![Total alerts](https://img.shields.io/lgtm/alerts/g/ulf1/numpy-fracdiff.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/ulf1/numpy-fracdiff/alerts/)
4+
[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/ulf1/numpy-fracdiff.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/ulf1/numpy-fracdiff/context:python)
5+
[![deepcode](https://www.deepcode.ai/api/gh/badge?key=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJwbGF0Zm9ybTEiOiJnaCIsIm93bmVyMSI6InVsZjEiLCJyZXBvMSI6Im51bXB5LWZyYWNkaWZmIiwiaW5jbHVkZUxpbnQiOmZhbHNlLCJhdXRob3JJZCI6Mjk0NTIsImlhdCI6MTYxOTU0MDI2N30.D99hoaXfMKuj6sva3Z0J3nJ9VXI6V_G1vyGEML9D0c4)](https://www.deepcode.ai/app/gh/ulf1/numpy-fracdiff/_/dashboard?utm_content=gh%2Fulf1%2Fnumpy-fracdiff)
26

37
# numpy-fracdiff
48
Fractional Difference for Time Series
@@ -35,7 +39,14 @@ pip install -r requirements-demo.txt
3539
* Jupyter for the examples: `jupyter lab`
3640
* Check syntax: `flake8 --ignore=F401 --exclude=$(grep -v '^#' .gitignore | xargs | sed -e 's/ /,/g')`
3741
* Run Unit Tests: `pytest`
38-
* Upload to PyPi with twine: `python setup.py sdist && twine upload -r pypi dist/*`
42+
43+
Publish
44+
45+
```sh
46+
pandoc README.md --from markdown --to rst -s -o README.rst
47+
python setup.py sdist
48+
twine upload -r pypi dist/*
49+
```
3950

4051
### Clean up
4152

numpy_fracdiff/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
__version__ = '0.3.2'
1+
__version__ = '0.3.3'
22

33
from .fracdiff_fn import fracdiff

requirements-dev.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# syntax check, unit test, profiling
2+
setuptools>=56.0.0
23
flake8>=3.8.4
34
pytest>=6.2.1
45
twine==3.3.0

setup.py

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
from setuptools import setup
2-
import pypandoc
2+
import os
3+
4+
5+
def read(fname):
6+
with open(os.path.join(os.path.dirname(__file__), fname)) as fp:
7+
s = fp.read()
8+
return s
39

410

511
def get_version(path):
@@ -15,14 +21,13 @@ def get_version(path):
1521
setup(name='numpy-fracdiff',
1622
version=get_version("numpy_fracdiff/__init__.py"),
1723
description='Fractional Difference for Time Series',
18-
long_description=pypandoc.convert('README.md', 'rst'),
24+
long_description=read('README.rst'),
1925
url='http://github.com/ulf1/numpy-fracdiff',
2026
author='Ulf Hamster',
2127
author_email='[email protected]',
22-
license='MIT',
28+
license='Apache License 2.0',
2329
packages=['numpy_fracdiff'],
2430
install_requires=[
25-
'setuptools>=40.0.0',
2631
'numpy>=1.18.*,<2',
2732
'numba>=0.48.*'],
2833
python_requires='>=3.6',

0 commit comments

Comments
 (0)