diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index c2b701c..0e0eecc 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -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/hadolint-action@v3.1.0 - # with: - # dockerfile: Dockerfile + - name: Lint sdx-controller Dockerfile + uses: hadolint/hadolint-action@v3.1.0 + with: + dockerfile: Dockerfile - name: Lint bapm-server Dockerfile uses: hadolint/hadolint-action@v3.1.0 with: dockerfile: bapm_server/Dockerfile - diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f6c20fa..7a482f2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,10 +41,10 @@ jobs: fail-fast: false matrix: python-version: - - "3.8" - "3.9" - "3.10" - "3.11" + - "3.12" steps: diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..5b3c129 --- /dev/null +++ b/.mailmap @@ -0,0 +1,8 @@ +Cong Wang +Cong Wang +Cong Wang +Cong Wang +Cong Wang +Cong Wang +Italo Valcy +Sajith Sasidharan diff --git a/Dockerfile b/Dockerfile index 3d2c391..af42244 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/pyproject.toml b/pyproject.toml index df3a754..38d29ba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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 = "yxin@renci.org" }, { name = "Cong Wang", email = "cwang@renci.org" }, { name = "Sajith Sasidharan", email = "sajith@renci.org" }, + { name = "Italo Valcy", email = "italo@ampath.net" }, ] readme = "README.md" -requires-python = ">=3.8" +requires-python = ">=3.9" license = {file = "LICENSE"} classifiers = [ "Programming Language :: Python :: 3", @@ -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]