From 130e14c398f162c71de00967a1b95d292f15c281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Alexandre=20C=C3=B4t=C3=A9?= Date: Fri, 16 Sep 2022 22:47:21 -0400 Subject: [PATCH] Rename main branch and references to it. --- .azure/pipelines/coverage.yml | 2 +- .azure/pipelines/prerelease.yml | 2 +- .azure/pipelines/release.yml | 2 +- .azure/pipelines/security.yml | 2 +- .azure/pipelines/tests.yml | 2 +- README.md | 2 +- textworld/challenges/tw_cooking/README.md | 2 +- textworld/generator/game.py | 8 ++++---- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.azure/pipelines/coverage.yml b/.azure/pipelines/coverage.yml index 66ed20e8..ac1015b8 100644 --- a/.azure/pipelines/coverage.yml +++ b/.azure/pipelines/coverage.yml @@ -4,7 +4,7 @@ # https://docs.microsoft.com/azure/devops/pipelines/languages/python trigger: -- master +- main pool: vmImage: 'ubuntu-latest' diff --git a/.azure/pipelines/prerelease.yml b/.azure/pipelines/prerelease.yml index a14f2f0f..705ec5a7 100644 --- a/.azure/pipelines/prerelease.yml +++ b/.azure/pipelines/prerelease.yml @@ -1,4 +1,4 @@ -# Release code in the master branch to PyPi +# Release code in the main branch to PyPi stages: - stage: Prerelease_on_PyPi diff --git a/.azure/pipelines/release.yml b/.azure/pipelines/release.yml index 88fa9bb9..4f0e2731 100644 --- a/.azure/pipelines/release.yml +++ b/.azure/pipelines/release.yml @@ -1,4 +1,4 @@ -# Release code in the master branch to PyPi +# Release code in the main branch to PyPi jobs: - job: diff --git a/.azure/pipelines/security.yml b/.azure/pipelines/security.yml index 135baff5..6f9bf848 100644 --- a/.azure/pipelines/security.yml +++ b/.azure/pipelines/security.yml @@ -1,7 +1,7 @@ # Run the Component Governance Detection task trigger: -- master +- main pool: vmImage: 'ubuntu-latest' diff --git a/.azure/pipelines/tests.yml b/.azure/pipelines/tests.yml index d24e31c5..d3e2a9d9 100644 --- a/.azure/pipelines/tests.yml +++ b/.azure/pipelines/tests.yml @@ -1,5 +1,5 @@ trigger: -- master +- main stages: - stage: Test diff --git a/README.md b/README.md index ed16c24c..da103258 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # TextWorld -[![Build Status](https://dev.azure.com/maluuba/TextWorld/_apis/build/status/microsoft.TextWorld?branchName=master)](https://dev.azure.com/maluuba/TextWorld/_build/latest?definitionId=180&branchName=master) [![PyPI version](https://badge.fury.io/py/textworld.svg)](https://badge.fury.io/py/textworld) [![Documentation Status](https://readthedocs.org/projects/textworld/badge/?version=latest)](https://textworld.readthedocs.io/en/stable/?badge=stable) [![Join the chat at https://gitter.im/Microsoft/TextWorld](https://badges.gitter.im/Microsoft/TextWorld.svg)](https://gitter.im/Microsoft/TextWorld?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Build Status](https://dev.azure.com/maluuba/TextWorld/_apis/build/status/microsoft.TextWorld?branchName=main)](https://dev.azure.com/maluuba/TextWorld/_build/latest?definitionId=180&branchName=main) [![PyPI version](https://badge.fury.io/py/textworld.svg)](https://badge.fury.io/py/textworld) [![Documentation Status](https://readthedocs.org/projects/textworld/badge/?version=latest)](https://textworld.readthedocs.io/en/stable/?badge=stable) [![Join the chat at https://gitter.im/Microsoft/TextWorld](https://badges.gitter.im/Microsoft/TextWorld.svg)](https://gitter.im/Microsoft/TextWorld?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) A text-based game generator and extensible sandbox learning environment for training and testing reinforcement learning (RL) agents. Also check out [aka.ms/textworld](https://aka.ms/textworld/) for more info about TextWorld and its creators. Have questions or feedback about TextWorld? Send them to textworld@microsoft.com or use the Gitter channel listed above. diff --git a/textworld/challenges/tw_cooking/README.md b/textworld/challenges/tw_cooking/README.md index 10d87902..0ce6cc05 100644 --- a/textworld/challenges/tw_cooking/README.md +++ b/textworld/challenges/tw_cooking/README.md @@ -6,7 +6,7 @@ The development branch of TextWorld can be installed using - pip install https://github.com/Microsoft/TextWorld/archive/master.zip + pip install https://github.com/Microsoft/TextWorld/archive/main.zip ## Usage diff --git a/textworld/generator/game.py b/textworld/generator/game.py index fc105c07..0c598680 100644 --- a/textworld/generator/game.py +++ b/textworld/generator/game.py @@ -1037,12 +1037,12 @@ def winning_policy(self) -> Optional[List[Action]]: # Some quests don't have triggering policy. return None - master_quest_tree = ActionDependencyTree(kb=self.game.kb, - element_type=ActionDependencyTreeElement, - trees=trees) + main_quest_tree = ActionDependencyTree(kb=self.game.kb, + element_type=ActionDependencyTreeElement, + trees=trees) # Discard all "trigger" actions. - return tuple(a for a in master_quest_tree.flatten() if a.name != "trigger") + return tuple(a for a in main_quest_tree.flatten() if a.name != "trigger") def update(self, action: Action) -> None: """ Update the state of the game given the provided action.