diff --git a/Dockerfile b/Dockerfile index 479b8932..3d9eee89 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,13 @@ WORKDIR /mnt RUN pip install --no-cache-dir \ beautifulsoup4 dnspython pyxdg requests cchardet polib -RUN pip install --no-cache-dir \ - https://github.com/linkchecker/linkchecker/archive/master.zip +RUN set -x \ + && apt-get update -qq \ + && apt-get install -y -qq --no-install-recommends git \ + && pip install --no-cache-dir git+https://github.com/linkchecker/linkchecker.git \ + && apt-get -y -qq purge git \ + && apt-get autoremove -y -qq \ + && apt-get clean -y -qq all \ + && rm -rf /var/lib/apt/lists/* ENTRYPOINT ["linkchecker"] diff --git a/MANIFEST.in b/MANIFEST.in index 0c87f836..67fa93c9 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -79,3 +79,5 @@ recursive-include windows \ *.cer \ *.pfx \ *.pvk + +prune .github/ diff --git a/doc/development.md b/doc/development.md index 6d1d94a3..47c0e428 100644 --- a/doc/development.md +++ b/doc/development.md @@ -59,7 +59,7 @@ Release process 1. check whether updated translations need committing (`make locale; make -C doc locale; make -C doc man`) -2. bump AppVersion in `setup.py`, edit `changelog.txt`, and if applicable the +2. edit `changelog.txt`, and if applicable the copyright date in `linkcheck/configuration/__init__.py` 3. confirm tests have passed @@ -74,6 +74,4 @@ Release process 8. check distribution files (`twine check dist/*`) and upload to PyPI (`twine upload dist/*`) -9. create release (vX.Y.Z) on GitHub (GitHub creates the .tar.gz and .zip archives) - -10. increment AppVersion to vX.Y.Z+1.dev0 +9. create release (vX.Y.Z) on GitHub (warn users about GitHub archives) diff --git a/doc/src/conf.py b/doc/src/conf.py index 01b0a523..2d27be15 100644 --- a/doc/src/conf.py +++ b/doc/src/conf.py @@ -4,12 +4,11 @@ sys.path.insert(0, os.path.abspath('../..')) # -- Project information ----------------------------------------------------- -from datetime import date import linkcheck.configuration project = 'LinkChecker' copyright = linkcheck.configuration.Copyright.split("Copyright (C) ")[1] -version = str(date.today()) +version = linkcheck.configuration.Version release = version # -- General configuration --------------------------------------------------- diff --git a/setup.py b/setup.py index a33a6cec..fc8971cd 100755 --- a/setup.py +++ b/setup.py @@ -53,8 +53,6 @@ except ImportError: else: COMPILE_TRANSLATIONS = True -# the application version -AppVersion = "10.0.1" # the application name AppName = "LinkChecker" Description = "check links in web documents or full websites" @@ -336,7 +334,10 @@ if os.name == "posix": setup( name=AppName, - version=AppVersion, + use_scm_version={ + "local_scheme": "node-and-timestamp", + "version_scheme": "post-release", + }, description=Description, keywords="link,url,site,checking,crawling,verification,validation", author=myname, @@ -371,6 +372,7 @@ setup( options={}, # Requirements, usable with setuptools or the new Python packaging module. python_requires=">= 3.6", + setup_requires=["setuptools_scm"], install_requires=[ "requests >= 2.4", "dnspython >= 2.0",