Compare commits

...
10 Commits
Author SHA1 Message Date
Job Evers-Meltzer ffe084be4d Pin pyobjc to version 3.1.1 2016-12-16 21:17:10 -06:00
Job Evers-Meltzer f8a1e0e110 Bump version: 0.7.10 → 0.7.11 2016-12-16 21:08:31 -06:00
Job Evers-Meltzer 6e59c86381 OSX is having https issues, hopefully this fixes it
When I build locally, the resulting app doesn't have https issues. Looking
over the build script output, I notice that its copying

copying /usr/local/opt/openssl/lib/libssl.1.0.0.dylib -> /Users/jobevers/tmp/lbry/packaging/osx/lbry-osx-app/dist/LBRY.app/Contents/Frameworks

such a line isn't present when travis builds.  This version of libssl
is installed by homebrew. Fingers crossed.
2016-12-16 21:08:16 -06:00
Job Evers-Meltzer 61f00be342 fix ssl handshake error 2016-12-16 21:07:13 -06:00
Job Evers-Meltzer 46412cb4e5 Bump version: 0.7.10rc0 → 0.7.10 2016-12-15 12:14:34 -06:00
Job Evers-Meltzer 08a825b1d5 try setting zip_safe=False 2016-12-15 12:14:21 -06:00
Jack fc5d190b37 Bump version: 0.7.9 → 0.7.10rc0 2016-12-13 02:10:05 -05:00
Job Evers-Meltzer 27b08e23f9 merge 7932e29fb0 2016-12-13 02:08:13 -05:00
Kay Kurokawa 56c64a4091 fix bug in get_my_claim 2016-12-13 01:53:34 -05:00
Jack bcc0812a07 fix wallet_balance when checking fee amount 2016-12-13 01:53:00 -05:00
8 changed files with 25 additions and 18 deletions

No files matched your search

+1 -1
View File
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.7.8
current_version = 0.7.11
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<candidate>\d+))?
+1 -1
View File
@@ -1,6 +1,6 @@
import logging
__version__ = "0.7.8"
__version__ = "0.7.11"
version = tuple(__version__.split('.'))
logging.getLogger(__name__).addHandler(logging.NullHandler())
+2 -2
View File
@@ -390,12 +390,12 @@ class Wallet(object):
if not claim:
return False
claim['value'] = json.loads(claim['value'])
return claim
return claim
def _get_my_unspent_claim(claims):
for claim in claims:
if claim['name'] == name and not claim['is spent'] and not claim.get('supported_claimid', False):
if claim['name'] == name and not claim['is spent'] and claim['category'] != 'support':
return claim
return False
+1 -1
View File
@@ -114,7 +114,7 @@ class GetStream(object):
self.fee = FeeValidator(self.stream_info['fee'])
max_key_fee = self._convert_max_fee()
converted_fee = self.exchange_rate_manager.to_lbc(self.fee).amount
if converted_fee > self.wallet.get_balance():
if converted_fee > self.wallet.wallet_balance:
log.warning("Insufficient funds to download lbry://%s", self.resolved_name)
return defer.fail(InsufficientFundsError())
if converted_fee > max_key_fee:
+11 -11
View File
@@ -25,7 +25,7 @@ else
fi
pip install wheel
MODULES="pyobjc-core pyobjc-framework-Cocoa pyobjc-framework-CFNetwork pyobjc-framework-Quartz"
MODULES="pyobjc-core==3.1.1 pyobjc-framework-Cocoa==3.1.1 pyobjc-framework-CFNetwork==3.1.1 pyobjc-framework-Quartz==3.1.1"
if [ ${ON_TRAVIS} = true ]; then
WHEEL_DIR="${TRAVIS_BUILD_DIR}/cache/wheel"
mkdir -p "${WHEEL_DIR}"
@@ -38,26 +38,23 @@ if [ ${ON_TRAVIS} = true ]; then
if [ ! -f "${WHEEL_DIR}"/${MODULE}.finished ]; then
pip wheel -w "${WHEEL_DIR}" ${MODULE}
touch "${WHEEL_DIR}"/${MODULE}.finished
pip install ${MODULE}
fi
done
pip install "${WHEEL_DIR}"/*.whl
else
pip install $MODULES
fi
pip install $MODULES
pip install dmgbuild==1.1.0
export PATH=${PATH}:/Library/Frameworks/Python.framework/Versions/2.7/bin
pip install jsonrpc certifi
# the default py2app (v0.9) has a bug that is fixed in the head of /metachris/py2app
pip install git+https://github.com/metachris/py2app
# pyopenssl is needed because OSX ships an old version of openssl by default
# and python will use it without pyopenssl
pip install PyOpenSSL jsonrpc certifi
NAME=`python setup.py --name`
VERSION=`python setup.py -V`
pip install -r requirements.txt
# not totally sure if pyOpenSSl is needed (JIE)
pip install pyOpenSSL
pip install pylint
pylint -E --disable=inherit-non-class --disable=no-member --ignored-modules=distutils \
@@ -77,7 +74,10 @@ codesign -s "${LBRY_DEVELOPER_ID}" -f "${DEST}/dist/LBRYURIHandler.app/Contents/
codesign --deep -s "${LBRY_DEVELOPER_ID}" -f "${DEST}/dist/LBRYURIHandler.app/Contents/MacOS/LBRYURIHandler"
codesign -vvvv "${DEST}/dist/LBRYURIHandler.app"
python setup_app.py py2app
# py2app will skip _cffi_backend without explicitly including it
# and without this, we will get SSL handshake errors when connecting
# to bittrex
python setup_app.py py2app -i _cffi_backend
echo "Removing i386 libraries"
+3
View File
@@ -6,4 +6,7 @@ set -o xtrace
wget https://www.python.org/ftp/python/2.7.11/python-2.7.11-macosx10.6.pkg
sudo installer -pkg python-2.7.11-macosx10.6.pkg -target /
pip install -U pip
brew update
brew install gmp
brew install openssl
brew link --force openssl
+1 -1
View File
@@ -1,5 +1,5 @@
[Desktop Entry]
Version=0.7.8
Version=0.7.11
Name=LBRY
Comment=The world's first user-owned content marketplace
Icon=lbry
+5 -1
View File
@@ -113,7 +113,11 @@ elif platform == DARWIN:
entry_points={'console_scripts': console_scripts},
package_data={
package_name: list(package_files('lbrynet/resources/ui'))
}
},
# If this is True, setuptools tries to build an egg
# and py2app / modulegraph / imp.find_module
# doesn't like that.
zip_safe=False,
)
elif platform == WINDOWS: