Skip to content

Commit

Permalink
Merge pull request #321 from atlanticwave-sdx/use-flit
Browse files Browse the repository at this point in the history
Housekeeping updates
  • Loading branch information
sajith authored Aug 21, 2024
2 parents 69c4617 + 0edcb3f commit 305ecd8
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 22 deletions.
11 changes: 4 additions & 7 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,12 @@ jobs:
run: |
python -m isort --check --profile black .
# # Disable hadolint check until
# # https://github.com/hadolint/hadolint/issues/943 is solved.
# - name: Lint sdx-controller Dockerfile
# uses: hadolint/[email protected]
# with:
# dockerfile: Dockerfile
- name: Lint sdx-controller Dockerfile
uses: hadolint/[email protected]
with:
dockerfile: Dockerfile

- name: Lint bapm-server Dockerfile
uses: hadolint/[email protected]
with:
dockerfile: bapm_server/Dockerfile

2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ jobs:
fail-fast: false
matrix:
python-version:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"

steps:

Expand Down
8 changes: 8 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Cong Wang <[email protected]> <[email protected]>
Cong Wang <[email protected]> <[email protected]>
Cong Wang <[email protected]> <[email protected]>
Cong Wang <[email protected]> <[email protected]>
Cong Wang <[email protected]> <[email protected]>
Cong Wang <[email protected]> <[email protected]>
Italo Valcy <[email protected]> <[email protected]>
Sajith Sasidharan <[email protected]> <[email protected]>
6 changes: 0 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@ ENV PATH="/opt/venv/bin:$PATH"

COPY . /usr/src/app

# In order to make setuptools_scm work during container build, we
# temporarily bind-mount .git. Via
# https://github.com/pypa/setuptools_scm/issues/77#issuecomment-844927695
RUN --mount=source=.git,target=.git,type=bind \
pip install --no-cache-dir .[wsgi]

# The final image.
FROM python:3.9-slim-bullseye AS sdx-runtime-image

Expand Down
14 changes: 6 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
[build-system]
requires = [
"setuptools >= 61.0",
"setuptools-scm >= 6.2",
]
build-backend = "setuptools.build_meta"
requires = ["flit_core >=3.2,<4"]
build-backend = "flit_core.buildapi"

[project]
name = "sdx-controller"
version = "3.0.0.dev0"
description = "AtlanticWave-SDX project's main controller"
dynamic = [ "version" ]
authors = [
{ name = "Yufeng Xin", email = "[email protected]" },
{ name = "Cong Wang", email = "[email protected]" },
{ name = "Sajith Sasidharan", email = "[email protected]" },
{ name = "Italo Valcy", email = "[email protected]" },
]
readme = "README.md"
requires-python = ">=3.8"
requires-python = ">=3.9"
license = {file = "LICENSE"}
classifiers = [
"Programming Language :: Python :: 3",
Expand All @@ -31,7 +29,7 @@ dependencies = [
"pika >= 1.2.0",
"dataset",
"pymongo > 3.0",
"sdx-pce @ git+https://github.com/atlanticwave-sdx/pce@main",
"sdx-pce @ git+https://github.com/atlanticwave-sdx/pce@3.0.0.dev0",
]

[project.optional-dependencies]
Expand Down

0 comments on commit 305ecd8

Please sign in to comment.