From 890d8463b9c87c75cf84291076bb391920527ef2 Mon Sep 17 00:00:00 2001 From: Arthur Juliani Date: Thu, 9 Jul 2020 13:40:46 -0700 Subject: [PATCH 1/5] Update versions for release 4 --- README.md | 6 ++--- com.unity.ml-agents/CHANGELOG.md | 4 +-- .../Documentation~/com.unity.ml-agents.md | 2 +- com.unity.ml-agents/Runtime/Academy.cs | 6 ++--- com.unity.ml-agents/Runtime/Agent.cs | 26 +++++++++---------- .../Demonstrations/DemonstrationRecorder.cs | 2 +- .../Runtime/DiscreteActionMasker.cs | 2 +- com.unity.ml-agents/package.json | 4 +-- docs/Installation-Anaconda-Windows.md | 4 +-- docs/Installation.md | 6 ++--- docs/Training-on-Amazon-Web-Service.md | 2 +- gym-unity/gym_unity/__init__.py | 4 +-- ml-agents-envs/mlagents_envs/__init__.py | 4 +-- ml-agents/mlagents/trainers/__init__.py | 4 +-- utils/make_readme_table.py | 1 + utils/validate_release_links.py | 7 ++--- 16 files changed, 43 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index da886a32df..80809e5459 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # Unity ML-Agents Toolkit -[![docs badge](https://img.shields.io/badge/docs-reference-blue.svg)](https://github.com/Unity-Technologies/ml-agents/tree/release_3_docs/docs/) +[![docs badge](https://img.shields.io/badge/docs-reference-blue.svg)](https://github.com/Unity-Technologies/ml-agents/tree/release_4_docs/docs/) [![license badge](https://img.shields.io/badge/license-Apache--2.0-green.svg)](LICENSE) @@ -49,7 +49,7 @@ descriptions of all these features. ## Releases & Documentation **Our latest, stable release is `Release 3`. Click -[here](https://github.com/Unity-Technologies/ml-agents/tree/release_3_docs/docs/Readme.md) +[here](https://github.com/Unity-Technologies/ml-agents/tree/release_4_docs/docs/Readme.md) to get started with the latest release of ML-Agents.** The table below lists all our releases, including our `master` branch which is @@ -67,7 +67,7 @@ under active development and may be unstable. A few helpful guidelines: | **Version** | **Release Date** | **Source** | **Documentation** | **Download** | |:-------:|:------:|:-------------:|:-------:|:------------:| | **master (unstable)** | -- | [source](https://github.com/Unity-Technologies/ml-agents/tree/master) | [docs](https://github.com/Unity-Technologies/ml-agents/tree/master/docs/Readme.md) | [download](https://github.com/Unity-Technologies/ml-agents/archive/master.zip) | -| **Release 3** | **June 10, 2020** | **[source](https://github.com/Unity-Technologies/ml-agents/tree/release_3)** | **[docs](https://github.com/Unity-Technologies/ml-agents/tree/release_3_docs/docs/Readme.md)** | **[download](https://github.com/Unity-Technologies/ml-agents/archive/release_3.zip)** | +| **Release 3** | **June 10, 2020** | **[source](https://github.com/Unity-Technologies/ml-agents/tree/release_4)** | **[docs](https://github.com/Unity-Technologies/ml-agents/tree/release_4_docs/docs/Readme.md)** | **[download](https://github.com/Unity-Technologies/ml-agents/archive/release_4.zip)** | | **Release 2** | May 20, 2020 | [source](https://github.com/Unity-Technologies/ml-agents/tree/release_2) | [docs](https://github.com/Unity-Technologies/ml-agents/tree/release_2_docs/docs/Readme.md) | [download](https://github.com/Unity-Technologies/ml-agents/archive/release_2.zip) | | **Release 1** | April 30, 2020 | [source](https://github.com/Unity-Technologies/ml-agents/tree/release_1) | [docs](https://github.com/Unity-Technologies/ml-agents/tree/release_1_docs/docs/Readme.md) | [download](https://github.com/Unity-Technologies/ml-agents/archive/release_1.zip) | | **0.15.1** | March 30, 2020 | [source](https://github.com/Unity-Technologies/ml-agents/tree/0.15.1) | [docs](https://github.com/Unity-Technologies/ml-agents/tree/0.15.1/docs/Readme.md) | [download](https://github.com/Unity-Technologies/ml-agents/archive/0.15.1.zip) | diff --git a/com.unity.ml-agents/CHANGELOG.md b/com.unity.ml-agents/CHANGELOG.md index 3291d0b1b3..de77fa18d1 100755 --- a/com.unity.ml-agents/CHANGELOG.md +++ b/com.unity.ml-agents/CHANGELOG.md @@ -54,7 +54,7 @@ empty string). (#4155) - `max_step` in the `TerminalStep` and `TerminalSteps` objects was renamed `interrupted`. - `beta` and `epsilon` in `PPO` are no longer decayed by default but follow the same schedule as learning rate. (#3940) - `get_behavior_names()` and `get_behavior_spec()` on UnityEnvironment were replaced by the `behavior_specs` property. (#3946) -- The first version of the Unity Environment Registry (Experimental) has been released. More information [here](https://github.com/Unity-Technologies/ml-agents/blob/release_3_docs/docs/Unity-Environment-Registry.md)(#3967) +- The first version of the Unity Environment Registry (Experimental) has been released. More information [here](https://github.com/Unity-Technologies/ml-agents/blob/release_4_docs/docs/Unity-Environment-Registry.md)(#3967) - `use_visual` and `allow_multiple_visual_obs` in the `UnityToGymWrapper` constructor were replaced by `allow_multiple_obs` which allows one or more visual observations and vector observations to be used simultaneously. (#3981) Thank you @shakenes ! @@ -62,7 +62,7 @@ vector observations to be used simultaneously. (#3981) Thank you @shakenes ! into the main training configuration file. Note that this means training configuration files are now environment-specific. (#3791) - The format for trainer configuration has changed, and the "default" behavior has been deprecated. - See the [Migration Guide](https://github.com/Unity-Technologies/ml-agents/blob/release_3_docs/docs/Migrating.md) for more details. (#3936) + See the [Migration Guide](https://github.com/Unity-Technologies/ml-agents/blob/release_4_docs/docs/Migrating.md) for more details. (#3936) - Training artifacts (trained models, summaries) are now found in the `results/` directory. (#3829) - When using Curriculum, the current lesson will resume if training is quit and resumed. As such, diff --git a/com.unity.ml-agents/Documentation~/com.unity.ml-agents.md b/com.unity.ml-agents/Documentation~/com.unity.ml-agents.md index ba96dbd6fc..227a1eb2e7 100755 --- a/com.unity.ml-agents/Documentation~/com.unity.ml-agents.md +++ b/com.unity.ml-agents/Documentation~/com.unity.ml-agents.md @@ -114,7 +114,7 @@ a number of ways to [connect with us] including our [ML-Agents Forum]. [unity ML-Agents Toolkit]: https://github.com/Unity-Technologies/ml-agents [unity inference engine]: https://docs.unity3d.com/Packages/com.unity.barracuda@latest/index.html [package manager documentation]: https://docs.unity3d.com/Manual/upm-ui-install.html -[installation instructions]: https://github.com/Unity-Technologies/ml-agents/blob/release_3_docs/docs/Installation.md +[installation instructions]: https://github.com/Unity-Technologies/ml-agents/blob/release_4_docs/docs/Installation.md [github repository]: https://github.com/Unity-Technologies/ml-agents [python package]: https://github.com/Unity-Technologies/ml-agents [execution order of event functions]: https://docs.unity3d.com/Manual/ExecutionOrder.html diff --git a/com.unity.ml-agents/Runtime/Academy.cs b/com.unity.ml-agents/Runtime/Academy.cs index 34edd43d5c..c2bf998807 100644 --- a/com.unity.ml-agents/Runtime/Academy.cs +++ b/com.unity.ml-agents/Runtime/Academy.cs @@ -19,7 +19,7 @@ * API. For more information on each of these entities, in addition to how to * set-up a learning environment and train the behavior of characters in a * Unity scene, please browse our documentation pages on GitHub: - * https://github.com/Unity-Technologies/ml-agents/tree/release_3_docs/docs/ + * https://github.com/Unity-Technologies/ml-agents/tree/release_4_docs/docs/ */ namespace Unity.MLAgents @@ -51,7 +51,7 @@ void FixedUpdate() /// fall back to inference or heuristic decisions. (You can also set agents to always use /// inference or heuristics.) /// - [HelpURL("https://github.com/Unity-Technologies/ml-agents/tree/release_3_docs/" + + [HelpURL("https://github.com/Unity-Technologies/ml-agents/tree/release_4_docs/" + "docs/Learning-Environment-Design.md")] public class Academy : IDisposable { @@ -68,7 +68,7 @@ public class Academy : IDisposable /// Unity package version of com.unity.ml-agents. /// This must match the version string in package.json and is checked in a unit test. /// - internal const string k_PackageVersion = "1.1.0-preview"; + internal const string k_PackageVersion = "1.2.0-preview"; const int k_EditorTrainingPort = 5004; diff --git a/com.unity.ml-agents/Runtime/Agent.cs b/com.unity.ml-agents/Runtime/Agent.cs index 5861be14ca..a12f1761d8 100644 --- a/com.unity.ml-agents/Runtime/Agent.cs +++ b/com.unity.ml-agents/Runtime/Agent.cs @@ -145,13 +145,13 @@ internal struct AgentAction /// [OnDisable()]: https://docs.unity3d.com/ScriptReference/MonoBehaviour.OnDisable.html] /// [OnBeforeSerialize()]: https://docs.unity3d.com/ScriptReference/MonoBehaviour.OnBeforeSerialize.html /// [OnAfterSerialize()]: https://docs.unity3d.com/ScriptReference/MonoBehaviour.OnAfterSerialize.html - /// [Agents]: https://github.com/Unity-Technologies/ml-agents/blob/release_3_docs/docs/Learning-Environment-Design-Agents.md - /// [Reinforcement Learning in Unity]: https://github.com/Unity-Technologies/ml-agents/blob/release_3_docs/docs/Learning-Environment-Design.md + /// [Agents]: https://github.com/Unity-Technologies/ml-agents/blob/release_4_docs/docs/Learning-Environment-Design-Agents.md + /// [Reinforcement Learning in Unity]: https://github.com/Unity-Technologies/ml-agents/blob/release_4_docs/docs/Learning-Environment-Design.md /// [Unity ML-Agents Toolkit]: https://github.com/Unity-Technologies/ml-agents - /// [Unity ML-Agents Toolkit manual]: https://github.com/Unity-Technologies/ml-agents/blob/release_3_docs/docs/Readme.md + /// [Unity ML-Agents Toolkit manual]: https://github.com/Unity-Technologies/ml-agents/blob/release_4_docs/docs/Readme.md /// /// - [HelpURL("https://github.com/Unity-Technologies/ml-agents/blob/release_3_docs/" + + [HelpURL("https://github.com/Unity-Technologies/ml-agents/blob/release_4_docs/" + "docs/Learning-Environment-Design-Agents.md")] [Serializable] [RequireComponent(typeof(BehaviorParameters))] @@ -603,8 +603,8 @@ public int CompletedEpisodes /// for information about mixing reward signals from curiosity and Generative Adversarial /// Imitation Learning (GAIL) with rewards supplied through this method. /// - /// [Agents - Rewards]: https://github.com/Unity-Technologies/ml-agents/blob/release_3_docs/docs/Learning-Environment-Design-Agents.md#rewards - /// [Reward Signals]: https://github.com/Unity-Technologies/ml-agents/blob/release_3_docs/docs/ML-Agents-Overview.md#a-quick-note-on-reward-signals + /// [Agents - Rewards]: https://github.com/Unity-Technologies/ml-agents/blob/release_4_docs/docs/Learning-Environment-Design-Agents.md#rewards + /// [Reward Signals]: https://github.com/Unity-Technologies/ml-agents/blob/release_4_docs/docs/ML-Agents-Overview.md#a-quick-note-on-reward-signals /// /// The new value of the reward. public void SetReward(float reward) @@ -633,8 +633,8 @@ public void SetReward(float reward) /// for information about mixing reward signals from curiosity and Generative Adversarial /// Imitation Learning (GAIL) with rewards supplied through this method. /// - /// [Agents - Rewards]: https://github.com/Unity-Technologies/ml-agents/blob/release_3_docs/docs/Learning-Environment-Design-Agents.md#rewards - /// [Reward Signals]: https://github.com/Unity-Technologies/ml-agents/blob/release_3_docs/docs/ML-Agents-Overview.md#a-quick-note-on-reward-signals + /// [Agents - Rewards]: https://github.com/Unity-Technologies/ml-agents/blob/release_4_docs/docs/Learning-Environment-Design-Agents.md#rewards + /// [Reward Signals]: https://github.com/Unity-Technologies/ml-agents/blob/release_4_docs/docs/ML-Agents-Overview.md#a-quick-note-on-reward-signals /// /// Incremental reward value. public void AddReward(float increment) @@ -790,8 +790,8 @@ public virtual void Initialize() {} /// implementing a simple heuristic function can aid in debugging agent actions and interactions /// with its environment. /// - /// [Demonstration Recorder]: https://github.com/Unity-Technologies/ml-agents/blob/release_3_docs/docs/Learning-Environment-Design-Agents.md#recording-demonstrations - /// [Actions]: https://github.com/Unity-Technologies/ml-agents/blob/release_3_docs/docs/Learning-Environment-Design-Agents.md#actions + /// [Demonstration Recorder]: https://github.com/Unity-Technologies/ml-agents/blob/release_4_docs/docs/Learning-Environment-Design-Agents.md#recording-demonstrations + /// [Actions]: https://github.com/Unity-Technologies/ml-agents/blob/release_4_docs/docs/Learning-Environment-Design-Agents.md#actions /// [GameObject]: https://docs.unity3d.com/Manual/GameObjects.html /// /// @@ -996,7 +996,7 @@ void ResetSensors() /// For more information about observations, see [Observations and Sensors]. /// /// [GameObject]: https://docs.unity3d.com/Manual/GameObjects.html - /// [Observations and Sensors]: https://github.com/Unity-Technologies/ml-agents/blob/release_3_docs/docs/Learning-Environment-Design-Agents.md#observations-and-sensors + /// [Observations and Sensors]: https://github.com/Unity-Technologies/ml-agents/blob/release_4_docs/docs/Learning-Environment-Design-Agents.md#observations-and-sensors /// public virtual void CollectObservations(VectorSensor sensor) { @@ -1027,7 +1027,7 @@ public ReadOnlyCollection GetObservations() /// /// See [Agents - Actions] for more information on masking actions. /// - /// [Agents - Actions]: https://github.com/Unity-Technologies/ml-agents/blob/release_3_docs/docs/Learning-Environment-Design-Agents.md#actions + /// [Agents - Actions]: https://github.com/Unity-Technologies/ml-agents/blob/release_4_docs/docs/Learning-Environment-Design-Agents.md#actions /// /// public virtual void CollectDiscreteActionMasks(DiscreteActionMasker actionMasker) @@ -1097,7 +1097,7 @@ public virtual void CollectDiscreteActionMasks(DiscreteActionMasker actionMasker /// /// For more information about implementing agent actions see [Agents - Actions]. /// - /// [Agents - Actions]: https://github.com/Unity-Technologies/ml-agents/blob/release_3_docs/docs/Learning-Environment-Design-Agents.md#actions + /// [Agents - Actions]: https://github.com/Unity-Technologies/ml-agents/blob/release_4_docs/docs/Learning-Environment-Design-Agents.md#actions /// /// /// An array containing the action vector. The length of the array is specified diff --git a/com.unity.ml-agents/Runtime/Demonstrations/DemonstrationRecorder.cs b/com.unity.ml-agents/Runtime/Demonstrations/DemonstrationRecorder.cs index efcaff49a3..5017149e1c 100644 --- a/com.unity.ml-agents/Runtime/Demonstrations/DemonstrationRecorder.cs +++ b/com.unity.ml-agents/Runtime/Demonstrations/DemonstrationRecorder.cs @@ -19,7 +19,7 @@ namespace Unity.MLAgents.Demonstrations /// See [Imitation Learning - Recording Demonstrations] for more information. /// /// [GameObject]: https://docs.unity3d.com/Manual/GameObjects.html - /// [Imitation Learning - Recording Demonstrations]: https://github.com/Unity-Technologies/ml-agents/blob/release_3_docs/docs//Learning-Environment-Design-Agents.md#recording-demonstrations + /// [Imitation Learning - Recording Demonstrations]: https://github.com/Unity-Technologies/ml-agents/blob/release_4_docs/docs//Learning-Environment-Design-Agents.md#recording-demonstrations /// [RequireComponent(typeof(Agent))] [AddComponentMenu("ML Agents/Demonstration Recorder", (int)MenuGroup.Default)] diff --git a/com.unity.ml-agents/Runtime/DiscreteActionMasker.cs b/com.unity.ml-agents/Runtime/DiscreteActionMasker.cs index 531efd3b02..e8c8538640 100644 --- a/com.unity.ml-agents/Runtime/DiscreteActionMasker.cs +++ b/com.unity.ml-agents/Runtime/DiscreteActionMasker.cs @@ -40,7 +40,7 @@ internal DiscreteActionMasker(BrainParameters brainParameters) /// /// See [Agents - Actions] for more information on masking actions. /// - /// [Agents - Actions]: https://github.com/Unity-Technologies/ml-agents/blob/release_3_docs/docs/Learning-Environment-Design-Agents.md#actions + /// [Agents - Actions]: https://github.com/Unity-Technologies/ml-agents/blob/release_4_docs/docs/Learning-Environment-Design-Agents.md#actions /// /// The branch for which the actions will be masked. /// The indices of the masked actions. diff --git a/com.unity.ml-agents/package.json b/com.unity.ml-agents/package.json index 3a0cd7940a..6ae91c6335 100755 --- a/com.unity.ml-agents/package.json +++ b/com.unity.ml-agents/package.json @@ -1,10 +1,10 @@ { "name": "com.unity.ml-agents", "displayName": "ML Agents", - "version": "1.1.0-preview", + "version": "1.2.0-preview", "unity": "2018.4", "description": "Use state-of-the-art machine learning to create intelligent character behaviors in any Unity environment (games, robotics, film, etc.).", "dependencies": { "com.unity.barracuda": "1.0.1" } -} +} \ No newline at end of file diff --git a/docs/Installation-Anaconda-Windows.md b/docs/Installation-Anaconda-Windows.md index 96f25dfee4..c4c824c797 100644 --- a/docs/Installation-Anaconda-Windows.md +++ b/docs/Installation-Anaconda-Windows.md @@ -123,10 +123,10 @@ commands in an Anaconda Prompt _(if you open a new prompt, be sure to activate the ml-agents Conda environment by typing `activate ml-agents`)_: ```sh -git clone --branch release_3 https://github.com/Unity-Technologies/ml-agents.git +git clone --branch release_4 https://github.com/Unity-Technologies/ml-agents.git ``` -The `--branch release_3` option will switch to the tag of the latest stable +The `--branch release_4` option will switch to the tag of the latest stable release. Omitting that will get the `master` branch which is potentially unstable. diff --git a/docs/Installation.md b/docs/Installation.md index c48f5470c8..a3c1f41c38 100644 --- a/docs/Installation.md +++ b/docs/Installation.md @@ -58,10 +58,10 @@ example environments and training configurations to experiment with them (some of our tutorials / guides assume you have access to our example environments). ```sh -git clone --branch release_3 https://github.com/Unity-Technologies/ml-agents.git +git clone --branch release_4 https://github.com/Unity-Technologies/ml-agents.git ``` -The `--branch release_3` option will switch to the tag of the latest stable +The `--branch release_4` option will switch to the tag of the latest stable release. Omitting that will get the `master` branch which is potentially unstable. @@ -69,7 +69,7 @@ unstable. You will need to clone the repository if you plan to modify or extend the ML-Agents Toolkit for your purposes. If you plan to contribute those changes -back, make sure to clone the `master` branch (by omitting `--branch release_3` +back, make sure to clone the `master` branch (by omitting `--branch release_4` from the command above). See our [Contributions Guidelines](../com.unity.ml-agents/CONTRIBUTING.md) for more information on contributing to the ML-Agents Toolkit. diff --git a/docs/Training-on-Amazon-Web-Service.md b/docs/Training-on-Amazon-Web-Service.md index b260daff87..b41e0006f7 100644 --- a/docs/Training-on-Amazon-Web-Service.md +++ b/docs/Training-on-Amazon-Web-Service.md @@ -69,7 +69,7 @@ After launching your EC2 instance using the ami and ssh into it: 2. Clone the ML-Agents repo and install the required Python packages ```sh - git clone --branch release_3 https://github.com/Unity-Technologies/ml-agents.git + git clone --branch release_4 https://github.com/Unity-Technologies/ml-agents.git cd ml-agents/ml-agents/ pip3 install -e . ``` diff --git a/gym-unity/gym_unity/__init__.py b/gym-unity/gym_unity/__init__.py index 6084367386..30dbbfbba4 100644 --- a/gym-unity/gym_unity/__init__.py +++ b/gym-unity/gym_unity/__init__.py @@ -1,5 +1,5 @@ # Version of the library that will be used to upload to pypi -__version__ = "0.18.0.dev0" +__version__ = "0.19.0" # Git tag that will be checked to determine whether to trigger upload to pypi -__release_tag__ = None +__release_tag__ = "release_4" diff --git a/ml-agents-envs/mlagents_envs/__init__.py b/ml-agents-envs/mlagents_envs/__init__.py index 6084367386..30dbbfbba4 100644 --- a/ml-agents-envs/mlagents_envs/__init__.py +++ b/ml-agents-envs/mlagents_envs/__init__.py @@ -1,5 +1,5 @@ # Version of the library that will be used to upload to pypi -__version__ = "0.18.0.dev0" +__version__ = "0.19.0" # Git tag that will be checked to determine whether to trigger upload to pypi -__release_tag__ = None +__release_tag__ = "release_4" diff --git a/ml-agents/mlagents/trainers/__init__.py b/ml-agents/mlagents/trainers/__init__.py index 6084367386..30dbbfbba4 100644 --- a/ml-agents/mlagents/trainers/__init__.py +++ b/ml-agents/mlagents/trainers/__init__.py @@ -1,5 +1,5 @@ # Version of the library that will be used to upload to pypi -__version__ = "0.18.0.dev0" +__version__ = "0.19.0" # Git tag that will be checked to determine whether to trigger upload to pypi -__release_tag__ = None +__release_tag__ = "release_4" diff --git a/utils/make_readme_table.py b/utils/make_readme_table.py index c418bfba1b..757ac6a118 100644 --- a/utils/make_readme_table.py +++ b/utils/make_readme_table.py @@ -69,6 +69,7 @@ def display_name(self) -> str: ReleaseInfo("release_1", "1.0.0", "0.16.0", "April 30, 2020"), ReleaseInfo("release_2", "1.0.2", "0.16.1", "May 20, 2020"), ReleaseInfo("release_3", "1.1.0", "0.17.0", "June 10, 2020"), + ReleaseInfo("release_4", "1.2.0", "0.18.0", "July 15, 2020"), ] MAX_DAYS = 150 # do not print releases older than this many days diff --git a/utils/validate_release_links.py b/utils/validate_release_links.py index 23edfb0f38..4760c05db9 100755 --- a/utils/validate_release_links.py +++ b/utils/validate_release_links.py @@ -19,19 +19,20 @@ "com.unity.ml-agents/CHANGELOG.md": None, "utils/make_readme_table.py": None, "utils/validate_doc_versions.py": None, + "utils/validate_release_links.py": None, } def test_pattern(): # Just some sanity check that the regex works as expected. assert RELEASE_PATTERN.search( - "https://github.com/Unity-Technologies/ml-agents/blob/release_3_docs/Food.md" + "https://github.com/Unity-Technologies/ml-agents/blob/release_4_docs/Food.md" ) assert RELEASE_PATTERN.search( - "https://github.com/Unity-Technologies/ml-agents/blob/release_3/Foo.md" + "https://github.com/Unity-Technologies/ml-agents/blob/release_4/Foo.md" ) assert RELEASE_PATTERN.search( - "git clone --branch release_3 https://github.com/Unity-Technologies/ml-agents.git" + "git clone --branch release_4 https://github.com/Unity-Technologies/ml-agents.git" ) assert RELEASE_PATTERN.search( "https://github.com/Unity-Technologies/ml-agents/blob/release_123_docs/Foo.md" From adbc749437119f0c6a86fdf14112d95a2d6be87b Mon Sep 17 00:00:00 2001 From: Arthur Juliani Date: Thu, 9 Jul 2020 13:41:32 -0700 Subject: [PATCH 2/5] Link validation file should ignore itself --- utils/validate_release_links.py | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/validate_release_links.py b/utils/validate_release_links.py index 4760c05db9..cf24bc4d14 100755 --- a/utils/validate_release_links.py +++ b/utils/validate_release_links.py @@ -18,7 +18,6 @@ "docs/Versioning.md": None, "com.unity.ml-agents/CHANGELOG.md": None, "utils/make_readme_table.py": None, - "utils/validate_doc_versions.py": None, "utils/validate_release_links.py": None, } From bb81687ebf6ed92cbd9c372416897e9490bac8db Mon Sep 17 00:00:00 2001 From: Arthur Juliani Date: Thu, 9 Jul 2020 13:45:08 -0700 Subject: [PATCH 3/5] Remove 'unreleased' section from changelog --- com.unity.ml-agents/CHANGELOG.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/com.unity.ml-agents/CHANGELOG.md b/com.unity.ml-agents/CHANGELOG.md index de77fa18d1..d3fd407c13 100755 --- a/com.unity.ml-agents/CHANGELOG.md +++ b/com.unity.ml-agents/CHANGELOG.md @@ -6,14 +6,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [Unreleased] - -### Major Changes - -### Minor Changes - -### Bug Fixes - ## [1.2.0-preview] - 2020-07-15 ### Major Changes From 22aa24927f822235ce81d4a03ac6c6cde294e7b2 Mon Sep 17 00:00:00 2001 From: Arthur Juliani Date: Thu, 9 Jul 2020 15:10:08 -0700 Subject: [PATCH 4/5] Change to 0.18.0 for python versions --- gym-unity/gym_unity/__init__.py | 2 +- ml-agents-envs/mlagents_envs/__init__.py | 2 +- ml-agents/mlagents/trainers/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gym-unity/gym_unity/__init__.py b/gym-unity/gym_unity/__init__.py index 30dbbfbba4..742fc90b4d 100644 --- a/gym-unity/gym_unity/__init__.py +++ b/gym-unity/gym_unity/__init__.py @@ -1,5 +1,5 @@ # Version of the library that will be used to upload to pypi -__version__ = "0.19.0" +__version__ = "0.18.0" # Git tag that will be checked to determine whether to trigger upload to pypi __release_tag__ = "release_4" diff --git a/ml-agents-envs/mlagents_envs/__init__.py b/ml-agents-envs/mlagents_envs/__init__.py index 30dbbfbba4..742fc90b4d 100644 --- a/ml-agents-envs/mlagents_envs/__init__.py +++ b/ml-agents-envs/mlagents_envs/__init__.py @@ -1,5 +1,5 @@ # Version of the library that will be used to upload to pypi -__version__ = "0.19.0" +__version__ = "0.18.0" # Git tag that will be checked to determine whether to trigger upload to pypi __release_tag__ = "release_4" diff --git a/ml-agents/mlagents/trainers/__init__.py b/ml-agents/mlagents/trainers/__init__.py index 30dbbfbba4..742fc90b4d 100644 --- a/ml-agents/mlagents/trainers/__init__.py +++ b/ml-agents/mlagents/trainers/__init__.py @@ -1,5 +1,5 @@ # Version of the library that will be used to upload to pypi -__version__ = "0.19.0" +__version__ = "0.18.0" # Git tag that will be checked to determine whether to trigger upload to pypi __release_tag__ = "release_4" From b14b9722d5ef365e7ac75d3a239f1e3102cf5449 Mon Sep 17 00:00:00 2001 From: Chris Elion Date: Thu, 9 Jul 2020 15:13:33 -0700 Subject: [PATCH 5/5] also update extensions package version --- com.unity.ml-agents.extensions/package.json | 16 +++++++-------- com.unity.ml-agents/package.json | 2 +- utils/validate_versions.py | 22 +++++++++++++++++---- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/com.unity.ml-agents.extensions/package.json b/com.unity.ml-agents.extensions/package.json index ea3c4e154c..3ce85c652a 100644 --- a/com.unity.ml-agents.extensions/package.json +++ b/com.unity.ml-agents.extensions/package.json @@ -1,10 +1,10 @@ { - "name": "com.unity.ml-agents.extensions", - "displayName":"ML Agents Extensions", - "version": "0.0.1-preview", - "unity": "2018.4", - "description": "A source-only package for new features based on ML-Agents", - "dependencies": { - "com.unity.ml-agents": "1.1.0-preview" - } + "name": "com.unity.ml-agents.extensions", + "displayName": "ML Agents Extensions", + "version": "0.0.1-preview", + "unity": "2018.4", + "description": "A source-only package for new features based on ML-Agents", + "dependencies": { + "com.unity.ml-agents": "1.2.0-preview" + } } diff --git a/com.unity.ml-agents/package.json b/com.unity.ml-agents/package.json index 6ae91c6335..4fb78dab61 100755 --- a/com.unity.ml-agents/package.json +++ b/com.unity.ml-agents/package.json @@ -7,4 +7,4 @@ "dependencies": { "com.unity.barracuda": "1.0.1" } -} \ No newline at end of file +} diff --git a/utils/validate_versions.py b/utils/validate_versions.py index 700949a382..0bcf37c6e2 100755 --- a/utils/validate_versions.py +++ b/utils/validate_versions.py @@ -14,7 +14,9 @@ "gym-unity/gym_unity", ] -UNITY_PACKAGE_JSON_PATH = "com.unity.ml-agents/package.json" +MLAGENTS_PACKAGE_JSON_PATH = "com.unity.ml-agents/package.json" +MLAGENTS_EXTENSIONS_PACKAGE_JSON_PATH = "com.unity.ml-agents.extensions/package.json" + ACADEMY_PATH = "com.unity.ml-agents/Runtime/Academy.cs" PYTHON_VERSION_FILE_TEMPLATE = """# Version of the library that will be used to upload to pypi @@ -82,20 +84,32 @@ def set_version( if csharp_version is not None: package_version = csharp_version + "-preview" print( - f"Setting package version to {package_version} in {UNITY_PACKAGE_JSON_PATH}" + f"Setting package version to {package_version} in {MLAGENTS_PACKAGE_JSON_PATH}" + f" and {MLAGENTS_EXTENSIONS_PACKAGE_JSON_PATH}" ) set_package_version(package_version) + set_extension_package_version(package_version) print(f"Setting package version to {package_version} in {ACADEMY_PATH}") set_academy_version_string(package_version) def set_package_version(new_version: str) -> None: - with open(UNITY_PACKAGE_JSON_PATH, "r") as f: + with open(MLAGENTS_PACKAGE_JSON_PATH, "r") as f: package_json = json.load(f) if "version" in package_json: package_json["version"] = new_version - with open(UNITY_PACKAGE_JSON_PATH, "w") as f: + with open(MLAGENTS_PACKAGE_JSON_PATH, "w") as f: + json.dump(package_json, f, indent=2) + f.write("\n") + + +def set_extension_package_version(new_version: str) -> None: + with open(MLAGENTS_EXTENSIONS_PACKAGE_JSON_PATH, "r") as f: + package_json = json.load(f) + package_json["dependencies"]["com.unity.ml-agents"] = new_version + with open(MLAGENTS_EXTENSIONS_PACKAGE_JSON_PATH, "w") as f: json.dump(package_json, f, indent=2) + f.write("\n") def set_academy_version_string(new_version):