Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct Python <= 3.7 compatibility regression in commit 377c70d #256

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ install_requires =
click>=6.7,!=7.0
pip>=9.0.3
setuptools
importlib_resources; python_version < "3.7"
python_requires = >=3.6
python_requires = >=3.7
include_package_data = True

[options.extras_require]
Expand Down
2 changes: 1 addition & 1 deletion src/shiv/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.0.7"
__version__ = "1.1.0"
7 changes: 4 additions & 3 deletions src/shiv/bootstrap/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
This module contains the ``Environment`` object, which combines settings decided at build time with
overrides defined at runtime (via environment variables).
"""
from __future__ import annotations
import json
import os
from typing import Any, Optional
from typing import Any, Dict, Optional


def str_bool(v) -> bool:
Expand Down Expand Up @@ -35,7 +36,7 @@ def __init__(
entry_point: Optional[str] = None,
extend_pythonpath: bool = False,
prepend_pythonpath: Optional[str] = None,
hashes: Optional[dict[str, Any]] = None,
hashes: Optional[Dict[str, Any]] = None,
no_modify: bool = False,
reproducible: bool = False,
script: Optional[str] = None,
Expand All @@ -46,7 +47,7 @@ def __init__(
self.always_write_cache: bool = always_write_cache
self.build_id: Optional[str] = build_id
self.built_at: str = built_at
self.hashes: Optional[dict[str, Any]] = hashes or {}
self.hashes: Optional[Dict[str, Any]] = hashes or {}
self.no_modify: bool = no_modify
self.reproducible: bool = reproducible
self.preamble: Optional[str] = preamble
Expand Down