[med-svn] [pyscanfcs] 02/05: New upstream version 0.2.3+dfsg
Andreas Tille
tille at debian.org
Thu Dec 7 15:39:48 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository pyscanfcs.
commit 0db949325c7298e779abe703017c66c2f009cbe3
Author: Andreas Tille <tille at debian.org>
Date: Thu Dec 7 15:49:18 2017 +0100
New upstream version 0.2.3+dfsg
---
.gitignore | 62 ------------
.gitmodules | 0
freeze_pyinstaller/PyScanFCS.icns | Bin 114820 -> 0 bytes
freeze_pyinstaller/PyScanFCS.ico | Bin 270398 -> 0 bytes
freeze_pyinstaller/PyScanFCS_linux.spec | 19 ----
freeze_pyinstaller/PyScanFCS_mac.spec | 24 -----
freeze_pyinstaller/PyScanFCS_win7.spec | 63 ------------
freeze_pyinstaller/README.md | 22 -----
freeze_pyinstaller/debian_ubuntu_bundle_script.sh | 84 ----------------
freeze_pyinstaller/macOSx_script_starter.sh | 12 ---
freeze_pyinstaller/win7_32bit_bundle_script.bat | 5 -
freeze_pyinstaller/win7_innosetup.iss.dummy | 113 ----------------------
12 files changed, 404 deletions(-)
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 765c6b4..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,62 +0,0 @@
-*.py[cod]
-
-# C extensions
-*.so
-
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-lib
-lib64
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-nosetests.xml
-
-# Translations
-*.mo
-
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-
-
-#Latex
-*.aux
-*.glo
-*.idx
-*.log
-*.toc
-*.ist
-*.acn
-*.acr
-*.alg
-*.bbl
-*.blg
-*.dvi
-*.glg
-*.gls
-*.ilg
-*.ind
-*.lof
-*.lot
-*.maf
-*.mtc
-*.mtc1
-*.out
-*.synctex.gz
-*.pdf
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29..0000000
diff --git a/freeze_pyinstaller/PyScanFCS.icns b/freeze_pyinstaller/PyScanFCS.icns
deleted file mode 100644
index 027bd47..0000000
Binary files a/freeze_pyinstaller/PyScanFCS.icns and /dev/null differ
diff --git a/freeze_pyinstaller/PyScanFCS.ico b/freeze_pyinstaller/PyScanFCS.ico
deleted file mode 100644
index 48ad982..0000000
Binary files a/freeze_pyinstaller/PyScanFCS.ico and /dev/null differ
diff --git a/freeze_pyinstaller/PyScanFCS_linux.spec b/freeze_pyinstaller/PyScanFCS_linux.spec
deleted file mode 100644
index 0b29a6f..0000000
--- a/freeze_pyinstaller/PyScanFCS_linux.spec
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- mode: python -*-
-a = Analysis(['pyscanfcs/PyScanFCS.py'],
- pathex=[],
- hiddenimports=[],
- hookspath=None)
-a.datas += [('doc/ChangeLog.txt', 'ChangeLog.txt', 'DATA'),
- ('doc/PyScanFCS_doc.pdf', 'doc/PyScanFCS_doc.pdf', 'DATA')]
-pyz = PYZ(a.pure)
-exe = EXE(pyz,
- a.scripts,
- a.binaries,
- a.zipfiles,
- a.datas,
- name=os.path.join('dist', 'PyScanFCS'),
- debug=False,
- strip=None,
- upx=True,
- console=False
- )
diff --git a/freeze_pyinstaller/PyScanFCS_mac.spec b/freeze_pyinstaller/PyScanFCS_mac.spec
deleted file mode 100644
index b77e3c4..0000000
--- a/freeze_pyinstaller/PyScanFCS_mac.spec
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- mode: python -*-
-a = Analysis(['pyscanfcs/PyScanFCS.py'],
- hookspath=None)
-a.datas += [('doc/ChangeLog.txt', 'ChangeLog.txt', 'DATA'),
- ('doc/PyScanFCS_doc.pdf', 'doc/PyScanFCS_doc.pdf', 'DATA')]
-pyz = PYZ(a.pure)
-exe = EXE(pyz,
- a.scripts,
- exclude_binaries=True,
- name='PyScanFCS',
- debug=False,
- strip=None,
- upx=True,
- console=False )
-coll = COLLECT(exe,
- a.binaries,
- a.zipfiles,
- a.datas,
- strip=None,
- upx=True,
- name='PyScanFCS')
-app = BUNDLE(coll,
- name='dist/PyScanFCS.app',
- icon='freeze_pyinstaller/PyScanFCS.icns')
diff --git a/freeze_pyinstaller/PyScanFCS_win7.spec b/freeze_pyinstaller/PyScanFCS_win7.spec
deleted file mode 100644
index 1a04671..0000000
--- a/freeze_pyinstaller/PyScanFCS_win7.spec
+++ /dev/null
@@ -1,63 +0,0 @@
-# -*- mode: python -*-
-import codecs
-import os
-import sys
-
-if not os.path.exists("freeze_pyinstaller"):
- raise Exception("Please go to `PyScanFCS` directory.")
-
-
-name = "PyScanFCS"
-DIR = os.path.realpath(".")
-PyInstDir = os.path.join(DIR, "freeze_pyinstaller")
-PCFDIR = os.path.join(DIR, "pyscanfcs")
-ProgPy = os.path.join(PCFDIR,"PyScanFCS.py")
-ChLog = os.path.join(DIR,"ChangeLog.txt")
-DocPDF = os.path.join(DIR,"doc/PyScanFCS_doc.pdf")
-ICO = os.path.join(PyInstDir,"PyScanFCS.ico")
-
-sys.path.append(DIR)
-
-## Create inno setup .iss file
-import pyscanfcs
-version = pyscanfcs.__version__
-issfile = codecs.open(os.path.join(PyInstDir,"win7_innosetup.iss.dummy"), 'r', "utf-8")
-iss = issfile.readlines()
-issfile.close()
-for i in range(len(iss)):
- if iss[i].strip().startswith("#define MyAppVersion"):
- iss[i] = '#define MyAppVersion "{:s}"\n'.format(version)
-nissfile = codecs.open("win7_innosetup.iss", 'wb', "utf-8")
-nissfile.write(u"\ufeff")
-nissfile.writelines(iss)
-nissfile.close()
-
-
-a = Analysis([ProgPy],
- pathex=[DIR],
- hiddenimports=["sympy.assumptions.handlers", # sympy
- "sympy.assumptions.handlers.common",
- "scipy.special._ufuncs_cxx"],
- hookspath=None)
-a.datas += [('doc\\ChangeLog.txt', ChLog, 'DATA'),
- ('doc\\PyScanFCS_doc.pdf', DocPDF, 'DATA')]
-
-pyz = PYZ(a.pure)
-
-exe = EXE(pyz,
- a.scripts,
- exclude_binaries=True,
- name=name+'.exe',
- debug=False,
- strip=None,
- upx=True,
- icon=ICO,
- console=False )
-
-coll = COLLECT(exe,
- a.binaries,
- a.zipfiles,
- a.datas,
- strip=None,
- upx=True,
- name=name)
diff --git a/freeze_pyinstaller/README.md b/freeze_pyinstaller/README.md
deleted file mode 100644
index cfaa47f..0000000
--- a/freeze_pyinstaller/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-PyScanFCS - creating binaries with PyInstaller
-=========
-
-Usage
--------------------
-
-All cython (~.pyx) files must be compiled before scripts in this directory
-can be run. In the PyScanFCS/ directory execute:
-
- python setup.py build_ext --inplace
-
-Download PyInstaller from http://www.pyinstaller.org/ ([Working revision](https://github.com/pyinstaller/pyinstaller/commit/779d07b236a943a4bf9d2b1a0ae3e0ebcc914798)).
-To create a single binary file, go to the unpacked pyinstaller directory and execute
-
- python pyinstaller.py /Path/To/PyScanFCS.py
-
-Alternatively, there are ~.spec files and scripts for Windows / Mac / Debian in this directory for bundling binary files.
-
-Note
--------------------
-
-For more details, consult [PyCorrFit/freeze_pyinstaller](https://github.com/paulmueller/PyCorrFit/tree/master/freeze_pyinstaller).
diff --git a/freeze_pyinstaller/debian_ubuntu_bundle_script.sh b/freeze_pyinstaller/debian_ubuntu_bundle_script.sh
deleted file mode 100755
index eaf835c..0000000
--- a/freeze_pyinstaller/debian_ubuntu_bundle_script.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-Progname="PyScanFCS"
-# Go to base dir of repo
-BASEDIR=$(dirname $0)
-cd $BASEDIR
-BASEDIR=$(pwd)
-cd "../"
-StartDir=$(pwd)"/"
-Progdir=${StartDir}"/"
-# We require a Progname_doc.tex in the source-doc directory
-DocDir=${StartDir}"/doc/"
-Docname=${DocDir}${Progname}"_doc.pdf"
-Changelogname="ChangeLog.txt"
-Specfile=${BASEDIR}"/"${Progname}"_linux.spec"
-codename=$(lsb_release -c | awk 'BEGIN { FS = "\t" }; { print $2 }')
-distrib=$(lsb_release -i | awk 'BEGIN { FS = "\t" }; { print $2 }')
-version=$(head -n1 ./ChangeLog.txt | tr -d "\r\n")
-#Binname="dist/"${Progname}_${distrib}_${codename}_$(uname -r)".bin"
-Zipname="dist/"${Progname}_${version}_${distrib}_${codename}_$(uname -r)".zip"
-Env="env_${Progname}"
-
-echo $Specfile
-
-cd $StartDir
-
-echo "############"
-echo "Checking pip"
-echo "############"
-# Check if pip is installed
-if [ 1 -ne $(dpkg -s python-pip | grep -c "Status: install ok installed") ]; then
- echo "Please install package `python-pip`"
- exit
-fi
-if ! [ -e $Env ]; then
- virtualenv --system-site-packages $Env
- if [ $? -ne 0 ]; then
- echo "Error - Aborting"
- exit
- fi
- source $Env"/bin/activate"
- # Pyinstaller
- pip install git+git://github.com/pyinstaller/pyinstaller.git@779d07b236a943a4bf9d2b1a0ae3e0ebcc914798
- # PyFITS
- pip install pyfits
-fi
-source $Env"/bin/activate"
-
-
-
-echo "###################"
-echo "Building Extensions"
-echo "###################"
-rm -f $Docname
-python setup.py build_ext --inplace
-if [ $? -ne 0 ]; then
- echo "Error - Aborting"
- exit
-fi
-
-
-echo "############################"
-echo "Removing old build directory"
-echo "############################"
-rm -rf build
-if [ $? -ne 0 ]; then
- echo "Error - Aborting"
- exit
-fi
-
-
-echo "###################"
-echo "Running Pyinstaller"
-echo "###################"
-pyinstaller -F $Specfile
-if [ $? -ne 0 ]; then
- echo "Error - Aborting"
- exit
-fi
-
-
-echo "############"
-echo "Creating Zip"
-echo "############"
-zip -j ${Zipname} "dist/"${Progname} ${Docname} ${Changelogname}
diff --git a/freeze_pyinstaller/macOSx_script_starter.sh b/freeze_pyinstaller/macOSx_script_starter.sh
deleted file mode 100644
index f907864..0000000
--- a/freeze_pyinstaller/macOSx_script_starter.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# We need to run PyScanFCS in a separate Terminal to prevent this error
-# from occuring:
-#
-# UnicodeDecodeError: 'ascii' codec can't decode byte 0xcf
-# in position 0: ordinal not in range(128)
-#
-# tags: pyinstaller app bundling wxpython
-
-cd $(dirname "$0")
-open -a Terminal.app ./PyScanFCS.bin
diff --git a/freeze_pyinstaller/win7_32bit_bundle_script.bat b/freeze_pyinstaller/win7_32bit_bundle_script.bat
deleted file mode 100644
index 3aa1d24..0000000
--- a/freeze_pyinstaller/win7_32bit_bundle_script.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-cd %~dp0
-cd ..
-DEL /F /Q .\doc\PyScanFCS_doc.pdf
-
-pyinstaller -y .\freeze_pyinstaller\PyScanFCS_win7.spec
diff --git a/freeze_pyinstaller/win7_innosetup.iss.dummy b/freeze_pyinstaller/win7_innosetup.iss.dummy
deleted file mode 100644
index 2860449..0000000
--- a/freeze_pyinstaller/win7_innosetup.iss.dummy
+++ /dev/null
@@ -1,113 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "PyScanFCS"
-#define MyAppVersion "0.2.2"
-#define MyAppPublisher "Paul Müller"
-#define MyAppURL "http://pyscanfcs.craban.de"
-#define MyAppExeName "PyScanFCS.exe"
-#define MyAppDir = "C:\Users\Paul\Desktop\PyScanFCS\dist\PyScanFCS\"
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{10078D61-1BFE-505A-C57D-57BCC20B8360}
-AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
-DisableDirPage=yes
-DefaultGroupName={#MyAppName}
-AllowNoIcons=yes
-OutputBaseFilename={#MyAppName}_{#MyAppVersion}_setup
-Compression=lzma
-SolidCompression=yes
-ChangesAssociations=yes
-
-
-[Languages]
-Name: "english"; MessagesFile: "compiler:Default.isl"
-
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Files]
-Source: "{#MyAppDir}{#MyAppName}.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyAppDir}*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{group}\Documentation"; Filename: "{app}\doc\{#MyAppName}_doc.pdf"
-Name: "{group}\Changelog"; Filename: "{app}\doc\Changelog.txt"
-Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-
-[Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-
-[Code]
-/////////////////////////////////////////////////////////////////////
-function GetUninstallString(): String;
-var
- sUnInstPath: String;
- sUnInstallString: String;
-begin
- sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\{#emit SetupSetting("AppId")}_is1');
- sUnInstallString := '';
- if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then
- RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString);
- Result := sUnInstallString;
-end;
-
-
-/////////////////////////////////////////////////////////////////////
-function IsUpgrade(): Boolean;
-begin
- Result := (GetUninstallString() <> '');
-end;
-
-
-/////////////////////////////////////////////////////////////////////
-function UnInstallOldVersion(): Integer;
-var
- sUnInstallString: String;
- iResultCode: Integer;
-begin
-// Return Values:
-// 1 - uninstall string is empty
-// 2 - error executing the UnInstallString
-// 3 - successfully executed the UnInstallString
-
- // default return value
- Result := 0;
-
- // get the uninstall string of the old app
- sUnInstallString := GetUninstallString();
- if sUnInstallString <> '' then begin
- sUnInstallString := RemoveQuotes(sUnInstallString);
- if Exec(sUnInstallString, '/SILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then
- Result := 3
- else
- Result := 2;
- end else
- Result := 1;
-end;
-
-/////////////////////////////////////////////////////////////////////
-procedure CurStepChanged(CurStep: TSetupStep);
-begin
- if (CurStep=ssInstall) then
- begin
- if (IsUpgrade()) then
- begin
- UnInstallOldVersion();
- end;
- end;
-end;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/pyscanfcs.git
More information about the debian-med-commit
mailing list