Remove the inloop.gh_import module

st-tu-dresden · Mar 5, 2018 · 3efaead · 3efaead
1 parent bb45c1f
commit 3efaead
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 306 deletions.
diff --git a/.env.develop b/.env.develop
@@ -6,7 +6,6 @@ DEBUG=True
 DJANGO_SETTINGS_MODULE=inloop.settings
 EMAIL_URL=consolemail://
 FROM_EMAIL=inloop@example.com
-GITHUB_SECRET=secret
 REDIS_URL=redis://127.0.0.1:6379/1
 SECRET_KEY=secret
 SECURE_COOKIES=False

diff --git a/docs/INSTALL.md b/docs/INSTALL.md
@@ -192,8 +192,6 @@ Installation
         ├── DATABASE_URL
         ├── DJANGO_SETTINGS_MODULE
         ├── FROM_EMAIL
-        ├── GITHUB_SECRET
-        ├── GIT_ROOT
         ├── LANG
         ├── MEDIA_ROOT
         ├── PATH
@@ -309,8 +307,6 @@ Name                      | Description
 `DATABASE_URL`            | 12factor style database URL, e.g. `postgres://user:pass@host:port/db`
 `DJANGO_SETTINGS_MODULE`  | Set to `inloop.settings` unless you know what you are doing
 `FROM_EMAIL`              | Address used for outgoing mail, e.g. `inloop@example.com`
-`GITHUB_SECRET`           | Github webhook endpoint secret
-`GIT_ROOT`                | Must be a subdirectory of `MEDIA_ROOT`
 `LANG`                    | Set to `en_US.UTF-8` unless you know what you are doing
 `MEDIA_ROOT`              | Path to the directory for user uploads
 `PYTHONPATH`              | Set it to the path of the INLOOP git clone

diff --git a/inloop/gh_import/__init__.py b/inloop/gh_import/__init__.py
diff --git a/inloop/gh_import/git.py b/inloop/gh_import/git.py
diff --git a/inloop/gh_import/github_known_hosts.txt b/inloop/gh_import/github_known_hosts.txt
diff --git a/inloop/gh_import/tasks.py b/inloop/gh_import/tasks.py
diff --git a/inloop/gh_import/urls.py b/inloop/gh_import/urls.py
diff --git a/inloop/gh_import/utils.py b/inloop/gh_import/utils.py
diff --git a/inloop/gh_import/views.py b/inloop/gh_import/views.py
diff --git a/inloop/settings.py b/inloop/settings.py
@@ -55,7 +55,6 @@
     "inloop.solutions",
     "inloop.tasks",
     "inloop.testrunner",
-    "inloop.gh_import",
     "inloop.gitload",
 ]
 
@@ -183,12 +182,6 @@
 }
 DOCKER_IMAGE = "inloop-java-checker"
 
-GITHUB_SECRET = env("GITHUB_SECRET")
-GIT_ROOT = str(env("GIT_ROOT", cast=Path, default=BASE_DIR.parent / "inloop-tasks"))
-GIT_SSH_URL = env("GIT_URL", default="")
-GIT_SSH_KEY = None
-GIT_BRANCH = env("GIT_BRANCH", default="master")
-
 REPOSITORY_ROOT = str(Path(MEDIA_ROOT).joinpath("repository"))
 
 ACCOUNT_ACTIVATION_DAYS = 7

diff --git a/inloop/urls.py b/inloop/urls.py
@@ -4,7 +4,7 @@
 from django.contrib.flatpages.views import flatpage
 
 from inloop.accounts import urls as account_urls
-from inloop.gh_import import urls as github_urls
+from inloop.gitload import urls as gitload_urls
 from inloop.solutions import urls as solution_urls
 from inloop.tasks import urls as task_urls
 from inloop.views import home, logout
@@ -17,7 +17,7 @@
     url(r'^logout/$', logout, name="logout"),
 
     url(r'^account/', include(account_urls)),
-    url(r'^github/', include(github_urls)),
+    url(r'^gitload/', include(gitload_urls)),
     url(r'^solutions/', include(solution_urls)),
     url(r'^tasks/', include(task_urls)),
 

diff --git a/tests/.env b/tests/.env
@@ -6,7 +6,6 @@ DEBUG=True
 DJANGO_SETTINGS_MODULE=tests.settings
 EMAIL_URL=consolemail://
 FROM_EMAIL=inloop@example.com
-GITHUB_SECRET=secret
 INTERNAL_IPS=127.0.0.1
 REDIS_URL=redis://127.0.0.1:9/
 SECRET_KEY=testsecret
diff --git a/tests/unit/test_gitimport.py b/tests/unit/test_gitimport.py