Skip to content

Commit bfad77c

Browse files
committed
Multiple fixes
Unfortunate monolithic commit. * Partially removed dependence on Matplotlib. Matplotlib is only imported by functions that use plotting. Github #148 * Removed ability to pass in single matrix to batch_filter functions/methods. Github #147. In general it is impossible to tell if you have a list of matrices, or an single array, depending on the shape of the arrays and the size of the input. Rather than try and obscurely fail, make the user pass the correctly dimensioned data in. * various fixes typo cleanups
1 parent 59611f0 commit bfad77c

22 files changed

+1122
-1159
lines changed

.gitattributes

+5-15
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,14 @@
11
# Auto detect text files and perform LF normalization
2-
* text=auto
2+
* text eol=lf
33

4-
# Custom for Visual Studio
5-
*.cs diff=csharp
6-
*.sln merge=union
7-
*.csproj merge=union
8-
*.vbproj merge=union
9-
*.fsproj merge=union
10-
*.dbproj merge=union
114

125
# Standard to msysgit
13-
*.doc diff=astextplain
14-
*.DOC diff=astextplain
15-
*.docx diff=astextplain
16-
*.DOCX diff=astextplain
17-
*.dot diff=astextplain
18-
*.DOT diff=astextplain
196
*.pdf diff=astextplain
207
*.PDF diff=astextplain
218
*.rtf diff=astextplain
229
*.RTF diff=astextplain
2310

24-
*.py eol=lf
11+
*.py eol=lf
12+
*.txt eol=lf
13+
*.cfg eol=lf
14+

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@ win-64/
1717
linux-32/
1818
linux-64/
1919
osx-64/
20+
filterpy/kalman/i.py
2021

conda/filterpy/bld.bat

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
"%PYTHON%" setup.py install
2-
if errorlevel 1 exit 1
3-
4-
:: Add more build steps here, if they are necessary.
5-
6-
:: See
7-
:: http://docs.continuum.io/conda/build.html
8-
:: for a list of environment variables that are set during the build process.
1+
"%PYTHON%" setup.py install
2+
if errorlevel 1 exit 1
3+
4+
:: Add more build steps here, if they are necessary.
5+
6+
:: See
7+
:: http://docs.continuum.io/conda/build.html
8+
:: for a list of environment variables that are set during the build process.

conda/filterpy/build.sh

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
#!/bin/bash
2-
3-
$PYTHON setup.py install
4-
5-
# Add more build steps here, if they are necessary.
6-
7-
# See
8-
# http://docs.continuum.io/conda/build.html
9-
# for a list of environment variables that are set during the build process.
1+
#!/bin/bash
2+
3+
$PYTHON setup.py install
4+
5+
# Add more build steps here, if they are necessary.
6+
7+
# See
8+
# http://docs.continuum.io/conda/build.html
9+
# for a list of environment variables that are set during the build process.

conda/filterpy/meta.yaml

+77-77
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,77 @@
1-
package:
2-
name: filterpy
3-
version: "0.1.3"
4-
5-
source:
6-
fn: filterpy-0.1.3.tar.gz
7-
url: https://pypi.python.org/packages/75/df/5dbf357a3da1b49af18b2be00da15c7f86397b5b263bea1b9d65b5bd51cf/filterpy-0.1.3.tar.gz
8-
md5: ba1e6fb84efaae3d21a73ba9fb563cab
9-
# patches:
10-
# List any patch files here
11-
# - fix.patch
12-
13-
# build:
14-
# noarch_python: True
15-
# preserve_egg_dir: True
16-
# entry_points:
17-
# Put any entry points (scripts to be generated automatically) here. The
18-
# syntax is module:function. For example
19-
#
20-
# - filterpy = filterpy:main
21-
#
22-
# Would create an entry point called filterpy that calls filterpy.main()
23-
24-
25-
# If this is a new build for the same version, increment the build
26-
# number. If you do not include this key, it defaults to 0.
27-
# number: 1
28-
29-
requirements:
30-
build:
31-
- python
32-
- setuptools
33-
- numpy
34-
- scipy
35-
- matplotlib
36-
37-
run:
38-
- python
39-
- numpy
40-
- scipy
41-
- matplotlib
42-
43-
test:
44-
# Python imports
45-
imports:
46-
- filterpy
47-
- filterpy.common
48-
- filterpy.discrete_bayes
49-
- filterpy.examples
50-
- filterpy.gh
51-
- filterpy.hinfinity
52-
- filterpy.kalman
53-
- filterpy.leastsq
54-
- filterpy.memory
55-
- filterpy.monte_carlo
56-
- filterpy.stats
57-
58-
# commands:
59-
# You can put test commands to be run here. Use this to test that the
60-
# entry points work.
61-
62-
63-
# You can also put a file called run_test.py in the recipe that will be run
64-
# at test time.
65-
66-
# requires:
67-
# Put any additional test requirements here. For example
68-
# - nose
69-
70-
about:
71-
home: https://github.com/rlabbe/filterpy
72-
license: MIT License
73-
summary: 'Kalman filtering and optimal estimation library'
74-
75-
# See
76-
# http://docs.continuum.io/conda/build.html for
77-
# more information about meta.yaml
1+
package:
2+
name: filterpy
3+
version: "0.1.3"
4+
5+
source:
6+
fn: filterpy-0.1.3.tar.gz
7+
url: https://pypi.python.org/packages/75/df/5dbf357a3da1b49af18b2be00da15c7f86397b5b263bea1b9d65b5bd51cf/filterpy-0.1.3.tar.gz
8+
md5: ba1e6fb84efaae3d21a73ba9fb563cab
9+
# patches:
10+
# List any patch files here
11+
# - fix.patch
12+
13+
# build:
14+
# noarch_python: True
15+
# preserve_egg_dir: True
16+
# entry_points:
17+
# Put any entry points (scripts to be generated automatically) here. The
18+
# syntax is module:function. For example
19+
#
20+
# - filterpy = filterpy:main
21+
#
22+
# Would create an entry point called filterpy that calls filterpy.main()
23+
24+
25+
# If this is a new build for the same version, increment the build
26+
# number. If you do not include this key, it defaults to 0.
27+
# number: 1
28+
29+
requirements:
30+
build:
31+
- python
32+
- setuptools
33+
- numpy
34+
- scipy
35+
- matplotlib
36+
37+
run:
38+
- python
39+
- numpy
40+
- scipy
41+
- matplotlib
42+
43+
test:
44+
# Python imports
45+
imports:
46+
- filterpy
47+
- filterpy.common
48+
- filterpy.discrete_bayes
49+
- filterpy.examples
50+
- filterpy.gh
51+
- filterpy.hinfinity
52+
- filterpy.kalman
53+
- filterpy.leastsq
54+
- filterpy.memory
55+
- filterpy.monte_carlo
56+
- filterpy.stats
57+
58+
# commands:
59+
# You can put test commands to be run here. Use this to test that the
60+
# entry points work.
61+
62+
63+
# You can also put a file called run_test.py in the recipe that will be run
64+
# at test time.
65+
66+
# requires:
67+
# Put any additional test requirements here. For example
68+
# - nose
69+
70+
about:
71+
home: https://github.com/rlabbe/filterpy
72+
license: MIT License
73+
summary: 'Kalman filtering and optimal estimation library'
74+
75+
# See
76+
# http://docs.continuum.io/conda/build.html for
77+
# more information about meta.yaml

0 commit comments

Comments
 (0)