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.

Sign up for GitHub

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

Change license binding #419

Merged
merged 4 commits into from
Dec 2, 2022
Merged

Change license binding #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e1f32d
Change license binding
BastianZim Nov 16, 2022
c46aeac
Change license binding
BastianZim Nov 16, 2022
3aaa8f0
fix failing test
marcelotrevisani Dec 2, 2022
e5bd6a8
Update config.yaml
marcelotrevisani Dec 2, 2022
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
6 changes: 3 additions & 3 deletions grayskull/strategy/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,11 +480,11 @@ scikit-learn:
conda_forge: scikit-learn
import_name: sklearn

importlib-metadata:
conda-forge: importlib-metadata
importlib_metadata:
conda_forge: importlib-metadata
import_name: importlib-metadata
avoid_selector: true

jupyter-client:
conda-forge: jupyter_client
conda_forge: jupyter_client
import_name: jupyter_client
2 changes: 1 addition & 1 deletion grayskull/strategy/pypi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ def get_metadata(recipe, config) -> dict:
print_msg(f"License file: {Fore.LIGHTMAGENTA_EX}{license_file}")
if all_license_name:
all_license_name = list(filter(None, all_license_name))
license_name = " & ".join(all_license_name)
license_name = " AND ".join(all_license_name)
if len(all_license_name) > 1:
print_msg(
f"{Fore.RED}Multiple licenses detected!"
Expand Down
2 changes: 1 addition & 1 deletion tests/test_pypi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1238,7 +1238,7 @@ def test_notice_file_different_licence():
"apache-airflow-providers-databricks", version="3.1.0"
)
assert set(recipe["about"]["license_file"]) == {"NOTICE", "LICENSE"}
assert recipe["about"]["license"] in ["MIT & Apache-2.0", "Apache-2.0 & MIT"]
assert recipe["about"]["license"] in ["MIT AND Apache-2.0", "Apache-2.0 AND MIT"]


def test_console_script_toml_format():
Expand Down