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

rename internal package #11

Merged
merged 8 commits into from
Jun 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 15 additions & 8 deletions .github/workflows/python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ jobs:
uses: messense/maturin-action@v1
with:
target: x86_64
args: --release --out dist
args: --release --out dist --sdist
maturin-version: "v0.13.0-beta.6"
- name: Install built wheel - x86_64
run: |
pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
Expand All @@ -42,7 +43,8 @@ jobs:
- name: Build wheels - universal2
uses: messense/maturin-action@v1
with:
args: --release --universal2 --out dist --no-sdist
args: --release --universal2 --out dist
maturin-version: "v0.13.0-beta.6"
- name: Install built wheel - universal2
run: |
pip install dist/${{ env.PACKAGE_NAME }}-*universal2.whl --force-reinstall
Expand Down Expand Up @@ -75,7 +77,8 @@ jobs:
uses: messense/maturin-action@v1
with:
target: ${{ matrix.target }}
args: --release --out dist --no-sdist
args: --release --out dist
maturin-version: "v0.13.0-beta.6"
- name: Install built wheel
shell: bash
run: |
Expand Down Expand Up @@ -104,7 +107,8 @@ jobs:
with:
target: ${{ matrix.target }}
manylinux: auto
args: --release --out dist --no-sdist
args: --release --out dist
maturin-version: "v0.13.0-beta.6"
- name: Install built wheel
if: matrix.target == 'x86_64'
run: |
Expand Down Expand Up @@ -132,7 +136,8 @@ jobs:
with:
target: ${{ matrix.target }}
manylinux: auto
args: --release --out dist --no-sdist
args: --release --out dist
maturin-version: "v0.13.0-beta.6"
- uses: uraimo/[email protected]
if: matrix.target != 'ppc64'
name: Install built wheel
Expand Down Expand Up @@ -172,7 +177,8 @@ jobs:
with:
target: ${{ matrix.target }}
manylinux: musllinux_1_2
args: --release --out dist --no-sdist
args: --release --out dist
maturin-version: "v0.13.0-beta.6"
- name: Install built wheel
if: matrix.target == 'x86_64-unknown-linux-musl'
uses: addnab/docker-run-action@v3
Expand Down Expand Up @@ -209,7 +215,8 @@ jobs:
with:
target: ${{ matrix.platform.target }}
manylinux: musllinux_1_2
args: --release --out dist --no-sdist
args: --release --out dist
maturin-version: "v0.13.0-beta.6"
- uses: uraimo/run-on-arch-action@master
name: Install built wheel
with:
Expand Down Expand Up @@ -249,7 +256,7 @@ jobs:
- name: Build wheels
uses: messense/maturin-action@v1
with:
maturin-version: v0.13.0-beta.5
maturin-version: "v0.13.0-beta.6"
target: ${{ matrix.target }}
manylinux: auto
args: --release --out dist -i pypy${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "graphlib2"
version = "0.4.3"
version = "0.4.4"
edition = "2021"
description = "Rust port of the Python stdlib graphlib modules"
readme = "README.md"
Expand All @@ -20,3 +20,4 @@ nohash-hasher = "^0.2.0"
[package.metadata.maturin]
python-source = "python"
description-content-type = "text/markdown; charset=UTF-8; variant=GFM"
name = "graphlib2._graphlib2"
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies = [
requires-python = ">=3.7"

[build-system]
requires = ["maturin>=0.12<0.13"]
requires = ["maturin>=0.13.0b6<14"]
build-backend = "maturin"

[tool.maturin]
Expand Down
4 changes: 2 additions & 2 deletions python/graphlib2/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

from typing import Generic, Hashable, Iterable, Optional, TypeVar

from graphlib2._graphlib2 import CycleError
from graphlib2._graphlib2 import TopologicalSorter as _TopologicalSorter
from graphlib2._types import SupportsItems
from graphlib2.graphlib2 import CycleError
from graphlib2.graphlib2 import TopologicalSorter as _TopologicalSorter

T = TypeVar("T", bound=Hashable)

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pytest==6.2.5
maturin==0.12.3
maturin>=0.13.0b6<14
pre-commit==2.16.0
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ impl TopologicalSorter {
}

#[pymodule]
fn graphlib2(_py: Python, m: &PyModule) -> PyResult<()> {
fn _graphlib2(_py: Python, m: &PyModule) -> PyResult<()> {
m.add_class::<TopologicalSorter>()?;
m.add("CycleError", _py.get_type::<CycleError>())?;
Ok(())
Expand Down