hydra-core 1.4.0.dev9__tar.gz → 1.4.0.dev10__tar.gz

{hydra_core-1.4.0.dev9/hydra_core.egg-info → hydra_core-1.4.0.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydra-core
-Version: 1.4.0.dev9
+Version: 1.4.0.dev10
 Summary: A framework for elegantly configuring complex applications
 Home-page: https://github.com/hydra-ecosystem/hydra
 Author: Omry Yadan
@@ -39,7 +39,7 @@ Dynamic: summary
   <a href="https://pypi.org/project/hydra-core/"><img src="https://img.shields.io/pypi/v/hydra-core" alt="PyPI" /></a>
   <a href="#"><img src="https://img.shields.io/pypi/pyversions/hydra-core" alt="PyPI - Python Version" /></a>
   <a href="https://github.com/hydra-ecosystem/hydra/actions/workflows/core_tests.yml"><img src="https://github.com/hydra-ecosystem/hydra/actions/workflows/core_tests.yml/badge.svg?branch=main" alt="GitHub Actions build" /></a>
-  <a href="https://www.pepy.tech/projects/hydra-core?versions=0.11.*&versions=1.0.*&versions=1.1.*&versions=1.2.*&versions=1.3.*&versions=1.4.*"><img src="https://pepy.tech/badge/hydra-core/month" alt="Downloads" /></a>
+  <a href="https://www.pepy.tech/projects/hydra-core?versions=0.11.*&versions=1.0.*&versions=1.1.*&versions=1.2.*&versions=1.3.*&versions=1.4.*"><img src="https://api.pepy.tech/badge/hydra-core/month" alt="Downloads" /></a>
   <a href="https://hydra.cc"><img src="https://hydra.cc/img/hydra-config-badge.svg" alt="Config: Hydra" /></a>
   <a href="https://cli.dev"><img src="https://cli.dev/img/badges/cli-dev-ecosystem.svg" alt="ecosystem: cli.dev" /></a>
 </p>

{hydra_core-1.4.0.dev9 → hydra_core-1.4.0.dev10}/README.md

@@ -4,7 +4,7 @@
   <a href="https://pypi.org/project/hydra-core/"><img src="https://img.shields.io/pypi/v/hydra-core" alt="PyPI" /></a>
   <a href="#"><img src="https://img.shields.io/pypi/pyversions/hydra-core" alt="PyPI - Python Version" /></a>
   <a href="https://github.com/hydra-ecosystem/hydra/actions/workflows/core_tests.yml"><img src="https://github.com/hydra-ecosystem/hydra/actions/workflows/core_tests.yml/badge.svg?branch=main" alt="GitHub Actions build" /></a>
-  <a href="https://www.pepy.tech/projects/hydra-core?versions=0.11.*&versions=1.0.*&versions=1.1.*&versions=1.2.*&versions=1.3.*&versions=1.4.*"><img src="https://pepy.tech/badge/hydra-core/month" alt="Downloads" /></a>
+  <a href="https://www.pepy.tech/projects/hydra-core?versions=0.11.*&versions=1.0.*&versions=1.1.*&versions=1.2.*&versions=1.3.*&versions=1.4.*"><img src="https://api.pepy.tech/badge/hydra-core/month" alt="Downloads" /></a>
   <a href="https://hydra.cc"><img src="https://hydra.cc/img/hydra-config-badge.svg" alt="Config: Hydra" /></a>
   <a href="https://cli.dev"><img src="https://cli.dev/img/badges/cli-dev-ecosystem.svg" alt="ecosystem: cli.dev" /></a>
 </p>

{hydra_core-1.4.0.dev9 → hydra_core-1.4.0.dev10}/hydra/__init__.py

@@ -1,7 +1,7 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
 
 # Source of truth for Hydra's version
-__version__ = "1.4.0.dev9"
+__version__ = "1.4.0.dev10"
 from hydra import utils
 from hydra.errors import MissingConfigException
 from hydra.main import main

{hydra_core-1.4.0.dev9 → hydra_core-1.4.0.dev10}/hydra/_internal/config_repository.py

@@ -298,6 +298,11 @@ class ConfigRepository(IConfigRepository):
                 keywords.optional = True
             elif keyword == "override":
                 keywords.override = True
+        if keywords.optional and keywords.override:
+            raise ValueError(
+                f"In {config_path}: 'optional' and 'override' keywords "
+                "cannot be combined in defaults list"
+            )
         keywords.group = group