Merge branch 'setup' into develop

.github/requirements.txt

@@ -1,3 +1,5 @@
+distutils-pytest
+git-props
 pathlib ; python_version == '2.7'
 pytest >=3.7.0
-setuptools_scm
+setuptools

.github/workflows/publish-to-pypi.yaml

@@ -0,0 +1,29 @@
+name: Publish
+on:
+  release:
+    types:
+       - published
+jobs:
+  PyPI:
+    name: publish release to PyPI
+    runs-on: ubuntu-latest
+    environment: release
+    permissions:
+      id-token: write
+    env:
+      SDIST: pytest-dependency-${{ github.event.release.tag_name }}.tar.gz
+    steps:
+      - name: Fetch assets
+        uses: cb80/dlassets@latest
+        with:
+          tag: ${{ github.event.release.tag_name }}
+          to: assets
+      - name: Check assets
+        run: |
+          ls -la assets
+      - name: Copy distfile to dist directory
+        run: |
+          mkdir -p dist
+          cp -p assets/$SDIST dist
+      - name: Upload distfile to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/run-tests.yaml

@@ -6,30 +6,28 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - '2.7'
-          - '3.5'
-          - '3.6'
           - '3.7'
           - '3.8'
           - '3.9'
           - '3.10'
+          - '3.11'
+          - '3.12'
         os: [ubuntu-latest]
+        include:
+          - python-version: '3.6'
+            os: ubuntu-20.04
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           pip install -r .github/requirements.txt
-      - name: Build
-        run: |
-          python setup.py build
       - name: Test with pytest
         run: |
-          export PYTHONPATH=$(pwd)/build/lib
-          python -m pytest tests
+          python setup.py test

.gitignore

@@ -1,15 +1,6 @@
-*.pyc
-*~
-.cache/
 __pycache__/
-/.version
+/.env
 /MANIFEST
+/_meta.py
 /build/
 /dist/
-/doc/doctest/
-/doc/doctrees/
-/doc/html/
-/doc/latex/
-/doc/linkcheck/
-/pytest_dependency.egg-info/
-/python2_6.patch

MANIFEST.in

@@ -1,7 +1,7 @@
-include .version
 include LICENSE.txt
 include MANIFEST.in
 include README.rst
+include _meta.py
 include doc/examples/*.py
 include tests/conftest.py
 include tests/pytest.ini

Makefile

@@ -5,8 +5,8 @@ BUILDLIB = $(CURDIR)/build/lib
 build:
 	$(PYTHON) setup.py build
 
-test: build
-	PYTHONPATH=$(BUILDLIB) $(PYTHON) -m pytest tests
+test:
+	$(PYTHON) setup.py test
 
 sdist:
 	$(PYTHON) setup.py sdist
@@ -15,16 +15,17 @@ doc-html: build
 	$(MAKE) -C doc html PYTHONPATH=$(BUILDLIB)
 
 clean:
-	rm -f *~ tests/*~
 	rm -rf build
+	rm -rf __pycache__
 
 distclean: clean
-	rm -rf .cache tests/.cache .pytest_cache tests/.pytest_cache
-	rm -f *.pyc tests/*.pyc
-	rm -rf __pycache__ tests/__pycache__
-	rm -f MANIFEST .version
+	rm -f MANIFEST _meta.py
 	rm -rf dist
-	rm -rf pytest_dependency.egg-info
+	rm -rf tests/.pytest_cache
 	$(MAKE) -C doc distclean
 
-.PHONY: build test sdist doc-html clean distclean
+meta:
+	$(PYTHON) setup.py meta
+
+
+.PHONY: build test sdist doc-html clean distclean meta

README.rst

@@ -31,19 +31,23 @@ The latest release version can be found `at PyPI`__.
 System requirements
 -------------------
 
-+ Python 2.7 or 3.4 and newer.
++ Python 3.4 and newer.
 + `setuptools`_.
 + `pytest`_ 3.7.0 or newer.
 
 Optional library packages:
 
-+ `setuptools_scm`_
++ `git-props`_
 
-  The version number is managed using this package.  All source
-  distributions add a static text file with the version number and
-  fall back using that if `setuptools_scm` is not available.  So this
-  package is only needed to build out of the plain development source
-  tree as cloned from GitHub.
+  This package is used to extract some metadata such as the version
+  number out of git, the version control system.  All releases embed
+  that metadata in the distribution.  So this package is only needed
+  to build out of the plain development source tree as cloned from
+  GitHub, but not to build a release distribution.
+
++ `distutils-pytest`_ >= 0.2
+
+  Only needed to run the test suite.
 
 
 Installation
@@ -57,7 +61,7 @@ Installation
 
 3. Test (optional)::
 
-     $ PYTHONPATH=build/lib python -m pytest tests
+     $ python setup.py test
 
 4. Install::
 
@@ -101,5 +105,6 @@ permissions and limitations under the License.
 .. _PyPI site: https://pypi.org/project/pytest-dependency/
 .. _setuptools: http://pypi.python.org/pypi/setuptools/
 .. _pytest: http://pytest.org/
-.. _setuptools_scm: https://github.com/pypa/setuptools_scm/
+.. _git-props: https://github.com/RKrahl/git-props
+.. _distutils-pytest: https://github.com/RKrahl/distutils-pytest
 .. _Read the Docs site: https://pytest-dependency.readthedocs.io/

doc/.gitignore

@@ -0,0 +1,18 @@
+/devhelp/
+/dirhtml/
+/doctrees/
+/epub/
+/gettext/
+/html/
+/htmlhelp/
+/json/
+/latex/
+/linkcheck/
+/man/
+/pickle/
+/pseudoxml/
+/qthelp/
+/singlehtml/
+/texinfo/
+/text/
+/xml/

doc/src/changelog.rst

@@ -2,16 +2,23 @@ History of changes to pytest-dependency
 =======================================
 
 dev (not yet released)
+    Incompatible changes
+      + Drop support for Python 2.
+
     Bug fixes and minor changes
       + `#40`_: add logging.
       + `#50`_, `#51`_: test suite incompatibility with pytest 6.2.0.
       + `#58`_: declare the type of automark_dependency ini-option
 	correctly as bool.
 
+    Internal
+      + `#75`_: review build tool chain.
+
 .. _#40: https://github.com/RKrahl/pytest-dependency/issues/40
 .. _#50: https://github.com/RKrahl/pytest-dependency/issues/50
 .. _#51: https://github.com/RKrahl/pytest-dependency/pull/51
 .. _#58: https://github.com/RKrahl/pytest-dependency/pull/58
+.. _#75: https://github.com/RKrahl/pytest-dependency/pull/75
 
 0.5.1 (2020-02-14)
     Bug fixes and minor changes

python-pytest-dependency.spec

@@ -0,0 +1,60 @@
+%bcond_without tests
+%global distname pytest-dependency
+
+%if 0%{?sle_version} >= 150500
+%global pythons python3 python311
+%else
+%{?!python_module:%define python_module() python3-%{**}}
+%define skip_python2 1
+%endif
+
+Name:		python-%{distname}
+Version:	$version
+Release:	0
+Summary:	$description
+License:	Apache-2.0
+URL:		$url
+Group:		Development/Languages/Python
+Source:		https://github.com/RKrahl/pytest-dependency/releases/download/%{version}/%{distname}-%{version}.tar.gz
+BuildRequires:	%{python_module base >= 3.4}
+BuildRequires:	%{python_module setuptools}
+BuildRequires:	fdupes
+BuildRequires:	python-rpm-macros
+%if %{with tests}
+BuildRequires:	%{python_module distutils-pytest}
+BuildRequires:	%{python_module pytest >= 3.7}
+%endif
+Requires:	python-pytest >= 3.7
+BuildArch:	noarch
+%python_subpackages
+
+%description
+$long_description
+
+
+%prep
+%setup -q -n %{distname}-%{version}
+
+
+%build
+%python_build
+
+
+%install
+%python_install
+%fdupes %{buildroot}%{python_sitelib}
+
+
+%if %{with tests}
+%check
+%python_expand $$python setup.py test
+%endif
+
+
+%files %{python_files}
+%license LICENSE.txt
+%doc README.rst
+%{python_sitelib}/*
+
+
+%changelog