diff --git a/.coveragerc b/.coveragerc index 5cbe5b3e0..f3470dc6d 100644 --- a/.coveragerc +++ b/.coveragerc @@ -6,5 +6,3 @@ omit = */migrations/* treeherder/config/wsgi.py treeherder/config/settings.py - treeherder/config/settings_local.py - treeherder/config/settings_local.example.py diff --git a/.gitignore b/.gitignore index fac6fa071..d3e1561ad 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,6 @@ node_modules/ deployment/update/commander_settings.py dist/ docs/_build/ -treeherder/config/settings_local.py treeherder/media/ treeherder/static/ treeherder/webapp/log_cache/ diff --git a/docs/pulseload.rst b/docs/pulseload.rst index a9ada86e8..70b78c3fa 100644 --- a/docs/pulseload.rst +++ b/docs/pulseload.rst @@ -10,8 +10,7 @@ posting your own data. Configuration ------------- -To specify the exchanges to read from, you can set environment variables in -Vagrant, or in your ``config/settings_local.py`` file. For example:: +Specify the exchanges to read from using environment variables. For example:: PULSE_DATA_INGESTION_SOURCES = [ { diff --git a/puppet/manifests/vagrant.pp b/puppet/manifests/vagrant.pp index 63b1794d1..9f333ffd1 100644 --- a/puppet/manifests/vagrant.pp +++ b/puppet/manifests/vagrant.pp @@ -16,11 +16,6 @@ file {"/etc/profile.d/treeherder.sh": target => "${PROJ_DIR}/puppet/files/treeherder/env.sh", } -file {"${PROJ_DIR}/treeherder/config/settings_local.py": - replace => "no", - source => "${PROJ_DIR}/treeherder/config/settings_local.example.py", -} - class vagrant { class { init: before => Class["mysql"]; diff --git a/treeherder/config/settings.py b/treeherder/config/settings.py index d9f0921fb..c27ff8e73 100644 --- a/treeherder/config/settings.py +++ b/treeherder/config/settings.py @@ -453,8 +453,6 @@ PULSE_EXCHANGE_NAMESPACE = env("PULSE_EXCHANGE_NAMESPACE", default=None) # Specifies the Pulse exchanges Treeherder will ingest data from. This list # will be updated as new applications come online that Treeherder supports. -# Can be overridden in settings_local.py to specify fewer or completely different -# exchanges for testing purposes on local machines. # Treeherder will subscribe with routing keys that are all combinations of # ``project`` and ``destination`` in the form of: # . @@ -528,19 +526,6 @@ PULSE_DATA_INGESTION_QUEUES_AUTO_DELETE = False GITHUB_CLIENT_ID = env("GITHUB_CLIENT_ID", default=None) GITHUB_CLIENT_SECRET = env("GITHUB_CLIENT_SECRET", default=None) -# The git-ignored settings_local.py file should only be used for local development. -if env.bool("ENABLE_LOCAL_SETTINGS_FILE", default=False): - # Note: All the configs below this import will take precedence over what is - # defined in settings_local.py! - try: - assert "update" not in globals() - from .settings_local import * - if "update" in globals(): - update(globals()) - del globals()['update'] - except ImportError: - pass - TEMPLATE_DEBUG = DEBUG # The database config is defined using environment variables of form: diff --git a/treeherder/config/settings_local.example.py b/treeherder/config/settings_local.example.py deleted file mode 100644 index 5ac3b2b09..000000000 --- a/treeherder/config/settings_local.example.py +++ /dev/null @@ -1,3 +0,0 @@ -# Switch to using a different bugzilla instance -BZ_API_URL = "https://bugzilla-dev.allizom.org" -