Move pyproject.toml to root directory (#1058)

* Formatting

Signed-off-by: Mattt Zmuda <mattt@replicate.com>

* Move pyproject.toml to root directory

Signed-off-by: Mattt Zmuda <mattt@replicate.com>

* Remove symlinks to README and LICENSE

Signed-off-by: Mattt Zmuda <mattt@replicate.com>

* Move mypy config to pyproject.toml

Signed-off-by: Mattt Zmuda <mattt@replicate.com>

---------

Signed-off-by: Mattt Zmuda <mattt@replicate.com>

.github/workflows/ci.yaml

@@ -32,7 +32,7 @@ jobs:
           python-version: 3.8
           cache: "pip"
       - name: Install Python dependencies
-        run: pip install -e python -r requirements-dev.txt
+        run: pip install -e . -r requirements-dev.txt
       - name: Build
         run: make cog
       - name: Test
@@ -55,7 +55,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
       - name: Install Python dependencies
-        run: pip install -e python -r requirements-dev.txt
+        run: pip install -e . -r requirements-dev.txt
       - name: Test
         run: make test-python
         env:
@@ -75,7 +75,7 @@ jobs:
           python-version: 3.8
           cache: "pip"
       - name: Install Python dependencies
-        run: pip install -r requirements-dev.txt
+        run: pip install -e . -r requirements-dev.txt
       - name: Test
         run: make test-integration
 
@@ -111,12 +111,12 @@ jobs:
           # install build
           pip install build
           # build package
-          python -m build python/ --wheel
+          python -m build --wheel
           # set output
           echo "version=$(ls python/dist/ | cut -d- -f2)" >> $GITHUB_OUTPUT
       - name: Push Python package
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.PYPI_TOKEN }}
-          packages_dir: python/dist
+          packages_dir: dist

.gitignore

@@ -4,10 +4,10 @@ Untitled*.ipynb
 __pycache__
 .cog
 .hypothesis/
+build
 dist
 *.egg-info
 pkg/dockerfile/embed/cog.whl
-python/build
 # Used by a vim plugin (projectionist)
 .projections.json
 .venv/

CONTRIBUTING.md

@@ -97,7 +97,7 @@ You'll need to [install Go 1.19](https://golang.org/doc/install). If you're usin
 
 Install the Python dependencies:
 
-    pip install -e python -r requirements-dev.txt
+    pip install -r requirements-dev.txt
 
 Once you have Go installed, run:
 

Makefile

@@ -12,8 +12,8 @@ GOOS := $(shell $(GO) env GOOS)
 GOARCH := $(shell $(GO) env GOARCH)
 
 PYTHON := python
-PYTEST := pytest
-MYPY := mypy
+PYTEST := $(PYTHON) -m pytest
+MYPY := $(PYTHON) -m mypy
 
 default: all
 
@@ -22,10 +22,10 @@ all: cog
 
 pkg/dockerfile/embed/cog.whl: python/* python/cog/* python/cog/server/* python/cog/command/*
 	@echo "Building Python library"
-	rm -rf python/dist
-	$(PYTHON) -m pip install build && $(PYTHON) -m build python/ --wheel
+	rm -rf dist
+	$(PYTHON) -m pip install build && $(PYTHON) -m build --wheel
 	mkdir -p pkg/dockerfile/embed
-	cp python/dist/*.whl $@
+	cp dist/*.whl $@
 
 .PHONY: cog
 cog: pkg/dockerfile/embed/cog.whl
@@ -46,7 +46,7 @@ uninstall:
 .PHONY: clean
 clean:
 	$(GO) clean
-	rm -rf python/build python/dist
+	rm -rf build dist
 	rm -f cog
 	rm -f pkg/dockerfile/embed/cog.whl
 
@@ -61,7 +61,7 @@ test-integration: cog
 
 .PHONY: test-python
 test-python:
-	cd python/ && $(PYTEST) -n auto -vv
+	$(PYTEST) -n auto -vv python/tests
 
 .PHONY: test
 test: test-go test-python test-integration

pyproject.toml

@@ -0,0 +1,37 @@
+[build-system]
+requires = ["setuptools", "setuptools_scm[toml]"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "cog"
+description = "Containers for machine learning"
+readme = "README.md"
+authors = [{ name = "Replicate", email = "team@replicate.com" }]
+license.file = "LICENSE"
+urls."Source" = "https://github.com/replicate/cog"
+
+requires-python = ">=3.8"
+dependencies = [
+  # intentionally loose. perhaps these should be vendored to not collide with user code?
+  "attrs>=20.1,<23",
+  "fastapi>=0.75.2,<1",
+  "pydantic>=1.9,<2",
+  "PyYAML",
+  "requests>=2,<3",
+  "structlog>=20,<23",
+  "typing_extensions>=4.1.0",
+  "uvicorn[standard]>=0.12,<1",
+]
+
+dynamic = ["version"]
+
+[tool.setuptools_scm]
+write_to = "python/cog/_version.py"
+
+[tool.mypy]
+disallow_untyped_defs = true
+# TODO: remove this and bring the codebase inline with the current mypy default
+no_implicit_optional = false
+
+[tool.setuptools]
+package-dir = { "" = "python" }