From 8327585b3b82bec18024bb99f64bce24bf5097d5 Mon Sep 17 00:00:00 2001
From: Lex Berezhny <lex@damoti.com>
Date: Tue, 31 Dec 2019 19:34:08 -0500
Subject: [PATCH] fix set_build.py and other things

---
 .gitignore                | 14 ++++++++++++++
 docker/set_build.py       |  2 +-
 lbry/.gitattributes       |  1 -
 lbry/.gitignore           | 16 ----------------
 mkdocs.yml                | 29 -----------------------------
 scripts/idea/lbry-sdk.iml |  8 +++-----
 6 files changed, 18 insertions(+), 52 deletions(-)
 delete mode 100644 lbry/.gitattributes
 delete mode 100644 lbry/.gitignore
 delete mode 100644 mkdocs.yml

diff --git a/.gitignore b/.gitignore
index 5cbb2e2a0..51b7f31fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,16 @@
 /.idea
 /.DS_Store
+/build
+/dist
+/.tox
+/.coverage
+/lbry-venv
+
+lbry.egg-info
+__pycache__
+_trial_temp/
+
+/tests/integration/files
+/tests/.coverage.*
+
+/lbry/wallet/bin
diff --git a/docker/set_build.py b/docker/set_build.py
index bc2bd3d97..7cb3294db 100644
--- a/docker/set_build.py
+++ b/docker/set_build.py
@@ -23,7 +23,7 @@ def get_build_type(ci_tag=None):
 
 def main():
     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)
     commit_hash = os.getenv('CI_COMMIT_SHA', os.getenv('TRAVIS_COMMIT'))
     if commit_hash is None:
diff --git a/lbry/.gitattributes b/lbry/.gitattributes
deleted file mode 100644
index ef9566b29..000000000
--- a/lbry/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-/CHANGELOG.md merge=union
\ No newline at end of file
diff --git a/lbry/.gitignore b/lbry/.gitignore
deleted file mode 100644
index 02efd9dbf..000000000
--- a/lbry/.gitignore
+++ /dev/null
@@ -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
diff --git a/mkdocs.yml b/mkdocs.yml
deleted file mode 100644
index 8588f13bb..000000000
--- a/mkdocs.yml
+++ /dev/null
@@ -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'
diff --git a/scripts/idea/lbry-sdk.iml b/scripts/idea/lbry-sdk.iml
index 1c6f56d31..97d03f025 100644
--- a/scripts/idea/lbry-sdk.iml
+++ b/scripts/idea/lbry-sdk.iml
@@ -2,11 +2,9 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/torba" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/torba/tests" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/lbry" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/lbry/tests" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/lbry/scripts" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/scripts" isTestSource="false" />
     </content>
     <orderEntry type="jdk" jdkName="Python 3.7 (lbry)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />