Skip to content

Use setuptools_scm instead of versioneer #211

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

Merged
mwcraig merged 8 commits into from
Jul 11, 2022
Merged

Use setuptools_scm instead of versioneer #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fdefa5a
Drop versioneer
mwcraig Jul 11, 2022
a0951b0
Drop obsolete setuptools handling
mwcraig Jul 11, 2022
79a241c
Update autobahn version
mwcraig Jul 11, 2022
161bf1a
Use setuptools_scm
mwcraig Jul 11, 2022
d07ea1a
Update manifest
mwcraig Jul 11, 2022
3d5e3fb
Try updating build command
mwcraig Jul 11, 2022
4adddbe
Try fetching full repo
mwcraig Jul 11, 2022
33da356
Update build commands
mwcraig Jul 11, 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
12 changes: 5 additions & 7 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ jobs:
steps:

- uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
Expand All @@ -37,15 +39,11 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pytest Cython wheel

- name: Build sdist
run: |
python setup.py sdist
pip install pytest Cython wheel build

- name: Build wheel
- name: Build sdist and wheel
run: |
python setup.py bdist_wheel
python -m build

- name: Install vpython
run: |
Expand Down
22 changes: 14 additions & 8 deletions .github/workflows/upload_pypi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
steps:

- uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
Expand All @@ -27,20 +29,22 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine Cython
pip install setuptools wheel twine Cython build

- name: Build and publish wheel
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_UPLOAD_TOKEN }}
run: |
python setup.py bdist_wheel
twine upload dist/*
python -m build
twine upload dist/*.whl

linux_wheels:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v1
with:
Expand All @@ -58,7 +62,7 @@ jobs:
uses: RalfG/python-wheels-manylinux-build@v0.4.2
with:
python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310'
build-requirements: 'setuptools cython'
build-requirements: 'setuptools cython setuptools_scm'
- name: Build and publish wheel
env:
TWINE_USERNAME: __token__
Expand All @@ -70,6 +74,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v1
with:
Expand All @@ -85,7 +91,7 @@ jobs:
uses: RalfG/python-wheels-manylinux-build@v0.4.2-manylinux2014_aarch64
with:
python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310'
build-requirements: 'setuptools cython'
build-requirements: 'setuptools cython setuptools_scm'
- name: Build and publish wheel
env:
TWINE_USERNAME: __token__
Expand All @@ -104,11 +110,11 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine Cython
pip install setuptools wheel twine Cython build
- name: Build and publish
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_UPLOAD_TOKEN }}
run: |
python setup.py sdist
twine upload dist/*
python -m build
twine upload dist/*.tar.gz
3 changes: 0 additions & 3 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
include CHANGES.txt
include LICENSE.txt
include README.md
include ez_setup.py
include versioneer.py
include vpython/_version.py
include vpython/cyvector.pyx
Loading