Merge pull request #3 from stephen-zhao/develop/ou/20220127

Develop/ou/20220127

Author: stephen-zhao

MANIFEST.in

@@ -0,0 +1,31 @@
+# ==================== Files to include in the sdist ====================
+
+# config for project's main runnable dev automations
+include Makefile
+
+# Minimum Build System spec (PEP-517/PEP-518)
+include pyproject.toml
+
+# This file, to specify what goes into the source distribution
+include MANIFEST.in
+
+# Setup for building the project's bdist
+include setup.cfg
+
+# Requirements for running the project
+include requirements.in
+
+# Requirements for running the build system and other dev tools
+include requirements-devtime.in
+
+# Project Files
+include LICENSE
+include README*
+
+# Typed marker (PEP-561)
+recursive-include src/ py.typed
+
+# Include test configuration
+include test/conftest.py
+
+prune .venv

Makefile

@@ -1,4 +1,4 @@
-PY_EXE_PATH ?= $(shell which python3.9 || which python3.8 || which python3.7 || which python3.6 || which python3)
+PY_EXE_PATH ?= $(shell which python3.10 || which python3.9 || which python3.8 || which python3.7 || which python3.6 || which python3)
 PY_EXE := $(shell basename $(PY_EXE_PATH))
 
 VENV_DIR := .venv
@@ -58,8 +58,8 @@ $(MARKER_PIPTOOLS): $(MARKER_VENV)
 
 # Requirements input files
 INPUT_DISTTIME_REQUIREMENTS_FILENAME := requirements.in
-INPUT_DEVTIME_REQUIREMENTS_FILENAMES := $(wildcard requirements-devtime.d/*.in)
-ALL_INPUT_REQUIREMENTS_FILENAMES := $(INPUT_DISTTIME_REQUIREMENTS_FILENAME) $(INPUT_DEVTIME_REQUIREMENTS_FILENAMES)
+INPUT_DEVTIME_REQUIREMENTS_FILENAME := requirements-devtime.in
+ALL_INPUT_REQUIREMENTS_FILENAMES := $(INPUT_DISTTIME_REQUIREMENTS_FILENAME) $(INPUT_DEVTIME_REQUIREMENTS_FILENAME)
 
 # Resolve and then Sync requirements
 
@@ -179,7 +179,7 @@ black-fix: $(MARKER_REQUIREMENTS_SYNCED_DEVTIME)
 .PHONY: mypy
 mypy: # Run mypy type-checker
 mypy: $(MARKER_REQUIREMENTS_SYNCED_DEVTIME)
-	$(PY_IN_VENV_EXE) -m mypy --config-file setup.cfg $(package_dir)
+	$(PY_IN_VENV_EXE) -m mypy --config-file setup.cfg --namespace-packages -p $(package)
 
 
 # ==================== Building ====================
@@ -193,17 +193,21 @@ build: $(MARKER_REQUIREMENTS_SYNCED_DEVTIME)
 
 .PHONY: test
 test: $(MARKER_REQUIREMENTS_SYNCED_DEVTIME)
-	$(PY_IN_VENV_EXE) -m pytest --cov=. --cov-fail-under=$(coverage_percent) --cov-config=setup.cfg --cov-report=xml:coverage.xml --cov-report=term-missing --cov-branch $(package_dir) $(test_dir)
+	$(PY_IN_VENV_EXE) -m pytest --cov=src --cov-fail-under=$(coverage_percent) --cov-config=setup.cfg --cov-report=xml:coverage.xml --cov-report=term-missing --cov-branch $(package_dir) $(test_dir)
 
 
 # ==================== Publishing ====================
 
+.PHONY: pre-publish
+pre-publish:
+	$(PY_IN_VENV_EXE) -m twine check dist/*
+
 .PHONY: publish
-publish:
+publish: pre-publish
 	$(PY_IN_VENV_EXE) -m twine upload dist/*
 
 .PHONY: publish-test
-publish-test:
+publish-test: pre-publish
 	$(PY_IN_VENV_EXE) -m twine upload --repository testpypi dist/*
 
 

requirements-devtime.d/build.in

@@ -0,0 +1,18 @@
+# lint
+isort
+mypy
+flake8
+black
+
+# build
+build
+
+# test
+pytest
+pytest-cov
+
+# publish
+twine
+
+# self
+-e .

requirements-devtime.d/lint.in

@@ -2,18 +2,18 @@
 # This file is autogenerated by pip-compile with python 3.8
 # To update, run:
 #
-#    pip-compile --output-file=requirements-devtime.txt requirements-devtime.d/build.in requirements-devtime.d/lint.in requirements-devtime.d/publish.in requirements-devtime.d/test.in requirements.in
+#    pip-compile --output-file=requirements-devtime.txt requirements-devtime.in requirements.in
 #
 -e file:///mnt/c/Projects/Dev/datetime_matcher
-    # via -r requirements-devtime.d/test.in
+    # via -r requirements-devtime.in
 attrs==21.4.0
     # via pytest
 black==21.12b0
-    # via -r requirements-devtime.d/lint.in
+    # via -r requirements-devtime.in
 bleach==4.1.0
     # via readme-renderer
 build==0.7.0
-    # via -r requirements-devtime.d/build.in
+    # via -r requirements-devtime.in
 certifi==2021.10.8
     # via requests
 cffi==1.15.0
@@ -31,7 +31,7 @@ cryptography==36.0.1
 docutils==0.18.1
     # via readme-renderer
 flake8==4.0.1
-    # via -r requirements-devtime.d/lint.in
+    # via -r requirements-devtime.in
 idna==3.3
     # via requests
 importlib-metadata==4.10.1
@@ -41,7 +41,7 @@ importlib-metadata==4.10.1
 iniconfig==1.1.1
     # via pytest
 isort==5.10.1
-    # via -r requirements-devtime.d/lint.in
+    # via -r requirements-devtime.in
 jeepney==0.7.1
     # via
     #   keyring
@@ -51,7 +51,7 @@ keyring==23.5.0
 mccabe==0.6.1
     # via flake8
 mypy==0.931
-    # via -r requirements-devtime.d/lint.in
+    # via -r requirements-devtime.in
 mypy-extensions==0.4.3
     # via
     #   black
@@ -85,10 +85,10 @@ pyparsing==3.0.7
     # via packaging
 pytest==6.2.5
     # via
-    #   -r requirements-devtime.d/test.in
+    #   -r requirements-devtime.in
     #   pytest-cov
 pytest-cov==3.0.0
-    # via -r requirements-devtime.d/test.in
+    # via -r requirements-devtime.in
 readme-renderer==32.0
     # via twine
 requests==2.27.1
@@ -115,7 +115,7 @@ tomli==1.2.3
 tqdm==4.62.3
     # via twine
 twine==3.7.1
-    # via -r requirements-devtime.d/publish.in
+    # via -r requirements-devtime.in
 typing-extensions==4.0.1
     # via
     #   black

requirements-devtime.d/publish.in

@@ -1,6 +1,6 @@
 [metadata]
 name = datetime-matcher
-version = 0.2.0
+version = attr: datetime_matcher.__version__
 author = Stephen Zhao
 author_email = mail@zhaostephen.com
 description = A library which extends regex with support for datetime format codes.
@@ -40,6 +40,7 @@ keywords =
     match
 
 [options]
+include_package_data = True
 package_dir =
     = src
 packages = find:

requirements-devtime.d/test.in

@@ -1 +1,5 @@
+# Semantic Version
+__version__ = "0.2.1"
+
+# Make public names available at top level
 from .datetime_matcher import DatetimeMatcher