Merge pull request #170 from FCS-analysis/develop

1.0.1

freeze_pyinstaller/PyCorrFit_win7.spec → .appveyor/PyCorrFit_win7.spec

@@ -18,12 +18,12 @@ with open(mplrc, "w") as fd:
     fd.writelines(data)
 
 
-if not os.path.exists("freeze_pyinstaller"):
+if not os.path.exists(".appveyor"):
     raise Exception("Please go to `PyCorrFit` directory.")
 
 name = "PycorrFit"
 DIR = os.path.realpath(".")
-PyInstDir = os.path.join(DIR, "freeze_pyinstaller")
+PyInstDir = os.path.join(DIR, ".appveyor")
 PCFDIR = os.path.join(DIR, "pycorrfit")
 ProgPy = os.path.join(PCFDIR,"PyCorrFit.py")
 ChLog = os.path.join(DIR,"ChangeLog.txt")
@@ -38,6 +38,7 @@ hiddenimports = ["scipy.io.matlab.streams",
                  "scipy.special._ufuncs_cxx",
                  "scipy.sparse.csgraph",
                  "scipy.sparse.csgraph._validation",
+                 "simplejson",
                  ]
 
 

freeze_appveyor/Readme.md → .appveyor/Readme.md

@@ -1,7 +1,7 @@
-freeze_appveyor
+Appveyor recipe
 ---------------
 
-files that are used by ../appveyor.yaml.
+Files that are used by ../appveyor.yaml to build a Windows installer
 
 - `install.ps1` : install Miniconda   
   powershell script that donwloads and installs stuff
@@ -11,5 +11,12 @@ files that are used by ../appveyor.yaml.
   WxPython will not work with numpy>1.9.0 due to this bug:
   http://trac.wxwidgets.org/ticket/16590
 
+- `PyCorrFit_win7.spec` : PyInstaller spec file      
+  The configuration for building the binaries with PyInstaller
+
 - `run_with_compiler.cmd` : powershell tools   
   Something required for running stuff on i386 and x64
+
+- `win_innosetup.iss.dummy` : InnoSetup file   
+  Configuration for building the installer
+

.gitignore

@@ -1,5 +1,7 @@
 *.py[cod]
 
+_version_save.py
+
 # C extensions
 *.so
 
@@ -72,4 +74,4 @@ nosetests.xml
 *.txt~
 
 # test data
-tests/data
+tests/data

.travis/test.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
-pip install coverage coveralls
+pip install coverage codecov
 coverage run --source=pycorrfit ./setup.py test
 coverage report -m
-# allow coveralls to fail
-coveralls || exit 0
+# allow codecov to fail
+codecov || exit 0
 

ChangeLog.txt

@@ -1,3 +1,10 @@
+1.0.1
+- Improved support for ALV ".ASC" file format (#169)
+- NumPy 0.13 support for ".ptu" file reader
+- Code cleanup:
+  - Fetch latest available version from GitHub releases
+  - New dependency for "simplejson" Python package
+  - Move appveyor recipe to separate folder 
 1.0.0
 - New confocal fitting models T+T+2D and T+T+3D
 - Fix regression: .sin files could not be opened (#167)

README.rst

@@ -97,5 +97,5 @@ the running time of the build). From there you can download the Windows installe
    :target: https://ci.appveyor.com/project/paulmueller/pycorrfit
 .. |Build Status Travis| image:: https://img.shields.io/travis/FCS-analysis/PyCorrFit/master.svg?label=linux_osx
    :target: https://travis-ci.org/FCS-analysis/PyCorrFit
-.. |Coverage Status| image:: https://img.shields.io/coveralls/FCS-analysis/PyCorrFit.svg
-   :target: https://coveralls.io/r/FCS-analysis/PyCorrFit
+.. |Coverage Status| image:: https://img.shields.io/codecov/c/github/FCS-analysis/PyCorrFit/master.svg
+   :target: https://codecov.io/gh/FCS-analysis/PyCorrFit

appveyor.yml

@@ -24,7 +24,7 @@ environment:
     # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
     # /E:ON and /V:ON options are not enabled in the batch script intepreter
     # See: http://stackoverflow.com/a/13751649/163740
-    WITH_COMPILER: "cmd /E:ON /V:ON /C .\\freeze_appveyor\\run_with_compiler.cmd"
+    WITH_COMPILER: "cmd /E:ON /V:ON /C .\\.appveyor\\run_with_compiler.cmd"
   # https://github.com/appveyor/ci/issues/359
   matrix:
     - PYTHON: "C:\\Miniconda"
@@ -42,7 +42,7 @@ install:
   # Install InnoSetup and add to path
   # Copied from
   # https://github.com/Phonations/Joker/blob/master/appveyor.yml
-  - choco install -y InnoSetup
+  - appveyor-retry choco install -y InnoSetup
 
   # Determine platform
   - '%PYTHON%/python -c "import platform; print platform.uname()"'
@@ -59,17 +59,16 @@ install:
 
   # Install package-specific libraries
   # CONDA installs
-  # Pinned versions are defined in freeze_appveyor\pinned
-  - xcopy freeze_appveyor\pinned %PYTHON%\conda-meta\ /Y
+  # Pinned versions are defined in .appveyor\pinned
+  - xcopy .appveyor\pinned %PYTHON%\conda-meta\ /Y
   - "conda install --yes --quiet numpy pip scipy wxpython"
   # PIP installs
   # Install the build dependencies of the project. 
-  - "pip install cython"
-  - "pip install wheel"
+  - "pip install cython wheel"
   # Install package-specific libraries  
   - "pip install matplotlib==1.4.3"
-  - "pip install sympy"
-  # We force numpy to 1.8 b/c of wxpython issues and therefore
+  - "pip install simplejson sympy"
+  # We forced numpy to 1.8 b/c of wxpython issues and therefore
   # we have to stick to an old scipy version and thus, to an
   # old lmfit version:
   - "pip install lmfit==0.9.2"
@@ -88,18 +87,18 @@ build: off
 test_script:
   - 'python -c "import pycorrfit; print pycorrfit.__version__"'
   - "pip install coverage"
-  - "pip install coveralls"
+  - "pip install codecov"
   - "coverage run --source=pycorrfit ./setup.py test"
   - "coverage report -m"
-  - "coveralls || exit 0"
+  - "codecov || exit 0"
 
 after_test:
   # If tests are successful, create a whl package for the project.
   - "%WITH_COMPILER% %PYTHON%/python setup.py bdist_wheel"
   - ps: "ls dist"
   # Run pyinstaller
   # This will create the "win7_innosetup.iss" file
-  - "%WITH_COMPILER% pyinstaller -y --log-level=WARN freeze_pyinstaller\\PyCorrFit_win7.spec"
+  - "%WITH_COMPILER% pyinstaller -y --log-level=WARN .appveyor\\PyCorrFit_win7.spec"
   # Create InnoSetup installers
   # Set InnoSetup path here, because Cython complained about it.
   - set PATH=%PATH%;"C:\\Program Files (x86)\\Inno Setup 5"