fix set_build.py and other things
This commit is contained in:
parent
727815d6dd
commit
8327585b3b
6 changed files with 18 additions and 52 deletions
14
.gitignore
vendored
14
.gitignore
vendored
|
@ -1,2 +1,16 @@
|
||||||
/.idea
|
/.idea
|
||||||
/.DS_Store
|
/.DS_Store
|
||||||
|
/build
|
||||||
|
/dist
|
||||||
|
/.tox
|
||||||
|
/.coverage
|
||||||
|
/lbry-venv
|
||||||
|
|
||||||
|
lbry.egg-info
|
||||||
|
__pycache__
|
||||||
|
_trial_temp/
|
||||||
|
|
||||||
|
/tests/integration/files
|
||||||
|
/tests/.coverage.*
|
||||||
|
|
||||||
|
/lbry/wallet/bin
|
||||||
|
|
|
@ -23,7 +23,7 @@ def get_build_type(ci_tag=None):
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
root_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
|
root_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
|
||||||
build_type_path = os.path.join(root_dir, 'lbry', 'lbry', 'build_type.py')
|
build_type_path = os.path.join(root_dir, 'lbry', 'build_type.py')
|
||||||
log.debug("configuring build type file: %s", build_type_path)
|
log.debug("configuring build type file: %s", build_type_path)
|
||||||
commit_hash = os.getenv('CI_COMMIT_SHA', os.getenv('TRAVIS_COMMIT'))
|
commit_hash = os.getenv('CI_COMMIT_SHA', os.getenv('TRAVIS_COMMIT'))
|
||||||
if commit_hash is None:
|
if commit_hash is None:
|
||||||
|
|
1
lbry/.gitattributes
vendored
1
lbry/.gitattributes
vendored
|
@ -1 +0,0 @@
|
||||||
/CHANGELOG.md merge=union
|
|
16
lbry/.gitignore
vendored
16
lbry/.gitignore
vendored
|
@ -1,16 +0,0 @@
|
||||||
.DS_Store
|
|
||||||
/build
|
|
||||||
/dist
|
|
||||||
/.tox
|
|
||||||
/.idea
|
|
||||||
/.coverage
|
|
||||||
/lbry-venv
|
|
||||||
|
|
||||||
lbry.egg-info
|
|
||||||
__pycache__
|
|
||||||
_trial_temp/
|
|
||||||
|
|
||||||
/tests/integration/files
|
|
||||||
/tests/.coverage.*
|
|
||||||
|
|
||||||
/lbry/wallet/bin
|
|
29
mkdocs.yml
29
mkdocs.yml
|
@ -1,29 +0,0 @@
|
||||||
site_name: LBRY
|
|
||||||
repo_url: https://github.com/lbryio/lbry-sdk
|
|
||||||
pages:
|
|
||||||
- "API": index.md
|
|
||||||
- "CLI": cli.md
|
|
||||||
site_dir: docs
|
|
||||||
docs_dir: docs_build
|
|
||||||
google_analytics:
|
|
||||||
- 'UA-60403362-1'
|
|
||||||
- 'auto'
|
|
||||||
theme:
|
|
||||||
name: material
|
|
||||||
palette:
|
|
||||||
primary: 'teal'
|
|
||||||
accent: 'green'
|
|
||||||
logo: 'https://s3.amazonaws.com/files.lbry.io/logo-square-white-bookonly.png'
|
|
||||||
social:
|
|
||||||
- type: 'github'
|
|
||||||
link: 'https://github.com/lbryio'
|
|
||||||
- type: 'twitter'
|
|
||||||
link: 'https://twitter.com/lbryio'
|
|
||||||
- type: 'facebook'
|
|
||||||
link: 'https://facebook.com/lbryio'
|
|
||||||
- type: 'telegram'
|
|
||||||
link: 'https://t.me/lbryofficial'
|
|
||||||
- type: 'discord'
|
|
||||||
link: 'https://chat.lbry.com'
|
|
||||||
- type: 'reddit'
|
|
||||||
link: 'https://reddit.com/r/lbry'
|
|
|
@ -2,11 +2,9 @@
|
||||||
<module type="PYTHON_MODULE" version="4">
|
<module type="PYTHON_MODULE" version="4">
|
||||||
<component name="NewModuleRootManager">
|
<component name="NewModuleRootManager">
|
||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/torba" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/torba/tests" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/lbry" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/scripts" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/lbry/tests" isTestSource="false" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/lbry/scripts" isTestSource="false" />
|
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="jdk" jdkName="Python 3.7 (lbry)" jdkType="Python SDK" />
|
<orderEntry type="jdk" jdkName="Python 3.7 (lbry)" jdkType="Python SDK" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
|
Loading…
Reference in a new issue