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

Fixes for CI wheels #455

Merged
merged 20 commits into from
Sep 18, 2024
Merged

Fixes for CI wheels #455

merged 20 commits into from
Sep 18, 2024

Conversation

HGWright
Copy link
Contributor

🚀 Pull Request

Description

@trexfeathers trexfeathers mentioned this pull request Sep 16, 2024
@HGWright HGWright marked this pull request as ready for review September 18, 2024 10:39
Copy link

@ESadek-MO ESadek-MO left a comment

Choose a reason for hiding this comment

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

Couple questions, but generally looks good

.github/workflows/ci-wheels.yml Outdated Show resolved Hide resolved
requirements/cf-units.yml Outdated Show resolved Hide resolved
.github/workflows/ci-wheels.yml Show resolved Hide resolved
Copy link

@ESadek-MO ESadek-MO left a comment

Choose a reason for hiding this comment

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

LGTM!

@ESadek-MO ESadek-MO merged commit cd2aaad into SciTools:main Sep 18, 2024
10 checks passed
@@ -4,7 +4,7 @@ requires =
tox-run-command


[testenv:py{39,310,311}-lock]
[testenv:py{310,311,312}-lock]
Copy link
Collaborator

Choose a reason for hiding this comment

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

There are some missing corresponding changes. This is creating some confusing conflicts with #423. I could raise a pull request to fix these if you're OK with that?

cf-units/setup.cfg

Lines 8 to 12 in 8a82027

Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Topic :: Scientific/Engineering

cf-units/setup.cfg

Lines 45 to 46 in 8a82027

python_requires =
>=3.9

strategy:
matrix:
lock: [py39-lock, py310-lock, py311-lock]

matrix:
os: [ubuntu-latest]
version: [py310, py311]
include:
- os: ubuntu-latest
platform: linux
- os: ubuntu-latest
version: py311
posargs: "--cov-report=xml --cov"
post-command: codecov

target-version = ["py39", "py310", "py311"]

cf-units/tox.ini

Lines 36 to 45 in 8a82027

conda_spec =
py39-linux: {toxinidir}{/}requirements{/}locks{/}py39-lock-linux-64.txt
py310-linux: {toxinidir}{/}requirements{/}locks{/}py310-lock-linux-64.txt
py311-linux: {toxinidir}{/}requirements{/}locks{/}py311-lock-linux-64.txt
py39-osx: {toxinidir}{/}requirements{/}locks{/}py39-lock-osx-64.txt
py310-osx: {toxinidir}{/}requirements{/}locks{/}py310-lock-osx-64.txt
py311-osx: {toxinidir}{/}requirements{/}locks{/}py311-lock-osx-64.txt
py39-win: {toxinidir}{/}requirements{/}locks{/}py39-lock-win-64.txt
py310-win: {toxinidir}{/}requirements{/}locks{/}py310-lock-win-64.txt
py311-win: {toxinidir}{/}requirements{/}locks{/}py311-lock-win-64.txt

This was referenced Sep 20, 2024
stephenworsley added a commit to rcomer/cf-units that referenced this pull request Sep 24, 2024
* main:
  [pre-commit.ci] pre-commit autoupdate (SciTools#425)
  Adopt cython3 (require >=3) (SciTools#460)
  Add repo-review (SciTools#456)
  Fully support Python 3.12 (SciTools#461)
  Bump peter-evans/create-pull-request from 6.0.4 to 7.0.5 (SciTools#459)
  Fix for bad git path in GHA macos instances. (SciTools#464)
  test macos wheels (SciTools#458)
  Bump pypa/cibuildwheel from 2.20.0 to 2.21.1 (SciTools#457)
  Fixes for CI wheels (SciTools#455)
  Dependabot check weekly. (SciTools#439)

# Conflicts:
#	.pre-commit-config.yaml
#	cf_units/tests/test_coding_standards.py
#	pyproject.toml
@pp-mo pp-mo linked an issue Sep 27, 2024 that may be closed by this pull request
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.

update+fix Cython / ci-buildwheels
3 participants