From 5a1490ba0d5bd5512773c09a7d939852ed7d8562 Mon Sep 17 00:00:00 2001 From: Johan Lorenzo Date: Thu, 20 Oct 2016 18:24:39 +0200 Subject: [PATCH] Rename project into fennec-aurora-task-creator It is more self-explanatory than "nightlies-watcher" --- .gitignore | 2 +- MANIFEST.in | 2 +- README.md | 10 +++++----- config_example.json | 2 +- .../__init__.py | 0 .../config.py | 2 +- .../data/config.default.json | 0 .../directories.py | 0 .../exceptions.py | 0 .../hg_mozilla.py | 2 +- .../main.py | 4 ++-- .../publish.py | 6 +++--- .../tc_index.py | 2 +- .../tc_queue.py | 2 +- .../test/__init__.py | 0 .../test/test_config.py | 4 ++-- .../test/test_hg_mozilla.py | 4 ++-- .../test/test_main.py | 2 +- .../test/test_publish.py | 18 +++++++++--------- .../test/test_tc_index.py | 4 ++-- .../test/test_tc_queue.py | 5 +++-- .../test/test_treeherder.py | 4 ++-- .../test/test_worker.py | 6 +++--- .../treeherder.py | 2 +- .../worker.py | 6 +++--- setup.py | 6 +++--- source_url.txt | 2 +- tox.ini | 2 +- 28 files changed, 50 insertions(+), 49 deletions(-) rename {nightlies_watcher => fennec_aurora_task_creator}/__init__.py (100%) rename {nightlies_watcher => fennec_aurora_task_creator}/config.py (92%) rename {nightlies_watcher => fennec_aurora_task_creator}/data/config.default.json (100%) rename {nightlies_watcher => fennec_aurora_task_creator}/directories.py (100%) rename {nightlies_watcher => fennec_aurora_task_creator}/exceptions.py (100%) rename {nightlies_watcher => fennec_aurora_task_creator}/hg_mozilla.py (90%) rename {nightlies_watcher => fennec_aurora_task_creator}/main.py (90%) rename {nightlies_watcher => fennec_aurora_task_creator}/publish.py (95%) rename {nightlies_watcher => fennec_aurora_task_creator}/tc_index.py (91%) rename {nightlies_watcher => fennec_aurora_task_creator}/tc_queue.py (94%) rename {nightlies_watcher => fennec_aurora_task_creator}/test/__init__.py (100%) rename {nightlies_watcher => fennec_aurora_task_creator}/test/test_config.py (88%) rename {nightlies_watcher => fennec_aurora_task_creator}/test/test_hg_mozilla.py (88%) rename {nightlies_watcher => fennec_aurora_task_creator}/test/test_main.py (94%) rename {nightlies_watcher => fennec_aurora_task_creator}/test/test_publish.py (94%) rename {nightlies_watcher => fennec_aurora_task_creator}/test/test_tc_index.py (89%) rename {nightlies_watcher => fennec_aurora_task_creator}/test/test_tc_queue.py (91%) rename {nightlies_watcher => fennec_aurora_task_creator}/test/test_treeherder.py (90%) rename {nightlies_watcher => fennec_aurora_task_creator}/test/test_worker.py (96%) rename {nightlies_watcher => fennec_aurora_task_creator}/treeherder.py (91%) rename {nightlies_watcher => fennec_aurora_task_creator}/worker.py (92%) diff --git a/.gitignore b/.gitignore index e332f29..a556ef8 100644 --- a/.gitignore +++ b/.gitignore @@ -57,5 +57,5 @@ target/ # Vim *.swp -# Specific to nightlies-watcher +# Specific to fennec-aurora-task-creator config.json diff --git a/MANIFEST.in b/MANIFEST.in index f399911..7881695 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ -recursive-include nightlies_watcher/data * +recursive-include fennec_aurora_task_creator/data * include LICENSE include README.rst diff --git a/README.md b/README.md index 68158d6..67144e5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# nightlies-watcher +# fennec-aurora-task-creator -[![Build Status](https://travis-ci.org/JohanLorenzo/nightlies-watcher.svg?branch=master)](https://travis-ci.org/JohanLorenzo/nightlies-watcher) [![Coverage Status](https://coveralls.io/repos/github/JohanLorenzo/nightlies-watcher/badge.svg?branch=master)](https://coveralls.io/github/JohanLorenzo/nightlies-watcher?branch=master) +[![Build Status](https://travis-ci.org/JohanLorenzo/fennec-aurora-task-creator.svg?branch=master)](https://travis-ci.org/JohanLorenzo/fennec-aurora-task-creator) [![Coverage Status](https://coveralls.io/repos/github/JohanLorenzo/fennec-aurora-task-creator/badge.svg?branch=master)](https://coveralls.io/github/JohanLorenzo/fennec-aurora-task-creator?branch=master) Create publishing tasks once Firefox for Android nightlies are built. It currently only supports publishing to Google Play Store. @@ -14,7 +14,7 @@ First, you need `python>=3.5.0`. virtualenv3 venv3 # activate it . venv3/bin/activate -pip install nightlies-watcher +pip install fennec-aurora-task-creator ``` ## Configure @@ -40,11 +40,11 @@ Here you may [create and edit scopes](https://tools.taskcluster.net/auth/clients ### Pulse config -In order to know when builds are ready, nightlies-watcher relies on [Pulse](https://wiki.mozilla.org/Auto-tools/Projects/Pulse). Here you may [create a client](https://pulseguardian.mozilla.org/profile). If you're using Mozilla's instance, you'll need to listen to the [task completed exchange](https://wiki.mozilla.org/Auto-tools/Projects/Pulse/Exchanges#Queue:_Task_Completed), which translates to: +In order to know when builds are ready, fennec-aurora-task-creator relies on [Pulse](https://wiki.mozilla.org/Auto-tools/Projects/Pulse). Here you may [create a client](https://pulseguardian.mozilla.org/profile). If you're using Mozilla's instance, you'll need to listen to the [task completed exchange](https://wiki.mozilla.org/Auto-tools/Projects/Pulse/Exchanges#Queue:_Task_Completed), which translates to: ``` exchange/taskcluster-queue/v1/task-completed ``` -At the first start of nightlies-watcher, a pulse queue will be created. If you're still using Mozilla's instance, nightlies are found under these keys: +At the first start of fennec-aurora-task-creator, a pulse queue will be created. If you're still using Mozilla's instance, nightlies are found under these keys: ``` route.index.gecko.v2.$BRANCH.nightly.latest.$PLATFORM.# ``` diff --git a/config_example.json b/config_example.json index 9d6ceb2..fb2d145 100644 --- a/config_example.json +++ b/config_example.json @@ -16,7 +16,7 @@ "group_name": "Publisher", "group_symbol": "pub", "symbol": "gp", - "reason": "The Nightly scheduler named 'nightlies-watcher' triggered this build", + "reason": "The Nightly scheduler named 'fennec-aurora-task-creator' triggered this build", "tier": 3, "is_opt": true }, diff --git a/nightlies_watcher/__init__.py b/fennec_aurora_task_creator/__init__.py similarity index 100% rename from nightlies_watcher/__init__.py rename to fennec_aurora_task_creator/__init__.py diff --git a/nightlies_watcher/config.py b/fennec_aurora_task_creator/config.py similarity index 92% rename from nightlies_watcher/config.py rename to fennec_aurora_task_creator/config.py index 4ce23da..0a29c34 100644 --- a/nightlies_watcher/config.py +++ b/fennec_aurora_task_creator/config.py @@ -3,7 +3,7 @@ import os from frozendict import frozendict -from nightlies_watcher.directories import PROJECT_DIRECTORY, DATA_DIRECTORY +from fennec_aurora_task_creator.directories import PROJECT_DIRECTORY, DATA_DIRECTORY logger = logging.getLogger(__name__) diff --git a/nightlies_watcher/data/config.default.json b/fennec_aurora_task_creator/data/config.default.json similarity index 100% rename from nightlies_watcher/data/config.default.json rename to fennec_aurora_task_creator/data/config.default.json diff --git a/nightlies_watcher/directories.py b/fennec_aurora_task_creator/directories.py similarity index 100% rename from nightlies_watcher/directories.py rename to fennec_aurora_task_creator/directories.py diff --git a/nightlies_watcher/exceptions.py b/fennec_aurora_task_creator/exceptions.py similarity index 100% rename from nightlies_watcher/exceptions.py rename to fennec_aurora_task_creator/exceptions.py diff --git a/nightlies_watcher/hg_mozilla.py b/fennec_aurora_task_creator/hg_mozilla.py similarity index 90% rename from nightlies_watcher/hg_mozilla.py rename to fennec_aurora_task_creator/hg_mozilla.py index 8c938e1..ca2f090 100644 --- a/nightlies_watcher/hg_mozilla.py +++ b/fennec_aurora_task_creator/hg_mozilla.py @@ -1,6 +1,6 @@ import requests -from nightlies_watcher.exceptions import NoPushIdError, TooManyPushIdsError +from fennec_aurora_task_creator.exceptions import NoPushIdError, TooManyPushIdsError def get_push_id(repository, revision): diff --git a/nightlies_watcher/main.py b/fennec_aurora_task_creator/main.py similarity index 90% rename from nightlies_watcher/main.py rename to fennec_aurora_task_creator/main.py index 0fe2704..35090cc 100644 --- a/nightlies_watcher/main.py +++ b/fennec_aurora_task_creator/main.py @@ -2,8 +2,8 @@ import logging import taskcluster -from nightlies_watcher.config import get_config -from nightlies_watcher.worker import start_message_queue_worker +from fennec_aurora_task_creator.config import get_config +from fennec_aurora_task_creator.worker import start_message_queue_worker logger = logging.getLogger(__name__) diff --git a/nightlies_watcher/publish.py b/fennec_aurora_task_creator/publish.py similarity index 95% rename from nightlies_watcher/publish.py rename to fennec_aurora_task_creator/publish.py index abe0dec..e56bd67 100644 --- a/nightlies_watcher/publish.py +++ b/fennec_aurora_task_creator/publish.py @@ -4,9 +4,9 @@ import re import taskcluster -from nightlies_watcher import treeherder, hg_mozilla, tc_index, tc_queue -from nightlies_watcher.directories import PROJECT_DIRECTORY -from nightlies_watcher.exceptions import NotOnlyOneApkError, TreeherderJobAlreadyExistError +from fennec_aurora_task_creator import treeherder, hg_mozilla, tc_index, tc_queue +from fennec_aurora_task_creator.directories import PROJECT_DIRECTORY +from fennec_aurora_task_creator.exceptions import NotOnlyOneApkError, TreeherderJobAlreadyExistError logger = logging.getLogger(__name__) diff --git a/nightlies_watcher/tc_index.py b/fennec_aurora_task_creator/tc_index.py similarity index 91% rename from nightlies_watcher/tc_index.py rename to fennec_aurora_task_creator/tc_index.py index 1b7a34f..56d0eea 100644 --- a/nightlies_watcher/tc_index.py +++ b/fennec_aurora_task_creator/tc_index.py @@ -1,6 +1,6 @@ from taskcluster import Index, exceptions -from nightlies_watcher.exceptions import TaskNotFoundError +from fennec_aurora_task_creator.exceptions import TaskNotFoundError _index = Index() diff --git a/nightlies_watcher/tc_queue.py b/fennec_aurora_task_creator/tc_queue.py similarity index 94% rename from nightlies_watcher/tc_queue.py rename to fennec_aurora_task_creator/tc_queue.py index 73ebba3..11101d8 100644 --- a/nightlies_watcher/tc_queue.py +++ b/fennec_aurora_task_creator/tc_queue.py @@ -2,7 +2,7 @@ from taskcluster import Queue -from nightlies_watcher.exceptions import UnmatchedRouteError +from fennec_aurora_task_creator.exceptions import UnmatchedRouteError _queue = Queue() diff --git a/nightlies_watcher/test/__init__.py b/fennec_aurora_task_creator/test/__init__.py similarity index 100% rename from nightlies_watcher/test/__init__.py rename to fennec_aurora_task_creator/test/__init__.py diff --git a/nightlies_watcher/test/test_config.py b/fennec_aurora_task_creator/test/test_config.py similarity index 88% rename from nightlies_watcher/test/test_config.py rename to fennec_aurora_task_creator/test/test_config.py index 50bdfc0..d7469fb 100644 --- a/nightlies_watcher/test/test_config.py +++ b/fennec_aurora_task_creator/test/test_config.py @@ -4,8 +4,8 @@ from frozendict import frozendict -from nightlies_watcher.config import get_config -from nightlies_watcher.directories import DATA_DIRECTORY +from fennec_aurora_task_creator.config import get_config +from fennec_aurora_task_creator.directories import DATA_DIRECTORY def test_get_config(): diff --git a/nightlies_watcher/test/test_hg_mozilla.py b/fennec_aurora_task_creator/test/test_hg_mozilla.py similarity index 88% rename from nightlies_watcher/test/test_hg_mozilla.py rename to fennec_aurora_task_creator/test/test_hg_mozilla.py index bf1c0cf..141afd1 100644 --- a/nightlies_watcher/test/test_hg_mozilla.py +++ b/fennec_aurora_task_creator/test/test_hg_mozilla.py @@ -1,7 +1,7 @@ import pytest -from nightlies_watcher.hg_mozilla import _get_full_repository_name, get_push_id, _get_push_log_url, _pluck_push_id -from nightlies_watcher.exceptions import NoPushIdError, TooManyPushIdsError +from fennec_aurora_task_creator.hg_mozilla import _get_full_repository_name, get_push_id, _get_push_log_url, _pluck_push_id +from fennec_aurora_task_creator.exceptions import NoPushIdError, TooManyPushIdsError def test_get_full_repository_name(): diff --git a/nightlies_watcher/test/test_main.py b/fennec_aurora_task_creator/test/test_main.py similarity index 94% rename from nightlies_watcher/test/test_main.py rename to fennec_aurora_task_creator/test/test_main.py index e289f9e..cdf1640 100644 --- a/nightlies_watcher/test/test_main.py +++ b/fennec_aurora_task_creator/test/test_main.py @@ -3,7 +3,7 @@ from unittest import mock -from nightlies_watcher.main import main +from fennec_aurora_task_creator.main import main def test_main(): diff --git a/nightlies_watcher/test/test_publish.py b/fennec_aurora_task_creator/test/test_publish.py similarity index 94% rename from nightlies_watcher/test/test_publish.py rename to fennec_aurora_task_creator/test/test_publish.py index c00dd75..15cc251 100644 --- a/nightlies_watcher/test/test_publish.py +++ b/fennec_aurora_task_creator/test/test_publish.py @@ -4,8 +4,8 @@ from distutils.util import strtobool -from nightlies_watcher.exceptions import NotOnlyOneApkError, TreeherderJobAlreadyExistError -from nightlies_watcher.publish import publish_if_possible, _filter_right_artifacts, _craft_artifact_urls, \ +from fennec_aurora_task_creator.exceptions import NotOnlyOneApkError, TreeherderJobAlreadyExistError +from fennec_aurora_task_creator.publish import publish_if_possible, _filter_right_artifacts, _craft_artifact_urls, \ _craft_task_data, _fetch_task_ids_per_achitecture, _fetch_artifacts @@ -178,7 +178,7 @@ def utcnow(cls): 'name': 'Google Play Publisher', 'description': 'Publishes Aurora builds to Google Play Store', 'owner': 'r@m.c', - 'source': 'https://github.com/JohanLorenzo/nightlies-watcher', + 'source': 'https://github.com/JohanLorenzo/fennec-aurora-task-creator', }, 'payload': { 'apks': { @@ -200,7 +200,7 @@ def utcnow(cls): def test_fetch_task_ids_per_achitecture(monkeypatch): - from nightlies_watcher import tc_index + from fennec_aurora_task_creator import tc_index monkeypatch.setattr( tc_index, 'get_task_id', lambda _, __, architecture: 'QbosbKzTTB2E08IHTAtTfw' if architecture == 'android-x86' else 'VRzn3vi6RvSNaKTaT5u83A' @@ -218,7 +218,7 @@ def test_fetch_task_ids_per_achitecture(monkeypatch): def test_fetch_artifacts(monkeypatch): - from nightlies_watcher import tc_queue + from fennec_aurora_task_creator import tc_queue monkeypatch.setattr(tc_queue, 'fetch_artifacts_list', lambda _: ['dummy_data']) @@ -299,7 +299,7 @@ def assert_create_task_is_called_with_right_arguments(payload, _): 'name': 'Google Play Publisher', 'description': 'Publishes Aurora builds to Google Play Store', 'owner': 'r@m.c', - 'source': 'https://github.com/JohanLorenzo/nightlies-watcher', + 'source': 'https://github.com/JohanLorenzo/fennec-aurora-task-creator', }, 'payload': { 'apks': { @@ -319,10 +319,10 @@ def assert_create_task_is_called_with_right_arguments(payload, _): 'workerType': 'test-worker', } - from nightlies_watcher import treeherder + from fennec_aurora_task_creator import treeherder monkeypatch.setattr(treeherder, 'does_job_already_exist', lambda _, __, ___, tier: False) - from nightlies_watcher import tc_queue + from fennec_aurora_task_creator import tc_queue monkeypatch.setattr(tc_queue, 'create_task', assert_create_task_is_called_with_right_arguments) publish_if_possible(config, 'mozilla-aurora', '7bc185ff4e8b66536bf314f9cf8b03f7d7f0b9b8') @@ -338,7 +338,7 @@ def test_publish_raises_error_if_job_exists_in_treeherder(monkeypatch): } } - from nightlies_watcher import treeherder + from fennec_aurora_task_creator import treeherder monkeypatch.setattr(treeherder, 'does_job_already_exist', lambda _, __, ___, tier: True) with pytest.raises(TreeherderJobAlreadyExistError): diff --git a/nightlies_watcher/test/test_tc_index.py b/fennec_aurora_task_creator/test/test_tc_index.py similarity index 89% rename from nightlies_watcher/test/test_tc_index.py rename to fennec_aurora_task_creator/test/test_tc_index.py index bba3cd0..1260fb4 100644 --- a/nightlies_watcher/test/test_tc_index.py +++ b/fennec_aurora_task_creator/test/test_tc_index.py @@ -1,8 +1,8 @@ import pytest import taskcluster -from nightlies_watcher.exceptions import TaskNotFoundError -from nightlies_watcher.tc_index import get_task_id, _craft_full_namespace, _index +from fennec_aurora_task_creator.exceptions import TaskNotFoundError +from fennec_aurora_task_creator.tc_index import get_task_id, _craft_full_namespace, _index def test_craft_full_namespace(): diff --git a/nightlies_watcher/test/test_tc_queue.py b/fennec_aurora_task_creator/test/test_tc_queue.py similarity index 91% rename from nightlies_watcher/test/test_tc_queue.py rename to fennec_aurora_task_creator/test/test_tc_queue.py index 93b54cd..de90124 100644 --- a/nightlies_watcher/test/test_tc_queue.py +++ b/fennec_aurora_task_creator/test/test_tc_queue.py @@ -1,7 +1,8 @@ import pytest -from nightlies_watcher.tc_queue import fetch_task_definition, pluck_architecture, pluck_repository, pluck_revision, _queue, fetch_artifacts_list, create_task -from nightlies_watcher.exceptions import UnmatchedRouteError +from fennec_aurora_task_creator.tc_queue import fetch_task_definition, pluck_architecture, pluck_repository, pluck_revision, \ + _queue, fetch_artifacts_list, create_task +from fennec_aurora_task_creator.exceptions import UnmatchedRouteError TASK_DEFINITION = { 'routes': [ diff --git a/nightlies_watcher/test/test_treeherder.py b/fennec_aurora_task_creator/test/test_treeherder.py similarity index 90% rename from nightlies_watcher/test/test_treeherder.py rename to fennec_aurora_task_creator/test/test_treeherder.py index 2f2d555..4bf94b3 100644 --- a/nightlies_watcher/test/test_treeherder.py +++ b/fennec_aurora_task_creator/test/test_treeherder.py @@ -1,7 +1,7 @@ import pytest -from nightlies_watcher.exceptions import NoTreeherderResultSetError, TooManyTreeherderResultSetsError -from nightlies_watcher.treeherder import _is_job_in_list, _client, does_job_already_exist, get_routes +from fennec_aurora_task_creator.exceptions import NoTreeherderResultSetError, TooManyTreeherderResultSetsError +from fennec_aurora_task_creator.treeherder import _is_job_in_list, _client, does_job_already_exist, get_routes def test_is_job_in_list(): diff --git a/nightlies_watcher/test/test_worker.py b/fennec_aurora_task_creator/test/test_worker.py similarity index 96% rename from nightlies_watcher/test/test_worker.py rename to fennec_aurora_task_creator/test/test_worker.py index f67899f..7634de2 100644 --- a/nightlies_watcher/test/test_worker.py +++ b/fennec_aurora_task_creator/test/test_worker.py @@ -8,9 +8,9 @@ from unittest.mock import Mock -from nightlies_watcher import tc_queue, publish -from nightlies_watcher.exceptions import TaskNotFoundError, TreeherderJobAlreadyExistError -from nightlies_watcher.worker import _dispatch, start_message_queue_worker +from fennec_aurora_task_creator import tc_queue, publish +from fennec_aurora_task_creator.exceptions import TaskNotFoundError, TreeherderJobAlreadyExistError +from fennec_aurora_task_creator.worker import _dispatch, start_message_queue_worker @pytest.mark.asyncio diff --git a/nightlies_watcher/treeherder.py b/fennec_aurora_task_creator/treeherder.py similarity index 91% rename from nightlies_watcher/treeherder.py rename to fennec_aurora_task_creator/treeherder.py index a3d8325..c4e355b 100644 --- a/nightlies_watcher/treeherder.py +++ b/fennec_aurora_task_creator/treeherder.py @@ -2,7 +2,7 @@ from thclient import TreeherderClient -from nightlies_watcher.exceptions import NoTreeherderResultSetError, TooManyTreeherderResultSetsError +from fennec_aurora_task_creator.exceptions import NoTreeherderResultSetError, TooManyTreeherderResultSetsError logger = logging.getLogger(__name__) diff --git a/nightlies_watcher/worker.py b/fennec_aurora_task_creator/worker.py similarity index 92% rename from nightlies_watcher/worker.py rename to fennec_aurora_task_creator/worker.py index ab5c4f6..f5bea82 100644 --- a/nightlies_watcher/worker.py +++ b/fennec_aurora_task_creator/worker.py @@ -2,9 +2,9 @@ import logging import json -from nightlies_watcher import tc_queue, publish -from nightlies_watcher.exceptions import TaskNotFoundError, TreeherderJobAlreadyExistError -from nightlies_watcher.config import get_config +from fennec_aurora_task_creator import tc_queue, publish +from fennec_aurora_task_creator.exceptions import TaskNotFoundError, TreeherderJobAlreadyExistError +from fennec_aurora_task_creator.config import get_config log = logging.getLogger(__name__) diff --git a/setup.py b/setup.py index c2ce3f0..8f8e23b 100644 --- a/setup.py +++ b/setup.py @@ -8,19 +8,19 @@ source_url = f.read().rstrip() setup( - name="nightlies-watcher", + name="fennec-aurora-task-creator", version=version, description="Watches Aurora nightlies and creates tasks to deploy them to Google Play Store", author="Mozilla Release Engineering", author_email="release+python@mozilla.com", url=source_url, packages=find_packages(), - package_data={"nightlies-watcher": ["data/*"]}, + package_data={"fennec-aurora-task-creator": ["data/*"]}, include_package_data=True, zip_safe=False, entry_points={ "console_scripts": [ - "nightlies-watcher = nightlies_watcher.main:main", + "fennec-aurora-task-creator = fennec_aurora_task_creator.main:main", ], }, license="MPL2", diff --git a/source_url.txt b/source_url.txt index 6f2d600..a00c9cc 100644 --- a/source_url.txt +++ b/source_url.txt @@ -1 +1 @@ -https://github.com/JohanLorenzo/nightlies-watcher +https://github.com/JohanLorenzo/fennec-aurora-task-creator diff --git a/tox.ini b/tox.ini index 7ae9a06..e8a9f17 100644 --- a/tox.ini +++ b/tox.ini @@ -21,7 +21,7 @@ deps = asynctest commands = - py.test --cov nightlies_watcher --cov-report term-missing + py.test --cov fennec_aurora_task_creator --cov-report term-missing coverage html flake8