From 9f91d27d6012a36d0f0090dd47fb3c4b7d6c94dc Mon Sep 17 00:00:00 2001 From: Omry Yadan Date: Mon, 17 Aug 2020 09:30:43 -0700 Subject: [PATCH] bump hydra version for plugins (#886) --- examples/advanced/hydra_app_example/setup.py | 2 +- hydra/extra/pytest_plugin.py | 5 +---- plugins/examples/example_configsource_plugin/setup.py | 2 +- plugins/examples/example_generic_plugin/setup.py | 2 +- plugins/examples/example_launcher_plugin/setup.py | 2 +- plugins/examples/example_searchpath_plugin/setup.py | 2 +- plugins/examples/example_sweeper_plugin/setup.py | 2 +- plugins/hydra_ax_sweeper/setup.py | 4 ++-- plugins/hydra_colorlog/setup.py | 4 ++-- plugins/hydra_joblib_launcher/setup.py | 4 ++-- plugins/hydra_nevergrad_sweeper/setup.py | 4 ++-- plugins/hydra_rq_launcher/setup.py | 4 ++-- plugins/hydra_submitit_launcher/setup.py | 4 ++-- tests/standalone_apps/initialization_test_app/setup.py | 2 +- 14 files changed, 20 insertions(+), 23 deletions(-) diff --git a/examples/advanced/hydra_app_example/setup.py b/examples/advanced/hydra_app_example/setup.py index 8247f31a8e5..e5b85dfbc95 100644 --- a/examples/advanced/hydra_app_example/setup.py +++ b/examples/advanced/hydra_app_example/setup.py @@ -13,5 +13,5 @@ author_email="your_email@example.com", url="http://hydra-app.example.com", include_package_data=True, - install_requires=["hydra-core~=1.0.0rc1"], + install_requires=["hydra-core~=1.0.0rc3"], ) diff --git a/hydra/extra/pytest_plugin.py b/hydra/extra/pytest_plugin.py index 3786b79bd34..316bb533df2 100644 --- a/hydra/extra/pytest_plugin.py +++ b/hydra/extra/pytest_plugin.py @@ -1,16 +1,13 @@ # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved -# Source of truth for version -__version__ = "1.0.0rc1" import copy from pathlib import Path from typing import Callable, List, Optional import pytest -from omegaconf.basecontainer import BaseContainer - from hydra.core.singleton import Singleton from hydra.test_utils.test_utils import SweepTaskFunction, TaskTestFunction from hydra.types import TaskFunction +from omegaconf.basecontainer import BaseContainer @pytest.fixture(scope="function") # type: ignore diff --git a/plugins/examples/example_configsource_plugin/setup.py b/plugins/examples/example_configsource_plugin/setup.py index 30415b14f48..81aed0cc625 100644 --- a/plugins/examples/example_configsource_plugin/setup.py +++ b/plugins/examples/example_configsource_plugin/setup.py @@ -24,7 +24,7 @@ "Programming Language :: Python :: 3.8", "Operating System :: OS Independent", ], - install_requires=["hydra-core~=1.0.0rc1"], + install_requires=["hydra-core~=1.0.0rc3"], # If this plugin is providing configuration files, be sure to include them in the package. # See MANIFEST.in. # For configurations to be discoverable at runtime, they should also be added to the search path. diff --git a/plugins/examples/example_generic_plugin/setup.py b/plugins/examples/example_generic_plugin/setup.py index 854579c03b5..929a65f8057 100644 --- a/plugins/examples/example_generic_plugin/setup.py +++ b/plugins/examples/example_generic_plugin/setup.py @@ -24,7 +24,7 @@ "Programming Language :: Python :: 3.8", "Operating System :: OS Independent", ], - install_requires=["hydra-core~=1.0.0rc1"], + install_requires=["hydra-core~=1.0.0rc3"], # If this plugin is providing configuration files, be sure to include them in the package. # See MANIFEST.in. # For configurations to be discoverable at runtime, they should also be added to the search path. diff --git a/plugins/examples/example_launcher_plugin/setup.py b/plugins/examples/example_launcher_plugin/setup.py index 38ce05865d0..eadb7b4d58e 100644 --- a/plugins/examples/example_launcher_plugin/setup.py +++ b/plugins/examples/example_launcher_plugin/setup.py @@ -24,7 +24,7 @@ "Programming Language :: Python :: 3.8", "Operating System :: OS Independent", ], - install_requires=["hydra-core~=1.0.0rc1"], + install_requires=["hydra-core~=1.0.0rc3"], # If this plugin is providing configuration files, be sure to include them in the package. # See MANIFEST.in. # For configurations to be discoverable at runtime, they should also be added to the search path. diff --git a/plugins/examples/example_searchpath_plugin/setup.py b/plugins/examples/example_searchpath_plugin/setup.py index f366e748422..87a3fd2ac56 100644 --- a/plugins/examples/example_searchpath_plugin/setup.py +++ b/plugins/examples/example_searchpath_plugin/setup.py @@ -24,7 +24,7 @@ "Programming Language :: Python :: 3.8", "Operating System :: OS Independent", ], - install_requires=["hydra-core~=1.0.0rc1"], + install_requires=["hydra-core~=1.0.0rc3"], # If this plugin is providing configuration files, be sure to include them in the package. # See MANIFEST.in. # For configurations to be discoverable at runtime, they should also be added to the search path. diff --git a/plugins/examples/example_sweeper_plugin/setup.py b/plugins/examples/example_sweeper_plugin/setup.py index a0c7d1d7bfe..29c3d3f383a 100644 --- a/plugins/examples/example_sweeper_plugin/setup.py +++ b/plugins/examples/example_sweeper_plugin/setup.py @@ -24,7 +24,7 @@ "Programming Language :: Python :: 3.8", "Operating System :: OS Independent", ], - install_requires=["hydra-core~=1.0.0rc1"], + install_requires=["hydra-core~=1.0.0rc3"], # If this plugin is providing configuration files, be sure to include them in the package. # See MANIFEST.in. # For configurations to be discoverable at runtime, they should also be added to the search path. diff --git a/plugins/hydra_ax_sweeper/setup.py b/plugins/hydra_ax_sweeper/setup.py index e629c85afe2..9f5c489b970 100644 --- a/plugins/hydra_ax_sweeper/setup.py +++ b/plugins/hydra_ax_sweeper/setup.py @@ -6,7 +6,7 @@ LONG_DESC = fh.read() setup( name="hydra-ax-sweeper", - version="1.0.0rc5", + version="1.0.0rc6", author="Omry Yadan, Shagun Sodhani", author_email="omry@fb.com, sshagunsodhani@gmail.com", description="Hydra Ax Sweeper plugin", @@ -22,6 +22,6 @@ "Operating System :: MacOS", "Development Status :: 4 - Beta", ], - install_requires=["hydra-core~=1.0.0rc1", "ax-platform>=0.1.13"], + install_requires=["hydra-core~=1.0.0rc3", "ax-platform>=0.1.13"], include_package_data=True, ) diff --git a/plugins/hydra_colorlog/setup.py b/plugins/hydra_colorlog/setup.py index c7ea7e19d70..a2c78112633 100644 --- a/plugins/hydra_colorlog/setup.py +++ b/plugins/hydra_colorlog/setup.py @@ -6,7 +6,7 @@ LONG_DESC = fh.read() setup( name="hydra-colorlog", - version="1.0.0rc3", + version="1.0.0rc4", author="Omry Yadan", author_email="omry@fb.com", description="Enables colorlog for Hydra apps", @@ -21,6 +21,6 @@ "Programming Language :: Python :: 3.8", "Operating System :: OS Independent", ], - install_requires=["colorlog", "hydra-core~=1.0.0rc1"], + install_requires=["colorlog", "hydra-core~=1.0.0rc3"], include_package_data=True, ) diff --git a/plugins/hydra_joblib_launcher/setup.py b/plugins/hydra_joblib_launcher/setup.py index 26cb5856081..dfd9de5c051 100644 --- a/plugins/hydra_joblib_launcher/setup.py +++ b/plugins/hydra_joblib_launcher/setup.py @@ -6,7 +6,7 @@ LONG_DESC = fh.read() setup( name="hydra-joblib-launcher", - version="1.1.0rc3", + version="1.1.0rc4", author="Jan-Matthis Lueckmann, Omry Yadan", author_email="mail@jan-matthis.de, omry@fb.com", description="Joblib Launcher for Hydra apps", @@ -22,6 +22,6 @@ "Operating System :: Microsoft :: Windows", "Operating System :: POSIX :: Linux", ], - install_requires=["hydra-core~=1.0.0rc1", "joblib>=0.14.0"], + install_requires=["hydra-core~=1.0.0rc3", "joblib>=0.14.0"], include_package_data=True, ) diff --git a/plugins/hydra_nevergrad_sweeper/setup.py b/plugins/hydra_nevergrad_sweeper/setup.py index fce72305cb3..d0e916cd2a6 100644 --- a/plugins/hydra_nevergrad_sweeper/setup.py +++ b/plugins/hydra_nevergrad_sweeper/setup.py @@ -6,7 +6,7 @@ LONG_DESC = fh.read() setup( name="hydra-nevergrad-sweeper", - version="1.0.0rc4", + version="1.0.0rc5", author="Jeremy Rapin, Omry Yadan", author_email="jrapin@fb.com, omry@fb.com", description="Hydra Nevergrad Sweeper plugin", @@ -22,6 +22,6 @@ "Operating System :: OS Independent", "Development Status :: 4 - Beta", ], - install_requires=["hydra-core~=1.0.0rc1", "nevergrad>=0.4.1.post4"], + install_requires=["hydra-core~=1.0.0rc3", "nevergrad>=0.4.1.post4"], include_package_data=True, ) diff --git a/plugins/hydra_rq_launcher/setup.py b/plugins/hydra_rq_launcher/setup.py index 13e7788e05e..e4f6a1750d1 100644 --- a/plugins/hydra_rq_launcher/setup.py +++ b/plugins/hydra_rq_launcher/setup.py @@ -6,7 +6,7 @@ LONG_DESC = fh.read() setup( name="hydra-rq-launcher", - version="1.0.0rc2", + version="1.0.0rc4", author="Jan-Matthis Lueckmann, Omry Yadan", author_email="mail@jan-matthis.de, omry@fb.com", description="Redis Queue (RQ) Launcher for Hydra apps", @@ -25,7 +25,7 @@ install_requires=[ "cloudpickle", "fakeredis", - "hydra-core~=1.0.0rc1", + "hydra-core~=1.0.0rc3", "rq==1.4.3", ], include_package_data=True, diff --git a/plugins/hydra_submitit_launcher/setup.py b/plugins/hydra_submitit_launcher/setup.py index 2a94d131dfb..19b8af5d785 100644 --- a/plugins/hydra_submitit_launcher/setup.py +++ b/plugins/hydra_submitit_launcher/setup.py @@ -5,7 +5,7 @@ LONG_DESC = fh.read() setup( name="hydra-submitit-launcher", - version="1.0.0rc5", + version="1.0.0rc6", author="Jeremy Rapin, Jieru Hu, Omry Yadan", author_email="jrapin@fb.com, jieru@fb.com, omry@fb.com", description="Submitit Launcher for Hydra apps", @@ -21,6 +21,6 @@ "Operating System :: POSIX :: Linux", "Development Status :: 4 - Beta", ], - install_requires=["hydra-core~=1.0.0rc1", "submitit>=1.0.0"], + install_requires=["hydra-core~=1.0.0rc3", "submitit>=1.0.0"], include_package_data=True, ) diff --git a/tests/standalone_apps/initialization_test_app/setup.py b/tests/standalone_apps/initialization_test_app/setup.py index 90576c84296..8d8036d045f 100644 --- a/tests/standalone_apps/initialization_test_app/setup.py +++ b/tests/standalone_apps/initialization_test_app/setup.py @@ -14,5 +14,5 @@ ] }, include_package_data=True, - install_requires=["hydra-core~=1.0.0rc1"], + install_requires=["hydra-core~=1.0.0rc3"], )