Skip to content

Commit

Permalink
Include all of the tests folder in the source tarball
Browse files Browse the repository at this point in the history
Also update Github Actions

Travis wasn't used for a while, remove from Readme
  • Loading branch information
MSeifert04 committed Mar 2, 2024
1 parent 801ec40 commit d3df1a7
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 44 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cpython-benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
with:
fetch-depth: 1
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Install dependencies
Expand All @@ -42,7 +42,7 @@ jobs:
run: |
python ./ci/collect_benchmarks.py
- name: Upload results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: py3.12-benchmarks
path: ./.benchmark_results/
2 changes: 1 addition & 1 deletion .github/workflows/cpython-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
fetch-depth: 1
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
50 changes: 22 additions & 28 deletions .github/workflows/cpython.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,15 @@ jobs:
build-clang:
runs-on: macos-latest
timeout-minutes: 10
strategy:
matrix:
python-version: ['3.12']
steps:
- name: Check out source
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
python-version: '3.12'
- name: Install dependencies
run: |
python -m pip install pip setuptools --upgrade
Expand All @@ -50,17 +47,17 @@ jobs:
fetch-depth: 1
- name: Download Python 3.12
run: |
wget https://www.python.org/ftp/python/3.12.0/Python-3.12.0.tgz -q
python3 ci/verify_checksum.py Python-3.12.0.tgz d6eda3e1399cef5dfde7c4f319b0596c
wget https://www.python.org/ftp/python/3.12.2/Python-3.12.2.tgz -q
python3 ci/verify_checksum.py Python-3.12.2.tgz 4e64a004f8ad9af1a75607cfd0d5a8c8
- name: Install Python 3.12
run: |
tar xzf Python-3.12.0.tgz
cd Python-3.12.0
tar xzf Python-3.12.2.tgz
cd Python-3.12.2
./configure --with-pydebug
sudo make altinstall -s -j2
- name: Remove download
run: |
sudo python3.12 -c "import os; os.remove('./Python-3.12.0.tgz'); import shutil; shutil.rmtree('./Python-3.12.0/')"
sudo python3.12 -c "import os; os.remove('./Python-3.12.2.tgz'); import shutil; shutil.rmtree('./Python-3.12.2/')"
- name: Install dependencies
run: |
python3.12 -m pip install pip setuptools wheel --upgrade --user --no-warn-script-location
Expand All @@ -83,18 +80,15 @@ jobs:
build-sdist:
runs-on: ubuntu-latest
timeout-minutes: 10
strategy:
matrix:
python-version: ['3.12']
steps:
- name: Check out source
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
python-version: '3.12'
- name: Install dependencies
run: |
python -m pip install pip setuptools wheel build --upgrade
Expand All @@ -106,7 +100,7 @@ jobs:
rm ./dist/*.whl
- name: Install package
run: |
python -m pip install ./dist/iteration_utilities-0.12.0.tar.gz -vv
python -m pip install ./dist/iteration_utilities-0.12.1.tar.gz -vv
- name: Import package
run: |
python -c "import iteration_utilities"
Expand All @@ -117,7 +111,7 @@ jobs:
run: |
python -m pytest tests/
- name: Upload dist
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: py_sdist
path: ./dist/
Expand All @@ -127,15 +121,18 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04, windows-2019, macos-11]
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v3
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.12'

- name: Install cibuildwheel
run: python -m pip install cibuildwheel==2.16.2
run: python -m pip install cibuildwheel==2.16.5

- name: Build wheels
run: python -m cibuildwheel --output-dir wheelhouse
Expand All @@ -146,26 +143,23 @@ jobs:
pytest {package}/tests
CIBW_TEST_REQUIRES: pytest

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: wheels
name: wheels-${{ matrix.os }}
path: ./wheelhouse/*.whl

build-docs:
runs-on: ubuntu-latest
timeout-minutes: 10
strategy:
matrix:
python-version: ['3.12']
steps:
- name: Check out source
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
python-version: '3.12'
- name: Install dependencies
run: |
python -m pip install pip setuptools --upgrade
Expand All @@ -179,7 +173,7 @@ jobs:
run: |
sphinx-build -b html -W -a -n docs/ build/sphinx/html/
- name: Upload documentation
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docs
path: ./build/sphinx/html/
16 changes: 8 additions & 8 deletions .github/workflows/pypy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
timeout-minutes: 10
strategy:
matrix:
os: [ubuntu-20.04]
os: [ubuntu-latest]
steps:
- name: Check out source
uses: actions/checkout@v4
Expand All @@ -23,11 +23,11 @@ jobs:
- name: Test installation (Ubuntu)
if: matrix.os == 'ubuntu-20.04'
run: |
python3 -c "import urllib.request; urllib.request.urlretrieve ('https://downloads.python.org/pypy/pypy3.10-v7.3.13-linux64.tar.bz2', './pypy.tar.bz2')"
python3 -c "import urllib.request; urllib.request.urlretrieve ('hhttps://downloads.python.org/pypy/pypy3.10-v7.3.15-linux64.tar.bz2', './pypy.tar.bz2')"
python3 -c "import tarfile; tar = tarfile.open('./pypy.tar.bz2', 'r:bz2');tar.extractall('.'); tar.close()"
./pypy3.10-v7.3.13-linux64/bin/pypy3 -m ensurepip
./pypy3.10-v7.3.13-linux64/bin/pypy3 -m pip install pip setuptools --upgrade
./pypy3.10-v7.3.13-linux64/bin/pypy3 -m pip install . --no-deps -vv
./pypy3.10-v7.3.13-linux64/bin/pypy3 -c "import iteration_utilities"
./pypy3.10-v7.3.13-linux64/bin/pypy3 -m pip install pytest
./pypy3.10-v7.3.13-linux64/bin/pypy3 -m pytest tests
./pypy3.10-v7.3.15-linux64/bin/pypy3 -m ensurepip
./pypy3.10-v7.3.15-linux64/bin/pypy3 -m pip install pip setuptools --upgrade
./pypy3.10-v7.3.15-linux64/bin/pypy3 -m pip install . --no-deps -vv
./pypy3.10-v7.3.15-linux64/bin/pypy3 -c "import iteration_utilities"
./pypy3.10-v7.3.15-linux64/bin/pypy3 -m pip install pytest
./pypy3.10-v7.3.15-linux64/bin/pypy3 -m pytest tests
3 changes: 3 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@ recursive-include licenses *
# Source code
graft src

# Source code
graft tests

global-exclude *.py[cod] __pycache__/* *.so *.dylib
4 changes: 0 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@ Downloads
Test status
^^^^^^^^^^^

.. image:: https://travis-ci.org/MSeifert04/iteration_utilities.svg?branch=master
:target: https://travis-ci.org/MSeifert04/iteration_utilities
:alt: Travis CI Status

.. image:: https://ci.appveyor.com/api/projects/status/7dcitqxmh82d0x0m?svg=true
:target: https://ci.appveyor.com/project/MSeifert04/iteration-utilities
:alt: AppVeyor Status
Expand Down
6 changes: 6 additions & 0 deletions docs/CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Changelog for "iteration_utilities"
-----------------------------------

Version 0.12.1 (2024-03-03)
^^^^^^^^^^^^^^^^^^^^^^^^^^^

- Source distribution now includes all files needed to run the tests from the tarball


Version 0.12.0 (2023-10-13)
^^^^^^^^^^^^^^^^^^^^^^^^^^^

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "iteration_utilities"
version = "0.12.0"
version = "0.12.1"
description = "Utilities based on Pythons iterators and generators."
readme = "README.rst"
requires-python = ">=3.7"
Expand Down

0 comments on commit d3df1a7

Please sign in to comment.