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

build: minor ci cleanup #1147

Merged
merged 1 commit into from
Jun 10, 2021
Merged

build: minor ci cleanup #1147

merged 1 commit into from
Jun 10, 2021

Conversation

pefoley2
Copy link
Member

No description provided.

@pefoley2 pefoley2 requested a review from Laur04 as a code owner May 30, 2021 18:21
@coveralls
Copy link

coveralls commented May 30, 2021

Coverage Status

Coverage remained the same at 82.556% when pulling aa5e4e6 on pefoley2:egg into 529a987 on tjcsl:dev.

ci/spec.yml Outdated

# Check for changes to CI spec
- name: Check for chenges to CI spec
- name: Check for changes to CI spec
Copy link
Member

Choose a reason for hiding this comment

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

This is already a part of #1148.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yup, I'll just rebase whichever one looses the race.

ci/spec.yml Outdated

# Build docs/sources
- name: Build docs
run: ./scripts/build_ensure_no_changes.sh ./scripts/build_docs.sh
- name: Build sources
run: ./scripts/build_ensure_no_changes.sh ./scripts/build_sources.sh
run: |
Copy link
Member

Choose a reason for hiding this comment

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

Doesn't the virtual env already get activated earlier?

Copy link
Member Author

Choose a reason for hiding this comment

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

Apparently not?
Or at least when I hacked up build_sources.sh to pip show setuptools, it was the 47 build, not the 57 one installed in the venv.
I'm not sure why the venv isn't activated, but it seems that something is missing...

Copy link
Member

Choose a reason for hiding this comment

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

Hmm that's really weird. I wouldn't think it would work at all when running CI if the venv wasn't active. So if you run CI without (re?)activating the venv you see a different version of setuptools than if you don't?

Copy link
Member Author

Choose a reason for hiding this comment

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

yup.
Although now that I look closer, the shebang for manage.py is python3 and setup.py is python, so it might be that the venv only overwrites the former and the latter pull in system python2. Let me try changing that and see if that solves this...

Copy link
Member Author

Choose a reason for hiding this comment

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

Nope, that wasn't it.
Given that it doesn't seem like venvs are used at all in the official github example, I'm wondering if it's even worth having one here...
ref https://docs.github.com/en/actions/guides/building-and-testing-python

Copy link
Member

Choose a reason for hiding this comment

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

Yea, if the build section works without a venv, I don't see anything on casual inspection that would necessitate it.

set -e
pip install pyyaml
./scripts/build_ensure_no_changes.sh ./ci/regen-workflow.py
run: ./scripts/build_ensure_no_changes.sh ./ci/regen-workflow.py
Copy link
Member

Choose a reason for hiding this comment

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

This is already a part of #1143.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yup, I figured I'd just rebase whichever one goes in second as otherwise I'd have to muck around w/ downgrading my local setuptools to work around this.

.github/workflows/ci.yml Outdated Show resolved Hide resolved
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
Classifier: Operating System :: POSIX :: Linux
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 3.7
Classifier: Framework :: Django :: 1.11
License-File: COPYING
Copy link
Member

@Laur04 Laur04 May 31, 2021

Choose a reason for hiding this comment

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

Any particular reason for moving this Description block? Just curious; I'm not super familiar with the convention here, but this part LGTM.

Copy link
Member Author

Choose a reason for hiding this comment

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

It's apparently that way the 2.1 metadata format works, which setuptools 57+ picks by default.

@pefoley2 pefoley2 force-pushed the egg branch 2 times, most recently from e08537e to 61de80b Compare May 31, 2021 21:30
@pefoley2 pefoley2 requested a review from a team as a code owner May 31, 2021 21:30
@Laur04 Laur04 self-requested a review June 8, 2021 18:18
Copy link
Member

@Laur04 Laur04 left a comment

Choose a reason for hiding this comment

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

Rebase this against dev, run ./build_sources.sh, then LGTM and I'll merge.

E: also this PR needs to target dev

Copy link
Member

@Laur04 Laur04 left a comment

Choose a reason for hiding this comment

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

see comment above

@Laur04 Laur04 changed the base branch from master to dev June 10, 2021 13:32
@pefoley2 pefoley2 changed the title build: update pkg-info build: minor ci cleanup Jun 10, 2021
@pefoley2
Copy link
Member Author

Rebased onto #1153, ptal.

@pefoley2 pefoley2 requested a review from Laur04 June 10, 2021 18:14
Copy link
Member

@Laur04 Laur04 left a comment

Choose a reason for hiding this comment

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

LGTM

@Laur04 Laur04 merged commit 11e6d24 into tjcsl:dev Jun 10, 2021
@pefoley2 pefoley2 deleted the egg branch June 11, 2021 01:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants