refactor: move packaging information to pyproject.toml (#549)

Co-authored-by: epwalsh <[email protected]>
allenai · Apr 17, 2023 · 3638cdc · 3638cdc
1 parent e86ad65
commit 3638cdc
Show file tree

Hide file tree

Showing 15 changed files with 209 additions and 280 deletions.
diff --git a/CONTRIBUTING.md → .github/CONTRIBUTING.md b/CONTRIBUTING.md → .github/CONTRIBUTING.md
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -9,13 +9,12 @@ on:
     branches:
       - main
     paths:
-      - 'Dockerfile'
-      - '.dockerignore'
-      - 'requirements.txt'
-      - 'setup.py'
+      - "Dockerfile"
+      - ".dockerignore"
+      - "pyproject.toml"
   push:
     tags:
-      - 'v*.*.*'
+      - "v*.*.*"
 
 jobs:
   build:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,15 +6,15 @@ concurrency:
 on:
   pull_request:
     branches:
-      - '*'
+      - "*"
   push:
     branches:
       - main
     tags:
-      - 'v*.*.*'
+      - "v*.*.*"
 
 env:
-  CACHE_PREFIX: v3  # Change this to invalidate existing cache.
+  CACHE_PREFIX: v3 # Change this to invalidate existing cache.
   PYTHON_PATH: ./
   DEFAULT_PYTHON: 3.9
   WANDB_API_KEY: ${{ secrets.WANDB_API_KEY }}
@@ -30,12 +30,12 @@ jobs:
     runs-on: [ubuntu-latest]
     timeout-minutes: 30
     permissions:
-      contents: 'read'
-      id-token: 'write'
+      contents: "read"
+      id-token: "write"
     strategy:
       fail-fast: false
       matrix:
-        python: ['3.9']
+        python: ["3.9"]
         task:
           - name: Lint
             extras: dev,all
@@ -54,8 +54,7 @@ jobs:
             requires_torch: true
             run: |
               tango --version
-              python setup.py check
-              python setup.py bdist_wheel sdist
+              python -m build
 
           - name: Style
             extras: dev
@@ -139,18 +138,18 @@ jobs:
               requires_torch: false
               run: |
                 pytest -v --durations=10 --color=yes --doctest-modules --ignore=tests/integrations --ignore=tango/integrations tests/ tango/
-            python: '3.8'
+            python: "3.8"
 
           - task:
               name: Test
               extras: dev
               requires_torch: false
               run: |
                 pytest -v --durations=10 --color=yes --doctest-modules --ignore=tests/integrations --ignore=tango/integrations tests/ tango/
-            python: '3.10'
+            python: "3.10"
 
     steps:
-      - uses: 'actions/checkout@v3'
+      - uses: "actions/checkout@v3"
       - name: Checkout
         if: github.event_name != 'pull_request'
         uses: actions/checkout@v3
@@ -187,7 +186,7 @@ jobs:
         id: virtualenv-cache
         with:
           path: .venv
-          key: ${{ env.CACHE_PREFIX }}-${{ env.WEEK_NUMBER }}-${{ runner.os }}-${{ env.RUNNER_ARCH }}-${{ env.PYTHON_VERSION }}-${{ env.EXTRAS_HASH }}-${{ hashFiles('*requirements.txt') }}
+          key: ${{ env.CACHE_PREFIX }}-${{ env.WEEK_NUMBER }}-${{ runner.os }}-${{ env.RUNNER_ARCH }}-${{ env.PYTHON_VERSION }}-${{ env.EXTRAS_HASH }}-${{ hashFiles('pyproject.toml') }}
 
       - name: Setup virtual environment (no cache hit)
         if: steps.virtualenv-cache.outputs.cache-hit != 'true'
@@ -196,10 +195,11 @@ jobs:
 
       # Reference: https://github.com/marketplace/actions/authenticate-to-google-cloud#setup
       - name: Authenticate to Google Cloud
-        uses: 'google-github-actions/auth@v1'
+        if: matrix.task.name == 'GS integration'
+        uses: "google-github-actions/auth@v1"
         with:
-          workload_identity_provider: 'projects/10554368204/locations/global/workloadIdentityPools/tango-ci-pool/providers/tango-ci-provider'
-          service_account: '[email protected]'
+          workload_identity_provider: "projects/10554368204/locations/global/workloadIdentityPools/tango-ci-pool/providers/tango-ci-provider"
+          service_account: "[email protected]"
 
       - name: Pre-install torch
         if: steps.virtualenv-cache.outputs.cache-hit != 'true' && (contains(matrix.task.extras, 'torch') || contains(matrix.task.extras, 'all') || matrix.task.requires_torch)
@@ -317,7 +317,7 @@ jobs:
 
       - name: Install requirements
         run: |
-          pip install -r dev-requirements.txt
+          pip install -e .[dev]
 
       - name: Prepare environment
         run: |

diff --git a/.github/workflows/update_dependency_pr.yml b/.github/workflows/update_dependency_pr.yml
@@ -1,12 +1,11 @@
-name: Update dependency PR 
+name: Update dependency PR
 
 on:
   pull_request:
     types:
       - opened
     paths:
-      - 'requirements.txt'
-      - 'dev-requirements.txt'
+      - "pyproject.toml"
 
 permissions:
   pull-requests: write

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -7,5 +7,7 @@ sphinx:
 python:
   version: "3.8"
   install:
-    - requirements: requirements.txt
-    - requirements: dev-requirements.txt
+    - method: pip
+      path: .
+      extra_requirements:
+        - dev
diff --git a/Dockerfile b/Dockerfile
@@ -5,11 +5,8 @@ FROM ${BASE_IMAGE}
 
 WORKDIR /stage
 
-COPY requirements.txt requirements.txt
-RUN /opt/conda/bin/pip install --no-cache-dir -r requirements.txt
-
 COPY . .
-RUN /opt/conda/bin/pip install --no-cache-dir --no-deps .[all]
+RUN /opt/conda/bin/pip install --no-cache-dir .[all]
 
 WORKDIR /workspace
 

diff --git a/dev-requirements.txt b/dev-requirements.txt
diff --git a/docs/source/CONTRIBUTING.md b/docs/source/CONTRIBUTING.md
@@ -1 +1 @@
-../../CONTRIBUTING.md
+../../.github/CONTRIBUTING.md
diff --git a/mypy.ini b/mypy.ini