Use course_discovery in preference to edx_course_discovery

Makefile

@@ -35,12 +35,12 @@ requirements:
 	pip install -qr requirements.txt --exists-action w
 
 test: clean
-	coverage run ./manage.py test edx_course_discovery --settings=edx_course_discovery.settings.test
+	coverage run ./manage.py test course_discovery --settings=course_discovery.settings.test
 	coverage report
 
 quality:
-	pep8 --config=.pep8 edx_course_discovery *.py
-	pylint --rcfile=pylintrc edx_course_discovery *.py
+	pep8 --config=.pep8 course_discovery *.py
+	pylint --rcfile=pylintrc course_discovery *.py
 
 validate: test quality
 
@@ -55,7 +55,7 @@ extract_translations:
 	python manage.py makemessages -l en -v1 -d djangojs
 
 dummy_translations:
-	cd edx_course_discovery && i18n_tool dummy
+	cd course_discovery && i18n_tool dummy
 
 compile_translations:
 	python manage.py compilemessages

README.rst

@@ -4,11 +4,11 @@ __ http://code.edx.org/
 
 Course Discovery Service  |Travis|_ |Coveralls|_
 =====================================================
-.. |Travis| image:: https://travis-ci.org/edx/edx_course_discovery.svg?branch=master
-.. _Travis: https://travis-ci.org/edx/edx_course_discovery
+.. |Travis| image:: https://travis-ci.org/edx/course-discovery.svg?branch=master
+.. _Travis: https://travis-ci.org/edx/course-discovery
 
-.. |Coveralls| image:: https://coveralls.io/repos/edx/edx_course_discovery/badge.svg?branch=master
-.. _Coveralls: https://coveralls.io/r/edx/edx_course_discovery?branch=master
+.. |Coveralls| image:: https://coveralls.io/repos/edx/course-discovery/badge.svg?branch=master
+.. _Coveralls: https://coveralls.io/r/edx/course-discovery?branch=master
 
 The ``README.rst`` file should start with a brief description of the repository,
 which sets it in the context of other repositories under the ``edx``
@@ -29,7 +29,7 @@ Documentation (please modify)
 The ``README.rst`` should include a link to the developer documentation. This documentation should be hosted on
 Read the Docs. An example statement and link are below.
 
-The docs for Course Discovery Service are on Read the Docs:  https://edx_course_discovery.readthedocs.org.
+The docs for Course Discovery Service are on Read the Docs:  https://open-edx-course-discovery.readthedocs.org.
 
 License
 -------

edx_course_discovery/apps/api/urls.py → course_discovery/apps/api/urls.py

@@ -7,5 +7,5 @@ contain namespaces for the active versions of the API.
 from django.conf.urls import url, include
 
 urlpatterns = [
-    url(r'^v1/', include('edx_course_discovery.apps.api.v1.urls', namespace='v1')),
+    url(r'^v1/', include('course_discovery.apps.api.v1.urls', namespace='v1')),
 ]

edx_course_discovery/apps/core/admin.py → course_discovery/apps/core/admin.py

@@ -4,7 +4,7 @@ from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
 from django.utils.translation import ugettext_lazy as _
 
-from edx_course_discovery.apps.core.models import User
+from course_discovery.apps.core.models import User
 
 
 class CustomUserAdmin(UserAdmin):

edx_course_discovery/apps/core/tests/test_context_processors.py → course_discovery/apps/core/tests/test_context_processors.py

@@ -2,7 +2,7 @@
 
 from django.test import TestCase, override_settings, RequestFactory
 
-from edx_course_discovery.apps.core.context_processors import core
+from course_discovery.apps.core.context_processors import core
 
 PLATFORM_NAME = 'Test Platform'
 

edx_course_discovery/apps/core/tests/test_models.py → course_discovery/apps/core/tests/test_models.py

@@ -4,7 +4,7 @@ from django.test import TestCase
 from django_dynamic_fixture import G
 from social.apps.django_app.default.models import UserSocialAuth
 
-from edx_course_discovery.apps.core.models import User
+from course_discovery.apps.core.models import User
 
 
 # pylint: disable=no-member

edx_course_discovery/apps/core/tests/test_views.py → course_discovery/apps/core/tests/test_views.py

@@ -9,7 +9,7 @@ from django.test.utils import override_settings
 from django.utils.encoding import force_text
 import mock
 
-from edx_course_discovery.apps.core.constants import Status
+from course_discovery.apps.core.constants import Status
 
 
 User = get_user_model()

edx_course_discovery/apps/core/views.py → course_discovery/apps/core/views.py

@@ -10,7 +10,7 @@ from django.http import Http404
 from django.shortcuts import redirect
 from django.views.generic import View
 
-from edx_course_discovery.apps.core.constants import Status
+from course_discovery.apps.core.constants import Status
 
 logger = logging.getLogger(__name__)
 User = get_user_model()
@@ -27,7 +27,7 @@ def health(_):
         HttpResponse: 503 if the service is unavailable, with JSON data indicating the health of each required service
 
     Example:
-        >>> response = requests.get('https://edx_course_discovery.edx.org/health')
+        >>> response = requests.get('https://course-discovery.edx.org/health')
         >>> response.status_code
         200
         >>> response.content

edx_course_discovery/settings/base.py → course_discovery/settings/base.py

@@ -8,7 +8,7 @@ root = lambda *x: join(abspath(PROJECT_ROOT), *x)
 
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = os.environ.get('EDX_COURSE_DISCOVERY_SECRET_KEY', 'insecure-secret-key')
+SECRET_KEY = os.environ.get('COURSE_DISCOVERY_SECRET_KEY', 'insecure-secret-key')
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = False
@@ -33,8 +33,8 @@ THIRD_PARTY_APPS = (
 )
 
 PROJECT_APPS = (
-    'edx_course_discovery.apps.core',
-    'edx_course_discovery.apps.api',
+    'course_discovery.apps.core',
+    'course_discovery.apps.api',
 )
 
 INSTALLED_APPS += THIRD_PARTY_APPS
@@ -53,10 +53,10 @@ MIDDLEWARE_CLASSES = (
     'waffle.middleware.WaffleMiddleware',
 )
 
-ROOT_URLCONF = 'edx_course_discovery.urls'
+ROOT_URLCONF = 'course_discovery.urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.
-WSGI_APPLICATION = 'edx_course_discovery.wsgi.application'
+WSGI_APPLICATION = 'course_discovery.wsgi.application'
 
 # Database
 # https://docs.djangoproject.com/en/1.8/ref/settings/#databases
@@ -126,7 +126,7 @@ TEMPLATES = [
                 'django.template.context_processors.static',
                 'django.template.context_processors.tz',
                 'django.contrib.messages.context_processors.messages',
-                'edx_course_discovery.apps.core.context_processors.core',
+                'course_discovery.apps.core.context_processors.core',
             ),
             'debug': True,  # Django will only display debug pages if the global DEBUG setting is set to True.
         }
@@ -139,9 +139,9 @@ TEMPLATES = [
 # The purpose of customizing the cookie names is to avoid conflicts when
 # multiple Django services are running behind the same hostname.
 # Detailed information at: https://docs.djangoproject.com/en/dev/ref/settings/
-SESSION_COOKIE_NAME = 'edx_course_discovery_sessionid'
-CSRF_COOKIE_NAME = 'edx_course_discovery_csrftoken'
-LANGUAGE_COOKIE_NAME = 'edx_course_discovery_language'
+SESSION_COOKIE_NAME = 'course_discovery_sessionid'
+CSRF_COOKIE_NAME = 'course_discovery_csrftoken'
+LANGUAGE_COOKIE_NAME = 'course_discovery_language'
 # END COOKIE CONFIGURATION
 
 # AUTHENTICATION CONFIGURATION

edx_course_discovery/settings/local.py → course_discovery/settings/local.py

-from edx_course_discovery.settings.base import *
+from course_discovery.settings.base import *
 
 DEBUG = True
 

edx_course_discovery/settings/production.py → course_discovery/settings/production.py

 from os import environ
 import yaml
 
-from edx_course_discovery.settings.base import *
-from edx_course_discovery.settings.utils import get_env_setting
+from course_discovery.settings.base import *
+from course_discovery.settings.utils import get_env_setting
 
 
 DEBUG = False

edx_course_discovery/settings/test.py → course_discovery/settings/test.py

 import os
 
-from edx_course_discovery.settings.base import *
+from course_discovery.settings.base import *
 
 
 # TEST SETTINGS

edx_course_discovery/urls.py → course_discovery/urls.py

-"""edx_course_discovery URL Configuration
+"""course_discovery URL Configuration
 The `urlpatterns` list routes URLs to views. For more information please see:
     https://docs.djangoproject.com/en/1.8/topics/http/urls/
 Examples:
@@ -22,7 +22,7 @@ from django.contrib.auth.views import logout
 from django.core.urlresolvers import reverse_lazy
 from django.views.generic import RedirectView
 
-from edx_course_discovery.apps.core import views as core_views
+from course_discovery.apps.core import views as core_views
 
 admin.autodiscover()
 
@@ -32,7 +32,7 @@ login = RedirectView.as_view(url=reverse_lazy('social:begin', args=['edx-oidc'])
 
 urlpatterns = [
     url(r'^admin/', include(admin.site.urls)),
-    url(r'^api/', include('edx_course_discovery.apps.api.urls', namespace='api')),
+    url(r'^api/', include('course_discovery.apps.api.urls', namespace='api')),
     url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
     url(r'^auto_auth/$', core_views.AutoAuth.as_view(), name='auto_auth'),
     url(r'^health/$', core_views.health, name='health'),

edx_course_discovery/wsgi.py → course_discovery/wsgi.py

 """
-WSGI config for edx_course_discovery.
+WSGI config for course_discovery.
 
 It exposes the WSGI callable as a module-level variable named ``application``.
 
@@ -13,7 +13,7 @@ from sys import path
 SITE_ROOT = dirname(dirname(abspath(__file__)))
 path.append(SITE_ROOT)
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "edx_course_discovery.settings.local")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "course_discovery.settings.local")
 
 from django.core.wsgi import get_wsgi_application
 

docs/Makefile

@@ -87,9 +87,9 @@ qthelp:
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/edx_course_discovery.qhcp"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/course_discovery.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/edx_course_discovery.qhc"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/course_discovery.qhc"
 
 applehelp:
 	$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
@@ -104,8 +104,8 @@ devhelp:
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/edx_course_discovery"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/edx_course_discovery"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/course_discovery"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/course_discovery"
 	@echo "# devhelp"
 
 epub:

docs/conf.py

@@ -172,7 +172,7 @@ html_static_path = ['_static']
 # html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'edx_course_discoverydoc'
+htmlhelp_basename = 'course_discoverydoc'
 
 
 # -- Options for LaTeX output --------------------------------------------------
@@ -191,7 +191,7 @@ latex_elements = {
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ('index', 'edx_course_discovery.tex', u'Course Discovery Service Documentation',
+    ('index', 'course_discovery.tex', u'Course Discovery Service Documentation',
      u'edX', 'manual'),
 ]
 

docs/getting_started.rst

@@ -19,8 +19,8 @@ Dependencies can be installed via the command below.
 Local/Private Settings
 ----------------------
 When developing locally, it may be useful to have settings overrides that you do not wish to commit to the repository.
-If you need such overrides, create a file :file:`edx_course_discovery/settings/private.py`. This file's values are
-read by :file:`edx_course_discovery/settings/local.py`, but ignored by Git.
+If you need such overrides, create a file :file:`course_discovery/settings/private.py`. This file's values are
+read by :file:`course_discovery/settings/local.py`, but ignored by Git.
 
 
 Configure edX OpenID Connect (OIDC)
@@ -47,7 +47,7 @@ A new OAuth 2.0 client can be created at ``http://127.0.0.1:8000/admin/oauth2/cl
     8. Click :guilabel:`Save`.
 
 Now that you have the client credentials, you can update your settings (ideally in
-:file:`edx_course_discovery/settings/local.py`). The table below describes the relevant settings.
+:file:`course_discovery/settings/local.py`). The table below describes the relevant settings.
 
 +-----------------------------------------------------+----------------------------------------------------------------------------+--------------------------------------------------------------------------+
 | Setting                                             | Description                                                                | Value                                                                    |

docs/index.rst

-.. edx_course_discovery documentation master file, created by
+.. course_discovery documentation master file, created by
    sphinx-quickstart on Sun Feb 17 11:46:20 2013.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.

manage.py

@@ -8,7 +8,7 @@ import os
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "edx_course_discovery.settings.local")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "course_discovery.settings.local")
 
     from django.core.management import execute_from_command_line