diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 743b6d86..3f5a90eb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,10 +26,10 @@ jobs: fail-fast: false matrix: python-version: - - "3.8" - "3.9" - "3.10" - "3.11" + - "3.12" steps: - name: Check out code @@ -51,7 +51,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install .[test,pygraphviz,lint] + pip install .[test,pygraphviz,lint] flit - name: Lint with ruff run: ruff check $(git ls-files "*.py") @@ -63,6 +63,10 @@ jobs: # Generate LCOV format coverage data for coveralls. python -m coverage lcov -o coverage.lcov + - name: Build packages + run: | + python -m flit build + - name: Send coverage data to coveralls.io uses: coverallsapp/github-action@v2 with: @@ -73,7 +77,7 @@ jobs: finalize: name: finalize needs: test - runs-on: ubuntu-latest + runs-on: ubuntu-latest if: ${{ always() }} steps: - name: Indicate completion to coveralls.io diff --git a/.mailmap b/.mailmap index 280ae582..0c4ee424 100644 --- a/.mailmap +++ b/.mailmap @@ -1,2 +1,4 @@ Yifei Wang <43050198+yifei666@users.noreply.github.com> Sajith Sasidharan +Italo Valcy +Muhammad Usman Aziz diff --git a/README.md b/README.md index ef413059..516336d5 100644 --- a/README.md +++ b/README.md @@ -72,9 +72,6 @@ $ source venv/bin/activate $ pip install .[test] ``` -Please note that editable installs do not work currently, due to the -shared top-level `sdx` module in datamodel. - PCE can read topology data from Graphviz dot files, if the optional pygraphviz dependency is installed with: diff --git a/pyproject.toml b/pyproject.toml index 0c9bc5a8..7e51d402 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,21 +1,20 @@ [build-system] -requires = [ - "setuptools >= 61.0", - "setuptools-scm >= 6.2", - "wheel", -] -build-backend = "setuptools.build_meta" +requires = ["flit_core >=3.2,<4"] +build-backend = "flit_core.buildapi" [project] name = "sdx-pce" +version = "3.0.0.dev0" description = "Heuristic and Optimal Algorithms for CSP and TE Computation" -dynamic = [ "version" ] authors = [ { name = "Yufeng Xin", email = "yxin@renci.org" }, - { name = "Yifei Wang", email = "ywang13@renci.org" } + { name = "Yifei Wang", email = "ywang13@renci.org" }, + { name = "Cong Wang", email = "cwang@renci.org" }, + { name = "Italo Valcy", email = "italo@ampath.net" }, + { name = "Sajith Sasidharan", email = "sajith@hcoop.net" }, ] readme = "README.md" -requires-python = ">=3.8" +requires-python = ">=3.9" license = {file = "LICENSE"} classifiers = [ "Programming Language :: Python :: 3", @@ -30,7 +29,7 @@ dependencies = [ "prtpy", "pydot", "dataclasses-json", - "sdx-datamodel @ git+https://github.com/atlanticwave-sdx/datamodel@main", + "sdx-datamodel @ git+https://github.com/atlanticwave-sdx/datamodel@3.0.0.dev0", ] [project.urls] diff --git a/tox.ini b/tox.ini index 0f912c41..3ecdb2e2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,9 @@ [tox] env_list = - py38 py39 py310 py311 + py312 skip_missing_interpreters = true