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: migrate to pyproject.toml #1068

Merged
merged 49 commits into from
Jan 16, 2024
Merged
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
47f8537
Remove obsoleted files.
tonyandrewmeyer Nov 16, 2023
c942cc7
Organise the build files together and ensure that version.py doesn't …
tonyandrewmeyer Nov 16, 2023
a160ce8
Migrate data from setup.py.
tonyandrewmeyer Nov 16, 2023
a0feaeb
Exclude some files from the sdist.
tonyandrewmeyer Nov 16, 2023
0d18f51
Update the dependency location.
tonyandrewmeyer Nov 16, 2023
0b8f710
Remove auto-generated file.
tonyandrewmeyer Nov 16, 2023
b58abed
Update with email address.
tonyandrewmeyer Nov 16, 2023
edca060
Move the requirements into pyproject.toml.
tonyandrewmeyer Nov 16, 2023
9fedd2e
Remove outdated tests.
tonyandrewmeyer Nov 16, 2023
66b8057
Use build to create the distribution package.
tonyandrewmeyer Nov 16, 2023
96d0c39
Update build command.
tonyandrewmeyer Nov 16, 2023
183ff1a
Add pinned versions of requirements files.
tonyandrewmeyer Nov 16, 2023
3790aa4
Add dev dependencies.
tonyandrewmeyer Nov 16, 2023
54a471e
Add type hint now that the default value is gone.
tonyandrewmeyer Nov 16, 2023
412b68a
Provide instructions for generating the doc requirements.
tonyandrewmeyer Nov 19, 2023
2ce49c1
Fix spacing around import.
tonyandrewmeyer Nov 19, 2023
063abdc
Ensure that the requirements are kept in sync. Ensure version.py exists.
tonyandrewmeyer Nov 19, 2023
c856db6
Ensure setuptools-svm is available to generate the version.py file.
tonyandrewmeyer Nov 19, 2023
e4d41a7
Add setuptools to the dev dependencies so that the version.py file ca…
tonyandrewmeyer Nov 19, 2023
5a921a6
Extend the information on tooling.
tonyandrewmeyer Nov 19, 2023
3ad12d0
Don't bundle the .gitignore, that's just for when you have a clone.
tonyandrewmeyer Nov 19, 2023
e9f0cb6
Merge branch 'main' into pyproject-build-893
tonyandrewmeyer Nov 19, 2023
2947d92
Remove the setuptools-scm dependency.
tonyandrewmeyer Nov 22, 2023
fc47085
Merge branch 'main' into pyproject-build-893
tonyandrewmeyer Nov 22, 2023
993892d
Tell setuptools where to find the version.
tonyandrewmeyer Nov 22, 2023
3190143
We need the dependencies installed to import ops to get the version.
tonyandrewmeyer Nov 22, 2023
3fe6176
Explicitly list the files to include (no longer using setuptools-scm).
tonyandrewmeyer Nov 22, 2023
20ca414
Pin using Python 3.8.
tonyandrewmeyer Nov 22, 2023
adde28f
Merge branch 'main' into pyproject-build-893
tonyandrewmeyer Dec 12, 2023
2a50930
Merge branch 'main' into pyproject-build-893
tonyandrewmeyer Jan 11, 2024
71cedc2
Update HACKING.md
tonyandrewmeyer Jan 12, 2024
3b7c10a
Update HACKING.md
tonyandrewmeyer Jan 12, 2024
e6a23c3
Bump pyright version to match main's requirements-dev.txt value.
tonyandrewmeyer Jan 11, 2024
7f32a09
Address review comments.
tonyandrewmeyer Jan 12, 2024
9edc6fc
Fix smoke name.
tonyandrewmeyer Jan 12, 2024
339740d
Style fix.
tonyandrewmeyer Jan 12, 2024
556d139
requirements-dev is now not used.
tonyandrewmeyer Jan 12, 2024
b6837c9
Per code review.
tonyandrewmeyer Jan 12, 2024
0d726d9
Bump to next expected version.
tonyandrewmeyer Jan 12, 2024
50b6386
Fix the manifest to pick up the correct files.
tonyandrewmeyer Jan 12, 2024
1560224
Update HACKING.md for latest changes.
tonyandrewmeyer Jan 12, 2024
fadd413
Move to putting the dev dependencies direclty in tox.ini.
tonyandrewmeyer Jan 14, 2024
e1be35e
Minor cleanup after change to deps in tox.ini.
tonyandrewmeyer Jan 14, 2024
06de826
Merge branch 'main' into pyproject-build-893
tonyandrewmeyer Jan 14, 2024
8867b1d
Ensure there is a requirements file for readthedocs to use - and it's…
tonyandrewmeyer Jan 14, 2024
84fcb74
Update pyproject.toml
tonyandrewmeyer Jan 15, 2024
99ae4ee
Update tox.ini
tonyandrewmeyer Jan 15, 2024
18db4e5
Regenerate using Python 3.8
tonyandrewmeyer Jan 15, 2024
c9c325d
Do a local install for rtd.
tonyandrewmeyer Jan 15, 2024
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
Prev Previous commit
Next Next commit
Update build command.
Also ensure that we can install (and build, since that's how the action is configured) on 3.8 through 3.12.
  • Loading branch information
tonyandrewmeyer committed Nov 16, 2023
commit 96d0c3923e1dba952211eb8ceed50748eb2497b4
15 changes: 11 additions & 4 deletions .github/workflows/framework-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,20 +93,27 @@ jobs:
PEBBLE: /tmp/pebble

pip-install:
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [ubuntu-latest, macos-latest]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v3
- name: Set up Python 3
uses: actions/setup-python@v2
with:
python-version: '3.11'
python-version: ${{ matrix.python-version }}

- name: Install build dependencies
run: pip install wheel build

- name: Build
run: python setup.py sdist
run: python -m build

# Test that a pip install of the source dist .tar.gz will work
- name: Test 'pip install'
# Shouldn't happen, but pip install will fail if ls returns multiple lines
run: pip install $(ls dist/ops*.gz)