Updates to Prep for release (#208)

* Minimum `func_adl` package * `pypi` metadata update * release version requirements on `retry` and `requests` * Update CI scrippts * Add `python` 3.11 testing in the matrix.
iris-hep · Feb 15, 2023 · e63a7f2 · e63a7f2
1 parent 45cafb0
commit e63a7f2
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 33 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -5,7 +5,7 @@ on:
   pull_request:
   # Run daily at 0:01 UTC
   schedule:
-    - cron: "1 0 * * *"
+    - cron: "1 0 * * 0"
 
 jobs:
   flake8:
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: Set up Python
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: "3.10"
       - name: Install dependencies
@@ -37,7 +37,7 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -53,14 +53,14 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest, macOS-latest, windows-latest]
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
     runs-on: ${{ matrix.platform }}
     needs: flake8
 
     steps:
       - uses: actions/checkout@master
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -74,8 +74,8 @@ jobs:
           python -m pytest -m "not atlas_xaod_runner and not atlas_r22_xaod_runner and not cms_aod_runner and not cms_miniaod_runner"
       - name: Report coverage with Codecov
         if: github.event_name == 'push' && matrix.python-version == 3.9 && matrix.platform == 'ubuntu-latest'
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          file: ./coverage.xml
+          files: ./coverage.xml
           flags: unittests
diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml
@@ -9,21 +9,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.7
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip build
-    - name: Build the func_adl_xAOD wheel
-      env:
-        func_adl_xaod_version: ${{ github.ref }}
-      run: |
-        python -m build --sdist --wheel
-    - name: Publish func_adl_xAOD to PyPI
-      uses: pypa/[email protected]
-      with:
-        user: __token__
-        password: ${{ secrets.pypi_password_func_adl_xaod }}
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.10
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip build
+      - name: Build the func_adl_xAOD wheel
+        env:
+          func_adl_xaod_version: ${{ github.ref }}
+        run: |
+          python -m build --sdist --wheel
+      - name: Publish func_adl_xAOD to PyPI
+        uses: pypa/[email protected]
+        with:
+          user: __token__
+          password: ${{ secrets.pypi_password_func_adl_xaod }}
diff --git a/setup.py b/setup.py
@@ -33,8 +33,8 @@
     license="TBD",
     test_suite="tests",
     install_requires=[
-        "requests~=2.0",
-        "retry~=0.9",
+        "requests",
+        "retry",
         "jinja2",
         "qastle",
         f"func_adl{version_func_adl}",
@@ -61,21 +61,26 @@
         "local": ["python-on-whales"],
     },
     classifiers=[
-        "Development Status :: 3 - Alpha",
+        # "Development Status :: 3 - Alpha",
         # "Development Status :: 4 - Beta",
-        # "Development Status :: 5 - Production/Stable",
+        "Development Status :: 5 - Production/Stable",
         # "Development Status :: 6 - Mature",
         "Intended Audience :: Developers",
         "Intended Audience :: Information Technology",
         "Programming Language :: Python",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
         "Topic :: Software Development",
         "Topic :: Utilities",
     ],
     package_data={
         "func_adl_xAOD": [
             "template/atlas/r21/*",
             "template/cms/r5/*",
-            "template/atlas/r22/*",
         ],
     },
     platforms="Any",

diff --git a/version_info.py b/version_info.py
@@ -4,6 +4,5 @@
 version_func_adl_xaod = linked_version
 
 
-# Some common dependend items - helps keep the various setup files by putting it in here.
-# version_func_adl = ">=2.2, <3.0a"
-version_func_adl = ">=3.0"
+# Some common dependent items - helps keep the various setup files by putting it in here.
+version_func_adl = ">=3.2"