Merge branch 'main' into master

Author: nicoddemus

.github/workflows/deploy.yml

@@ -0,0 +1,64 @@
+name: deploy
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Release version'
+        required: true
+        default: '1.2.3'
+
+jobs:
+
+  package:
+    runs-on: ubuntu-latest
+    # Required by attest-build-provenance-github.
+    permissions:
+      id-token: write
+      attestations: write
+    env:
+      SETUPTOOLS_SCM_PRETEND_VERSION: ${{ github.event.inputs.version }}
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Build and Check Package
+      uses: hynek/build-and-inspect-python-package@v2.13.0
+      with:
+        attest-build-provenance-github: 'true'
+
+
+  deploy:
+    needs: package
+    runs-on: ubuntu-latest
+    environment: PyPI
+    permissions:
+      id-token: write  # For PyPI trusted publishers.
+      contents: write  # For tag and release notes.
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Download Package
+      uses: actions/download-artifact@v4
+      with:
+        name: Packages
+        path: dist
+
+    - name: Publish package to PyPI
+      uses: pypa/gh-action-pypi-publish@v1.12.4
+      with:
+        attestations: true
+
+    - name: Push tag
+      run: |
+        git config user.name "pytest bot"
+        git config user.email "pytestbot@gmail.com"
+        git tag --annotate --message=v${{ github.event.inputs.version }} v${{ github.event.inputs.version }} ${{ github.sha }}
+        git push origin v${{ github.event.inputs.version }}
+
+    - name: GitHub Release
+      uses: softprops/action-gh-release@v2
+      with:
+        files: dist/*
+        tag_name: v${{ github.event.inputs.version }}

.github/workflows/test.yml

@@ -0,0 +1,69 @@
+name: test
+
+on:
+  push:
+    branches:
+      - main
+      - "test-me-*"
+
+  pull_request:
+
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+
+  package:
+    
+    runs-on: ubuntu-latest
+    
+    permissions:
+      id-token: write
+      attestations: write
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build and Check Package
+        uses: hynek/build-and-inspect-python-package@v2.13.0        
+  
+  test:
+    needs: [package]
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        python: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Download Package
+      uses: actions/download-artifact@v4
+      with:
+        name: Packages
+        path: dist
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python }}
+        allow-prereleases: true
+
+    - name: System dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install xvfb python3-dev libmemcached-dev libmysqlclient-dev memcached libmemcached-tools 
+
+    - name: Install tox
+      run: |
+        python -m pip install --upgrade pip
+        pip install tox
+
+    - name: Test
+      shell: bash
+      run: |
+        tox run -e py --installpkg `find dist/*.tar.gz`

.travis.yml

@@ -0,0 +1,12 @@
+Here are the steps on how to make a new release.
+
+1. Create a ``release-VERSION`` branch from ``upstream/main``.
+2. Update ``CHANGELOG.rst``.
+3. Push the branch to ``upstream``.
+4. Once all tests pass, start the ``deploy`` workflow manually or via:
+
+   ```
+   gh workflow run deploy.yml --repo pytest-dev/pytest-services --ref release-VERSION -f version=VERSION
+   ```
+
+5. Merge the PR.

DEPENDENCIES

@@ -1,3 +1,5 @@
 [build-system]
-requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.4.1"]
+requires = ["setuptools>=61", "setuptools_scm[toml]>=6.2"]
 build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]

MANIFEST.in

@@ -1,8 +1,8 @@
 """Fixtures for mysql."""
 import os
 import shutil
+from textwrap import dedent
 
-from shutil import which
 import pytest
 
 from .process import (
@@ -16,22 +16,28 @@ def mysql_defaults_file(
         run_services, tmp_path_factory, memory_temp_dir, request):
     """MySQL defaults file."""
     if run_services:
-        cfg = tmp_path_factory.mktemp(request.session.name)
+        cfg = tmp_path_factory.mktemp("pytest-services")
         defaults_path = str(cfg / 'defaults.cnf')
 
         with open(defaults_path, 'w+') as fd:
-            fd.write("""
-[mysqld]
-user = {user}
-tmpdir = {tmpdir}
-default-time-zone = SYSTEM
-    """.format(user=os.environ['USER'], tmpdir=memory_temp_dir))
+            user = os.environ["USER"]
+            fd.write(
+                dedent(
+                    f"""
+                    [mysqld]
+                    user = {user}
+                    tmpdir = {memory_temp_dir}
+                    default-time-zone = SYSTEM
+                    """
+                )
+            )
         return defaults_path
+    return None
 
 
 @pytest.fixture(scope='session')
 def mysql_base_dir():
-    my_print_defaults = which('my_print_defaults')
+    my_print_defaults = shutil.which('my_print_defaults')
     assert my_print_defaults, 'You have to install my_print_defaults script.'
 
     return os.path.dirname(os.path.dirname(os.path.realpath(my_print_defaults)))
@@ -49,7 +55,8 @@ def mysql_system_database(
 ):
     """Install database to given path."""
     if run_services:
-        mysqld = which('mysqld')
+        pytest.skip(reason="#50 needs investigation")
+        mysqld = shutil.which('mysqld')
         assert mysqld, 'You have to install mysqld script.'
 
         try:

Makefile

@@ -1,6 +1,3 @@
-# apt-get install xvfb python-dev libmemcached-dev libmysqlclient-dev
-coverage
 mysqlclient
 pylibmc
-pytest-pep8
 astroid