From cf735211c92e692106ff83d1004bf5bcf9d55914 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 10:52:54 -0500 Subject: [PATCH 01/32] Initial file --- appveyor.yml | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..c038e461 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,45 @@ +environment: + + matrix: + + - PYTHON: "C:\\Python27" + PYTHON_VERSION: "2.7.x" # currently 2.7.9 + PYTHON_ARCH: "32" + + - PYTHON: "C:\\Python27-x64" + PYTHON_VERSION: "2.7.x" # currently 2.7.9 + PYTHON_ARCH: "64" + +install: + # If there is a newer build queued for the same PR, cancel this one. + # The AppVeyor 'rollout builds' option is supposed to serve the same + # purpose but it is problematic because it tends to cancel builds pushed + # directly to master instead of just PR builds (or the converse). + # credits: JuliaLang developers. + - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod ` + https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | ` + Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { ` + throw "There are newer queued builds for this pull request, failing early." } + - ECHO "Filesystem root:" + - ps: "ls \"C:/\"" + + # Check that we have the expected version and architecture for Python + - "python --version" + - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" + + # Upgrade to the latest version of pip to avoid it displaying warnings + # about it being out of date. + - "python -m pip install --upgrade pip" + + # Install the build dependencies of the project. If some dependencies contain + # compiled extensions and are not provided as pre-built wheel packages, + # pip will build them from source using the MSVC compiler matching the + # target Python version and architecture + - "%CMD_IN_ENV% pip install -r requirements.txt" + +build_script: + - "%CMD_IN_ENV% python src\\setup.py py2exe" + +artifacts: + # Archive the generated packages in the ci.appveyor.com build report. + - path: src\dist\* From 071bcf55ef4f788ac1ede824cc9db495cb6ce554 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 11:10:20 -0500 Subject: [PATCH 02/32] Try to clone include submodules --- appveyor.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index c038e461..63600c67 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,6 +10,13 @@ environment: PYTHON_VERSION: "2.7.x" # currently 2.7.9 PYTHON_ARCH: "64" +clone_script: +- cmd: >- + git clone -q --branch=%APPVEYOR_REPO_BRANCH% https://github.com/%APPVEYOR_REPO_NAME%.git %APPVEYOR_BUILD_FOLDER% + cd %APPVEYOR_BUILD_FOLDER% + git checkout -qf %APPVEYOR_REPO_COMMIT% + git submodule update --init --recursive + install: # If there is a newer build queued for the same PR, cancel this one. # The AppVeyor 'rollout builds' option is supposed to serve the same From 967cc8da718a51883e2835fa39b56d5ec8d6df69 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 11:18:10 -0500 Subject: [PATCH 03/32] Fix --- appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 63600c67..dea25d06 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,11 +11,11 @@ environment: PYTHON_ARCH: "64" clone_script: -- cmd: >- - git clone -q --branch=%APPVEYOR_REPO_BRANCH% https://github.com/%APPVEYOR_REPO_NAME%.git %APPVEYOR_BUILD_FOLDER% - cd %APPVEYOR_BUILD_FOLDER% - git checkout -qf %APPVEYOR_REPO_COMMIT% - git submodule update --init --recursive + - cmd: >- + git clone -q --branch=%APPVEYOR_REPO_BRANCH% https://github.com/%APPVEYOR_REPO_NAME%.git %APPVEYOR_BUILD_FOLDER% + && cd %APPVEYOR_BUILD_FOLDER% + && git checkout -qf %APPVEYOR_REPO_COMMIT% + && git submodule update --init --recursive install: # If there is a newer build queued for the same PR, cancel this one. From ccdcc7676e8544fe6a696cceaed62d27ffec7501 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 11:31:18 -0500 Subject: [PATCH 04/32] Adds py2exe and pyenchant to the party --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index dea25d06..3aa3927f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,6 +43,7 @@ install: # pip will build them from source using the MSVC compiler matching the # target Python version and architecture - "%CMD_IN_ENV% pip install -r requirements.txt" +- "%CMD_IN_ENV% pip install -r py2exe pyenchant" build_script: - "%CMD_IN_ENV% python src\\setup.py py2exe" From 4aef2595b2fb9fc9d56b49bb77948a8942b50143 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 11:32:25 -0500 Subject: [PATCH 05/32] Fixed syntax error --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3aa3927f..6d402e95 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,7 +43,7 @@ install: # pip will build them from source using the MSVC compiler matching the # target Python version and architecture - "%CMD_IN_ENV% pip install -r requirements.txt" -- "%CMD_IN_ENV% pip install -r py2exe pyenchant" + - "%CMD_IN_ENV% pip install -r py2exe pyenchant" build_script: - "%CMD_IN_ENV% python src\\setup.py py2exe" From 8459135002a67c1682cd75a80bef1003cea6b4bb Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 11:35:31 -0500 Subject: [PATCH 06/32] Fixed other problem --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6d402e95..d17a1bca 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,7 +43,7 @@ install: # pip will build them from source using the MSVC compiler matching the # target Python version and architecture - "%CMD_IN_ENV% pip install -r requirements.txt" - - "%CMD_IN_ENV% pip install -r py2exe pyenchant" + - "%CMD_IN_ENV% pip install py2exe pyenchant" build_script: - "%CMD_IN_ENV% python src\\setup.py py2exe" From d4a73fb3bbcf45b9b52d1371c98198c52332b4e5 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 11:41:36 -0500 Subject: [PATCH 07/32] Add direct url to Py2exe --- appveyor.yml | 2 +- requirements.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d17a1bca..a62b7dbc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,7 +43,7 @@ install: # pip will build them from source using the MSVC compiler matching the # target Python version and architecture - "%CMD_IN_ENV% pip install -r requirements.txt" - - "%CMD_IN_ENV% pip install py2exe pyenchant" + - "%CMD_IN_ENV% pip install pyenchant" build_script: - "%CMD_IN_ENV% python src\\setup.py py2exe" diff --git a/requirements.txt b/requirements.txt index 65691da8..501267f7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,4 +21,5 @@ chardet urllib3 youtube-dl python-vlc -pywin32 \ No newline at end of file +pywin32 +http://sourceforge.net/projects/py2exe/files/latest/download?source=files \ No newline at end of file From eaf13a44530f8acc7cc20ed901ce61c2e42eaa56 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 11:46:51 -0500 Subject: [PATCH 08/32] Changes in paths --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a62b7dbc..d28071d3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -46,8 +46,9 @@ install: - "%CMD_IN_ENV% pip install pyenchant" build_script: - - "%CMD_IN_ENV% python src\\setup.py py2exe" + - "cd src" + - "%CMD_IN_ENV% python setup.py py2exe" artifacts: # Archive the generated packages in the ci.appveyor.com build report. - - path: src\dist\* + - path: dist\* From db231e07f8221fd0b3d40efd293c4cc7e02c274a Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 12:31:02 -0500 Subject: [PATCH 09/32] Documentation should be generated in a folder called documentation --- doc/generator.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/generator.py b/doc/generator.py index a19ea972..1bdc1888 100644 --- a/doc/generator.py +++ b/doc/generator.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import markdown import os +import shutil from codecs import open as _open import languageHandler languageHandler.setLanguage("en") @@ -38,14 +39,18 @@ def generate_document(language, document_type="documentation"): """ % (language, title, title) first_html_block = first_html_block+ markdown_file first_html_block = first_html_block + "\n\n" - if not os.path.exists(language): - os.mkdir(language) - mdfile = _open("%s/%s" % (language, filename), "w", encoding="utf-8") + if not os.path.exists(os.path.join("documentation", language)): + os.mkdir(os.path.join("documentation", language)) + mdfile = _open(os.path.join("documentation", language, filename), "w", encoding="utf-8") mdfile.write(first_html_block) mdfile.close() def create_documentation(): print("Creating documentation in the supported languages...\n") + if not os.path.exists("documentation"): + os.mkdir("documentation") + if os.path.exists(os.path.join("documentation", "license.txt")) == False: + shutil.copy(os.path.join("..", "license.txt"), os.path.join("documentation", "license.txt")) for i in languages: print("Creating documentation for: %s" % (i,)) generate_document(i) From c806f17484346b25b43ecd9f0b06507de55495fe Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 12:31:28 -0500 Subject: [PATCH 10/32] Calls doc generator just before packaging --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index d28071d3..17789fdc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -47,6 +47,7 @@ install: build_script: - "cd src" + - "%CMD_IN_ENV% python ..\doc\generator.py" - "%CMD_IN_ENV% python setup.py py2exe" artifacts: From 8a6f73fdc29d35daddef5f9bd8e2fc9f7fa7c1af Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 12:33:34 -0500 Subject: [PATCH 11/32] Fixed a typo --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 17789fdc..ec7a55cd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -47,7 +47,7 @@ install: build_script: - "cd src" - - "%CMD_IN_ENV% python ..\doc\generator.py" + - "%CMD_IN_ENV% python ..\\doc\\generator.py" - "%CMD_IN_ENV% python setup.py py2exe" artifacts: From fbbd3cf00e5890e7557b7bc0513d6949bcf40e09 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 12:39:42 -0500 Subject: [PATCH 12/32] Call documentation importer before attempt to build doc --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index ec7a55cd..a428d218 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -47,6 +47,7 @@ install: build_script: - "cd src" + - "%CMD_IN_ENV% python ..\\doc\\documentation_importer.py" - "%CMD_IN_ENV% python ..\\doc\\generator.py" - "%CMD_IN_ENV% python setup.py py2exe" From a3d1052193dff9f3737355941176aaf9a1634355 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 12:43:51 -0500 Subject: [PATCH 13/32] More path issues --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a428d218..3290a558 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -46,8 +46,9 @@ install: - "%CMD_IN_ENV% pip install pyenchant" build_script: - - "cd src" - - "%CMD_IN_ENV% python ..\\doc\\documentation_importer.py" + - "cd doc" + - "%CMD_IN_ENV% python documentation_importer.py" + - "cd ..\\src" - "%CMD_IN_ENV% python ..\\doc\\generator.py" - "%CMD_IN_ENV% python setup.py py2exe" From fe8a3b15651006f35559ff3891333eae42fe4d92 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 13:07:54 -0500 Subject: [PATCH 14/32] Try to create an artifact after packaged --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 3290a558..f4e17b54 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -51,6 +51,8 @@ build_script: - "cd ..\\src" - "%CMD_IN_ENV% python ..\\doc\\generator.py" - "%CMD_IN_ENV% python setup.py py2exe" + - "cd dist" + - cmd: 7z a twblue-snapshot.zip * artifacts: # Archive the generated packages in the ci.appveyor.com build report. From 9a94b9201855030b62a0791c457ed4c1e8362ab3 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 13:13:20 -0500 Subject: [PATCH 15/32] Specify artifact name to appveyor --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index f4e17b54..f661de4e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -56,4 +56,4 @@ build_script: artifacts: # Archive the generated packages in the ci.appveyor.com build report. - - path: dist\* + - path: twblue-snapshot.zip From b16a6c5ddb1cd6335f965d6ed8dd82cca353d906 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 13:27:48 -0500 Subject: [PATCH 16/32] Add absolute path to artifacts --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index f661de4e..ed20d2b7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -56,4 +56,4 @@ build_script: artifacts: # Archive the generated packages in the ci.appveyor.com build report. - - path: twblue-snapshot.zip + - path: src\dist\twblue-snapshot.zip From ec61f4b4311d2cec8f2d0cc7c7a0160d7ed4a873 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 13:56:17 -0500 Subject: [PATCH 17/32] Cleaning up --- appveyor.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ed20d2b7..42740f7c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,15 +1,24 @@ +pull_requests: + do_not_increment_build_number: true + +#skip_non_tags: true + environment: matrix: + # List of python versions we want to work with. - PYTHON: "C:\\Python27" PYTHON_VERSION: "2.7.x" # currently 2.7.9 PYTHON_ARCH: "32" + # perhaps we may enable this one in future? - PYTHON: "C:\\Python27-x64" - PYTHON_VERSION: "2.7.x" # currently 2.7.9 - PYTHON_ARCH: "64" +# PYTHON_VERSION: "2.7.x" # currently 2.7.9 +# PYTHON_ARCH: "64" + +# This is important so we will retrieve everything in submodules as opposed to default method. clone_script: - cmd: >- git clone -q --branch=%APPVEYOR_REPO_BRANCH% https://github.com/%APPVEYOR_REPO_NAME%.git %APPVEYOR_BUILD_FOLDER% @@ -55,5 +64,4 @@ build_script: - cmd: 7z a twblue-snapshot.zip * artifacts: - # Archive the generated packages in the ci.appveyor.com build report. - path: src\dist\twblue-snapshot.zip From 099bc49761b4233d3dbe66ede43498b16b9cfdcc Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 16:50:10 -0500 Subject: [PATCH 18/32] Test ftp deployment --- appveyor.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 42740f7c..ab065011 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,7 +13,7 @@ environment: PYTHON_ARCH: "32" # perhaps we may enable this one in future? - - PYTHON: "C:\\Python27-x64" +# - PYTHON: "C:\\Python27-x64" # PYTHON_VERSION: "2.7.x" # currently 2.7.9 # PYTHON_ARCH: "64" @@ -65,3 +65,12 @@ build_script: artifacts: - path: src\dist\twblue-snapshot.zip + +deploy: +- provider: FTP + host: twblue.es + protocol: ftp + username: twblue + password: + secure: ml/xB8YEoZ7DmjzDr+KSNw== + folder: web/updates \ No newline at end of file From 3be69cb6a261a2c0d5372efd8fd74366e2243ffe Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 17:11:06 -0500 Subject: [PATCH 19/32] Tried moving artifacts --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ab065011..6fae1805 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -61,10 +61,10 @@ build_script: - "%CMD_IN_ENV% python ..\\doc\\generator.py" - "%CMD_IN_ENV% python setup.py py2exe" - "cd dist" - - cmd: 7z a twblue-snapshot.zip * + - cmd: 7z a ..\..\twblue-snapshot.zip * artifacts: - - path: src\dist\twblue-snapshot.zip + - path: twblue-snapshot.zip deploy: - provider: FTP @@ -73,4 +73,4 @@ deploy: username: twblue password: secure: ml/xB8YEoZ7DmjzDr+KSNw== - folder: web/updates \ No newline at end of file + folder: web \ No newline at end of file From ecd2984a617cce71e442b67b7940338ab239fd75 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 17:14:47 -0500 Subject: [PATCH 20/32] Last test before real deployment --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6fae1805..5d48a20a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -73,4 +73,4 @@ deploy: username: twblue password: secure: ml/xB8YEoZ7DmjzDr+KSNw== - folder: web \ No newline at end of file + folder: web/updates \ No newline at end of file From 00f96bb7af5c6e77d9c0a48f63b0ab72daebe2aa Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 17:23:44 -0500 Subject: [PATCH 21/32] Real deployment with fake path to ftp --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5d48a20a..24b4af54 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -61,10 +61,10 @@ build_script: - "%CMD_IN_ENV% python ..\\doc\\generator.py" - "%CMD_IN_ENV% python setup.py py2exe" - "cd dist" - - cmd: 7z a ..\..\twblue-snapshot.zip * + - cmd: 7z a ..\..\snapshot.zip * artifacts: - - path: twblue-snapshot.zip + - path: snapshot.zip deploy: - provider: FTP @@ -73,4 +73,4 @@ deploy: username: twblue password: secure: ml/xB8YEoZ7DmjzDr+KSNw== - folder: web/updates \ No newline at end of file + folder: updates \ No newline at end of file From a9378988cbe183e93edcd7df7c34b6ec000757db Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 17:28:33 -0500 Subject: [PATCH 22/32] Second test with faked path --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 24b4af54..a3f31191 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -73,4 +73,4 @@ deploy: username: twblue password: secure: ml/xB8YEoZ7DmjzDr+KSNw== - folder: updates \ No newline at end of file + folder: 2017 \ No newline at end of file From 3ae581a19f35e6112448a1ea82d10b4925627941 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 17:39:09 -0500 Subject: [PATCH 23/32] Let's try with beta ftp lib --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a3f31191..80fe2031 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -70,7 +70,8 @@ deploy: - provider: FTP host: twblue.es protocol: ftp + beta: true username: twblue password: secure: ml/xB8YEoZ7DmjzDr+KSNw== - folder: 2017 \ No newline at end of file + folder: '//pubs' \ No newline at end of file From 6c29a4a18fb25a44be4eeaf14611fe8c87372931 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 17:48:18 -0500 Subject: [PATCH 24/32] Use absolute path to ftp destination --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 80fe2031..c9f9bcb6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -74,4 +74,4 @@ deploy: username: twblue password: secure: ml/xB8YEoZ7DmjzDr+KSNw== - folder: '//pubs' \ No newline at end of file + folder: '//var/web/twblue/pubs' \ No newline at end of file From 8bac4b8ec6187dd3af7d6cc78d422e3f583f1681 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 21:29:42 -0500 Subject: [PATCH 25/32] Commented and fixed everything. Ready for pr --- appveyor.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c9f9bcb6..400a5177 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,9 @@ pull_requests: + # Avoid building after pull requests. Shall we disable this option? do_not_increment_build_number: true -#skip_non_tags: true +# Only build whenever we add tags to the repo. +skip_non_tags: true environment: @@ -17,7 +19,6 @@ environment: # PYTHON_VERSION: "2.7.x" # currently 2.7.9 # PYTHON_ARCH: "64" - # This is important so we will retrieve everything in submodules as opposed to default method. clone_script: - cmd: >- @@ -55,12 +56,17 @@ install: - "%CMD_IN_ENV% pip install pyenchant" build_script: + # Build documentation at first, so setup.py won't fail when copying everything. - "cd doc" + # Import documentation before building, so strings.py will be created. - "%CMD_IN_ENV% python documentation_importer.py" + # build doc from src folder so it will generate result files right there. - "cd ..\\src" - "%CMD_IN_ENV% python ..\\doc\\generator.py" + # Build distributable files. - "%CMD_IN_ENV% python setup.py py2exe" - "cd dist" + # Zip it all. - cmd: 7z a ..\..\snapshot.zip * artifacts: From 72fd93eaf698b9e0a023f573bf683954d5c3acdf Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 23:26:15 -0500 Subject: [PATCH 26/32] Added appveyor badge --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0c5bd5d0..418932a4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ TWBlue - ====== +[![Build status](https://ci.appveyor.com/api/projects/status/fml5fu7h1fj8vf6l?svg=true)](https://ci.appveyor.com/project/manuelcortez/twblue) + TW Blue is an app designed to use Twitter simply and efficiently while using minimal system resources. With this app you’ll have access to twitter features such as: From cbc2e978c97672c89f743aedc94ef92f086d20cb Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 23:29:01 -0500 Subject: [PATCH 27/32] Fixed remote ftp path again --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 400a5177..d86aa412 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ pull_requests: do_not_increment_build_number: true # Only build whenever we add tags to the repo. -skip_non_tags: true +#skip_non_tags: true environment: @@ -80,4 +80,4 @@ deploy: username: twblue password: secure: ml/xB8YEoZ7DmjzDr+KSNw== - folder: '//var/web/twblue/pubs' \ No newline at end of file + folder: '//pubs' \ No newline at end of file From 682f1e8bd40d5b814d9c4d773f8ed3d583567f08 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 18 Sep 2018 23:55:00 -0500 Subject: [PATCH 28/32] Skipped folder option --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index d86aa412..681f3983 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -80,4 +80,4 @@ deploy: username: twblue password: secure: ml/xB8YEoZ7DmjzDr+KSNw== - folder: '//pubs' \ No newline at end of file +# folder: '//pubs' \ No newline at end of file From f87312fc53df84ffd2875d88ed51a075881f1231 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Wed, 19 Sep 2018 00:09:52 -0500 Subject: [PATCH 29/32] Disable building in all commits --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 681f3983..929f00fc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ pull_requests: do_not_increment_build_number: true # Only build whenever we add tags to the repo. -#skip_non_tags: true +skip_non_tags: true environment: From 7a2ad3797d67bdf90495b4d12dc644ed1241db6f Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Wed, 19 Sep 2018 11:12:51 -0500 Subject: [PATCH 30/32] Added py2exe_py2 from PyPi --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 501267f7..a4eb000e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,4 +22,4 @@ urllib3 youtube-dl python-vlc pywin32 -http://sourceforge.net/projects/py2exe/files/latest/download?source=files \ No newline at end of file +py2exe_py2 \ No newline at end of file From 79512af350babe9640fe8cae5f2f849c2dd4528c Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Wed, 19 Sep 2018 11:47:13 -0500 Subject: [PATCH 31/32] Try to add a missing module by hand in setup --- src/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/setup.py b/src/setup.py index 43c41dee..ab758a03 100644 --- a/src/setup.py +++ b/src/setup.py @@ -112,7 +112,7 @@ data_files = get_data(), options = { 'py2exe': { 'optimize':2, - 'packages': ["pubsub", "pubsub.core", "pubsub.core.kwargs", "dbhash"], + 'packages': ["pubsub", "pubsub.core", "pubsub.core.kwargs", "dbhash", "oauthlib.oauth1.rfc5849.endpoints.resource"], 'dll_excludes': ["MPR.dll", "api-ms-win-core-apiquery-l1-1-0.dll", "api-ms-win-core-console-l1-1-0.dll", "api-ms-win-core-delayload-l1-1-1.dll", "api-ms-win-core-errorhandling-l1-1-1.dll", "api-ms-win-core-file-l1-2-0.dll", "api-ms-win-core-handle-l1-1-0.dll", "api-ms-win-core-heap-obsolete-l1-1-0.dll", "api-ms-win-core-libraryloader-l1-1-1.dll", "api-ms-win-core-localization-l1-2-0.dll", "api-ms-win-core-processenvironment-l1-2-0.dll", "api-ms-win-core-processthreads-l1-1-1.dll", "api-ms-win-core-profile-l1-1-0.dll", "api-ms-win-core-registry-l1-1-0.dll", "api-ms-win-core-synch-l1-2-0.dll", "api-ms-win-core-sysinfo-l1-2-0.dll", "api-ms-win-security-base-l1-2-0.dll", "api-ms-win-core-heap-l1-2-0.dll", "api-ms-win-core-interlocked-l1-2-0.dll", "api-ms-win-core-localization-obsolete-l1-1-0.dll", "api-ms-win-core-string-l1-1-0.dll", "api-ms-win-core-string-obsolete-l1-1-0.dll", "WLDAP32.dll", "MSVCP90.dll", "CRYPT32.dll", "mfc90.dll"], 'compressed': True }, From 3d310c0ee4ca6d23aa402291be67dd902d595a31 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Wed, 19 Sep 2018 12:00:29 -0500 Subject: [PATCH 32/32] ADded other missing module from oauthlib (really?) --- src/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/setup.py b/src/setup.py index ab758a03..2e5a522b 100644 --- a/src/setup.py +++ b/src/setup.py @@ -112,7 +112,7 @@ data_files = get_data(), options = { 'py2exe': { 'optimize':2, - 'packages': ["pubsub", "pubsub.core", "pubsub.core.kwargs", "dbhash", "oauthlib.oauth1.rfc5849.endpoints.resource"], + 'packages': ["pubsub", "pubsub.core", "pubsub.core.kwargs", "dbhash", "oauthlib.oauth1.rfc5849.endpoints.resource", "oauthlib.oauth2.rfc6749.endpoints.resource"], 'dll_excludes': ["MPR.dll", "api-ms-win-core-apiquery-l1-1-0.dll", "api-ms-win-core-console-l1-1-0.dll", "api-ms-win-core-delayload-l1-1-1.dll", "api-ms-win-core-errorhandling-l1-1-1.dll", "api-ms-win-core-file-l1-2-0.dll", "api-ms-win-core-handle-l1-1-0.dll", "api-ms-win-core-heap-obsolete-l1-1-0.dll", "api-ms-win-core-libraryloader-l1-1-1.dll", "api-ms-win-core-localization-l1-2-0.dll", "api-ms-win-core-processenvironment-l1-2-0.dll", "api-ms-win-core-processthreads-l1-1-1.dll", "api-ms-win-core-profile-l1-1-0.dll", "api-ms-win-core-registry-l1-1-0.dll", "api-ms-win-core-synch-l1-2-0.dll", "api-ms-win-core-sysinfo-l1-2-0.dll", "api-ms-win-security-base-l1-2-0.dll", "api-ms-win-core-heap-l1-2-0.dll", "api-ms-win-core-interlocked-l1-2-0.dll", "api-ms-win-core-localization-obsolete-l1-1-0.dll", "api-ms-win-core-string-l1-1-0.dll", "api-ms-win-core-string-obsolete-l1-1-0.dll", "WLDAP32.dll", "MSVCP90.dll", "CRYPT32.dll", "mfc90.dll"], 'compressed': True },