diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b2eb982..14b9a62 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -27,13 +27,13 @@ jobs: - name: Install run: | sudo apt install -y yarn - python -m pip install --upgrade poetry + python -m pip install --editable . + rm -rf blueos_extensions_repository.egg-info mkdir build - name: Build manifest run: | - poetry install - poetry run blueos_repository/consolidate.py + python blueos_repository/consolidate.py mv manifest.json build/ env: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 65db919..4cd7181 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,9 +19,9 @@ jobs: - name: Install dependencies run: | - python -m pip install --upgrade poetry - poetry config virtualenvs.create false - poetry install + python -m pip install --editable '.[dev]' + rm -rf blueos_extensions_repository.egg-info + - name: Run tests run: | ./.hooks/pre-push diff --git a/.gitignore b/.gitignore index 5cc7e90..79a46db 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,6 @@ website/public __pycache__/ *.py[cod] *$py.class + +### Build Info ### +blueos_extensions_repository.egg-info/ diff --git a/pyproject.toml b/pyproject.toml index a76ed2f..ea0d46f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,27 +1,37 @@ # This file is used only for setting up CI. no deployment is done with it -[tool.poetry] +[project] name = "blueos-extensions-repository" version = "0.0.1" description = "Blue Robotics BlueOS Extensions Repository" -authors = ["Blue Robotics "] -license = "MIT" -packages = [{include = "blueos_repository"}] - -[tool.poetry.dependencies] -aiohttp = "3.7.4" -aiohttp-retry = "2.8.3" -json-five = "1.1.1" -python = "^3.10" -semver = "^2.13.0" -dataclass-wizard = "^0.22.3" - -[tool.poetry.dev-dependencies] -black = "22.3.0" -isort = "5.10.1" -mypy = "0.941" -pydantic = "1.9.0" -pylint = "2.14.5" +authors = [ + {name = "Blue Robotics", email = "software@bluerobotics.com"}, +] +license = {text = "MIT License"} +requires-python = ">=3.10" +dependencies = [ + "aiohttp==3.7.4", + "aiohttp-retry==2.8.3", + "json-five==1.1.1", + "semver>=2.13.0", + "dataclass-wizard==0.22.3", +] + +[project.optional-dependencies] +dev = [ + "black==22.3.0", + "isort==5.10.1", + "mypy==0.941", + "pydantic==1.9.0", + "pylint==2.14.5", +] + +[tool.setuptools] +packages = [ + "blueos_repository", + "blueos_repository.docker", + "blueos_repository.extension" +] [tool.black] line-length = 120 @@ -29,21 +39,20 @@ line-length = 120 [tool.isort] profile = "black" -[tool.pylint] - [tool.pylint.master] - enable = "all" - disable = [ - "line-too-long", # We already have this in black. - "locally-disabled", # We know what we are doing, necessary to load plugins in runtime - "missing-class-docstring", - "missing-function-docstring", - "missing-module-docstring", - "suppressed-message", - "wrong-import-position", - ] - - [tool.pylint.miscellaneous] - notes = [ "FIXME" ] # TODO is removed for internal development +[tool.pylint.master] +enable = "all" +disable = [ + "line-too-long", # We already have this in black. + "locally-disabled", # We know what we are doing, necessary to load plugins in runtime + "missing-class-docstring", + "missing-function-docstring", + "missing-module-docstring", + "suppressed-message", + "wrong-import-position", +] + +[tool.pylint.miscellaneous] +notes = ["FIXME"] # TODO is removed for internal development [tool.mypy] allow_untyped_decorators = true