Move to pyproject (#107)

* move to pyproject.toml

* bumped patch version

* added bandit back to dev requirements

* removed references to setup.py

* update black target python version

* update changelog

* wait for release pr to bump version

Author: demianbrecht

.bumpversion.cfg

@@ -1,6 +1,6 @@
 [bumpversion]
 current_version = 0.24.0
 
-[bumpversion:file:setup.py]
+[bumpversion:file:pyproject.toml]
 
 [bumpversion:file:docs/source/conf.py]

.github/workflows/publish-release.yml

@@ -9,74 +9,34 @@ on:
     types: [created]
 
 jobs:
-  build-source:
+  build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.7'
+          python-version: '3.9'
 
       - name: install build dependencies
-        run: pip install wheel
+        run: python -m pip install --upgrade build
 
-      - name: build sdist
-        run: python setup.py sdist
+      - name: build
+        run: python -m build
 
-      - name: cache buildfiles
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-dist-files
+      - uses: actions/upload-artifacts@v2
         with:
-          path: ./dist
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('./dist/**') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build
-            ${{ runner.os }}-
+          path: dist
 
-  build-docs:
+  publish-pypi:
     runs-on: ubuntu-latest
+    needs: [build]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-        with:
-          python-version: '3.7'
-
-      - name: install doc build requirements
-        run: pip install -r requirements-dev.txt -r requirements.txt
-
-      - name: build docs
-        run: cd docs && DJANGO_SETTINGS_MODULE=test.settings make html 
-
-      - name: cache buildfiles
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-docs
+      - uses: actions/download-artifact@v2
         with:
-          path: ./docs/build/html
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('./docs/build/html/**') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build
-            ${{ runner.os }}-
+          name: artifact
+          path: dist
 
-  publish-pypi:
-    runs-on: ubuntu-latest
-    needs: [build-source]
-    steps:
       - uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}
-
-  publish-gh-pages:
-    runs-on: ubuntu-latest
-    needs: [build-docs]
-    steps:
-      - uses: crazy-max/ghaction-github-pages@v2
-        with:
-          target_branch: gh-pages
-          build_dir: docs/build/html
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

AUTHORS

@@ -0,0 +1,14 @@
+# This is the list of django-declarative-apis significant contributors.
+#
+# This does not necessarily list everyone who has contributed code,
+# especially since many employees of one corporation may be contributing.
+# To see the full list of contributors, see the revision history in
+# source control.
+
+Salesforce, Inc.
+Drew Shafer
+Demian Brecht
+Bob Grant
+Hila Manalai
+Rohan Roy
+Evan Grim

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 # [unreleased] - XXXX-XX-XX
 ### Added
 - [PR 106](https://github.com/salesforce/django-declarative-apis/pull/106) Test against Python 3.11 in PR checks
+- [PR 107](https://github.com/salesforce/django-declarative-apis/pull/107) Update to use pyproject.toml
 
 # [0.24.0] - 2022-11-03
 ### Added

Makefile

@@ -8,14 +8,14 @@ TEST_CMD = ${PYTHON} manage.py test --parallel
 TEST_WARNINGS_CMD = ${PYTHON} -Wa manage.py test
 # see .coveragerc for settings
 COVERAGE_CMD = coverage run manage.py test --noinput && coverage xml && coverage report
-STATIC_CMD = flake8 ${PACKAGE_DIR} ${TEST_DIR} ${EXAMPLE_DIR} setup.py
+STATIC_CMD = flake8 ${PACKAGE_DIR} ${TEST_DIR} ${EXAMPLE_DIR}
 VULN_STATIC_CMD = bandit -r -ii -ll -x ${PACKAGE_DIR}/migrations ${PACKAGE_DIR} 
-FORMAT_CMD = black ${PACKAGE_DIR} ${TEST_DIR} ${EXAMPLE_DIR} setup.py
+FORMAT_CMD = black ${PACKAGE_DIR} ${TEST_DIR} ${EXAMPLE_DIR}
 FORMATCHECK_CMD = ${FORMAT_CMD} --check
 
 
 install:
-	pip install --upgrade pip -r requirements.txt -r requirements-dev.txt
+	pip install --upgrade pip install .[dev]
 .PHONY: install
 
 format:

pyproject.toml

@@ -1,6 +1,57 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "django-declarative-apis"
+version = "0.24.0"  # set by bumpversion
+description = "Simple, readable, declarative APIs for Django"
+dynamic = ["readme"]
+dependencies = [
+  "Django >=3.2, <4",
+  "celery>=4.0.2,!=4.1.0",
+  "cryptography>=2.0,<=3.4.8",
+  "decorator==4.0.11",
+  "django-dirtyfields>=1.2.1",
+  "oauthlib[signedtoken,rsa]>=2.0.6,<3.1.0",
+  "pydantic>=1.8"
+]
+keywords = [
+  "django",
+  "rest",
+  "declarative",
+  "api"
+]
+classifiers = [
+  "Development Status :: 3 - Alpha",
+  "Environment :: Web Environment",
+  "Framework :: Django",
+  "Intended Audience :: Developers",
+  "License :: OSI Approved :: MIT License",
+  "Operating System :: OS Independent",
+  "Programming Language :: Python",
+  "Topic :: Internet :: WWW/HTTP",
+]
+
+[project.optional-dependencies]
+dev = [
+  "bandit>=1.7.4",
+  "black==22.3.0",
+  "bumpversion~=0.5",
+  "coverage[toml]==6.3.2",
+  "flake8==4.0.1",
+  "ipython~=7.0",
+  "oauth2==1.9.0.post1",
+  "pyyaml~=6.0",
+  "sphinx_rtd_theme==0.5.2",
+  "tblib~=1.6.0",
+]
+[tool.setuptools.dynamic]
+readme = {file = ["README.md"]}
+
 [tool.black]
 line-length = 88
-target_version = ['py37']
+target_version = ['py39']
 exclude = '''
 ^/(
   (