diff --git a/MANIFEST.in b/MANIFEST.in index d927c2b3..0a1ce10d 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,3 @@ -include buildserver/config.buildserver.yml include buildserver/provision-android-ndk include buildserver/provision-android-sdk include buildserver/provision-apt-get-install diff --git a/buildserver/config.buildserver.yml b/buildserver/config.buildserver.yml deleted file mode 100644 index cca1143d..00000000 --- a/buildserver/config.buildserver.yml +++ /dev/null @@ -1 +0,0 @@ -sdk_path: /opt/android-sdk diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 9cc80aca..1266e928 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -155,10 +155,6 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force): send_dir(os.path.join(serverpath)) ftp.chdir(homedir) - ftp.put(os.path.join(serverpath, '..', 'buildserver', - 'config.buildserver.yml'), 'config.yml') - ftp.chmod('config.yml', 0o600) - # Copy over the ID (head commit hash) of the fdroidserver in use... with open(os.path.join(os.getcwd(), 'tmp', 'fdroidserverid'), 'wb') as fp: fp.write(subprocess.check_output(['git', 'rev-parse', 'HEAD'], diff --git a/setup.py b/setup.py index 51ac523c..99e199e2 100755 --- a/setup.py +++ b/setup.py @@ -55,9 +55,6 @@ def get_data_files(): data_files.append( ('share/doc/fdroidserver/examples', re.findall(r'include (examples/.*)', data)) ) - data_files.append( - ('share/doc/fdroidserver/examples', ['buildserver/config.buildserver.yml']) - ) for d in re.findall(r'include (locale/.*)/fdroidserver\.po', data): data_files.append(('share/' + d, [d + '/fdroidserver.mo'])) diff --git a/tests/test_common.py b/tests/test_common.py index eb7c0396..fe26f420 100755 --- a/tests/test_common.py +++ b/tests/test_common.py @@ -2145,15 +2145,6 @@ class CommonTest(SetUpTearDownMixin, unittest.TestCase): config = {'sdk_path': self.testdir} self.assertFalse(fdroidserver.common.test_sdk_exists(config)) - def test_loading_config_buildserver_yml(self): - """Smoke check to make sure this file is properly parsed""" - os.chdir(self.testdir) - shutil.copy( - os.path.join(basedir, '..', 'buildserver', 'config.buildserver.yml'), - fdroidserver.common.CONFIG_FILE, - ) - fdroidserver.common.read_config() - @mock.patch.dict(os.environ, {'PATH': os.getenv('PATH')}, clear=True) def test_config_with_env_string(self): """Test whether env works in keys with string values."""