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

Remove spec2scl from add_pypi script #10304

Open
wants to merge 1 commit into
base: rpm/develop
Choose a base branch
from

Conversation

Odilhao
Copy link
Member

@Odilhao Odilhao commented Jan 18, 2024

No description provided.

@@ -48,7 +48,7 @@ generate_pypi_package() {
else
RPM_NAME_ARG=""
fi
pyp2rpm --no-autonc --sclize --no-meta-runtime-dep --no-meta-buildtime-dep -s -t $TEMPLATE -o epel7 -b $BASE_PYTHON -d $PACKAGE_DIR -v $VERSION $RPM_NAME_ARG $PYPI_NAME
pyp2rpm --no-autonc -s -t $TEMPLATE -o epel7 -b $BASE_PYTHON -d $PACKAGE_DIR -v $VERSION $RPM_NAME_ARG $PYPI_NAME
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still care about el7? Is there an epel8 template?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, we only have EL7 and Fedora atm, and that -o epel7 sets python3 as the python to be used.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, we only have EL7 and Fedora atm, and that -o epel7 sets python3 as the python to be used.

But -b sets the base Python to 3.

What it appears to do is blacklist it from using rich dependencies:
https://github.com/fedora-python/pyp2rpm/blob/92399daa509d2769433f97cf7f07209f738139a2/pyp2rpm/settings.py#L30

And select Python 2 & Python 3:
https://github.com/fedora-python/pyp2rpm/blob/92399daa509d2769433f97cf7f07209f738139a2/pyp2rpm/settings.py#L6

So I think you can drop it. And then you can also rely on the default value for base python.

Suggested change
pyp2rpm --no-autonc -s -t $TEMPLATE -o epel7 -b $BASE_PYTHON -d $PACKAGE_DIR -v $VERSION $RPM_NAME_ARG $PYPI_NAME
pyp2rpm --no-autonc -s -t $TEMPLATE -d $PACKAGE_DIR -v $VERSION $RPM_NAME_ARG $PYPI_NAME

(which also allows you to drop line 9).

Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you have another look at my comments?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants