Merge branch 'v2' into bugfix/update-email

Author: adorton-adobe

.appveyor/build.ps1

@@ -0,0 +1,29 @@
+if ($env:python.endswith("36-x64")) {
+    $pycmd = "${env:python}\python.exe"
+    & $pycmd -m venv venv
+} else {
+    $venvcmd = "${env:python}\Scripts\virtualenv.exe"
+    & $venvcmd venv
+}
+.\venv\Scripts\activate.ps1
+pip install external\okta-0.0.3.1-py2.py3-none-any.whl
+pip install -e .
+pip install -e .[test]
+pip install -e .[setup]
+
+if ($env:python.endswith("36-x64")) {
+    pip uninstall -y enum34
+}
+
+make $env:BUILD_TARGET 2>&1
+dir dist
+mkdir release
+
+cp dist\user-sync.exe release\
+cd release
+7z a "user-sync-${env:APPVEYOR_REPO_TAG_NAME}${env:BUILD_EDITION}-win64.zip" user-sync.exe
+cd ..
+7z a -ttar -r release\examples.tar examples
+7z a -tgzip release\examples.tar.gz release\examples.tar
+7z a -r release\examples.zip examples\
+dir release

.build/.appveyor/build.ps1

@@ -0,0 +1,21 @@
+
+# -----------------------------------------------------------------------------
+# Copyright (c) 2013-2018, PyInstaller Development Team.
+#
+# Distributed under the terms of the GNU General Public License with exception
+# for distributing bootloader.
+#
+# The full license is in the file COPYING.txt, distributed with this software.
+# -----------------------------------------------------------------------------
+
+# Temporary implementation until this PR is merged:
+# https://github.com/pyinstaller/pyinstaller/pull/3948/files
+
+# See also https://github.com/jaraco/keyring/issues/324
+
+from PyInstaller.utils.hooks import collect_submodules, copy_metadata
+
+hiddenimports = collect_submodules('keyrings.cryptfile.cryptfile')
+
+# keyring uses entrypoints to read keyring.backends from metadata file entry_points.txt.
+datas = copy_metadata('keyrings.cryptfile')

.appveyor/test.ps1 .build/.appveyor/test.ps1.appveyor/test.ps1 renamed to .build/.appveyor/test.ps1

@@ -1,12 +1,13 @@
 #!/usr/bin/env bash
 virtualenv venv -p /usr/bin/python3.6
 source venv/bin/activate
+python -m pip install --upgrade pip
 pip install external/okta-0.0.3.1-py2.py3-none-any.whl
 pip install -e .
 pip install -e .[test]
 pip install -e .[setup]
 pip uninstall -y enum34
-make
+make $BUILD_TARGET
 pwd
-.travis/release.sh
+.build/.travis/release.sh
 python setup.py test

.build/.build/hook-keyring.cryptfile.py

@@ -4,4 +4,4 @@ pip install -e .
 pip install -e .[test]
 pip install -e .[setup]
 pip uninstall -y enum34
-make
+make $BUILD_TARGET

.travis/build-py36-centos.sh .build/.travis/build-py36-centos.sh.travis/build-py36-centos.sh renamed to .build/.travis/build-py36-centos.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+cd dist
+tar czf "user-sync-${TRAVIS_TAG}${BUILD_EDITION}-${IMG}.tar.gz" user-sync
+cd ..
+mkdir -p release
+mv dist/*.tar.gz release/
+ls -al release/

.travis/build-py36.sh .build/.travis/build-py36.sh.travis/build-py36.sh renamed to .build/.travis/build-py36.sh

@@ -0,0 +1,20 @@
+# -----------------------------------------------------------------------------
+# Copyright (c) 2013-2018, PyInstaller Development Team.
+#
+# Distributed under the terms of the GNU General Public License with exception
+# for distributing bootloader.
+#
+# The full license is in the file COPYING.txt, distributed with this software.
+# -----------------------------------------------------------------------------
+
+# Temporary implementation until this PR is merged:
+# https://github.com/pyinstaller/pyinstaller/pull/3948/files
+
+# See also https://github.com/jaraco/keyring/issues/324
+
+from PyInstaller.utils.hooks import collect_submodules, copy_metadata
+
+hiddenimports = collect_submodules('keyring.backends')
+
+# keyring uses entrypoints to read keyring.backends from metadata file entry_points.txt.
+datas = copy_metadata('keyring')