lordwelch/comictagger
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
746c98ad1c
comictagger/Makefile

65 lines
1.8 KiB
Makefile
Raw Normal View History

Update travis hold windows to 3.7.9 as unrar-cffi only has windows wheels for 3.7 switch to using builtin python for macOS remove ssl dlls from comictagger.spec require pyinstaller=4.3 to allow macOS codesigning Update python usage restrict builds to tags and pull requests
2021-09-21 21:26:18 -07:00
PIP ?= pip3
PYTHON ?= python3
VERSION_STR := $(shell $(PYTHON) setup.py --version)
feat: add appveyor configuration
2018-01-17 13:35:10 -08:00
Fix Makefile make check now uses a venv make CI uses the environment Fix rar test
2022-04-19 14:45:36 -07:00
SITE_PACKAGES := $(shell $(PYTHON) -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')
Update GitHub Actions Separate release/packaging and CI Add an ignore for flake8 on ctversion.py as it is generated Cleanup unused portions of the makefile Use 'build' to generate PyPi distribution Python venv on windows uses the Scripts directory
2022-06-07 19:13:44 -07:00
PACKAGE_PATH = $(SITE_PACKAGES)/comictagger.egg-link
Fix Makefile make check now uses a venv make CI uses the environment Fix rar test
2022-04-19 14:45:36 -07:00
VENV := $(shell echo $${VIRTUAL_ENV-venv})
Update documentation Add CONTRIBUTING.md Update install instructions in README Update Build badge in README
2022-04-19 21:55:34 -07:00
PY3 := $(shell command -v $(PYTHON) 2> /dev/null)
Fix Makefile make check now uses a venv make CI uses the environment Fix rar test
2022-04-19 14:45:36 -07:00
PYTHON_VENV := $(VENV)/bin/python
INSTALL_STAMP := $(VENV)/.install.stamp
feat: add appveyor configuration
2018-01-17 13:35:10 -08:00
ifeq ($(OS),Windows_NT)
Update GitHub Actions Separate release/packaging and CI Add an ignore for flake8 on ctversion.py as it is generated Cleanup unused portions of the makefile Use 'build' to generate PyPi distribution Python venv on windows uses the Scripts directory
2022-06-07 19:13:44 -07:00
PYTHON_VENV := $(VENV)/Scripts/python.exe
Appveyor GitHub release (#139)
2019-09-24 15:36:08 -07:00
OS_VERSION=win-$(PROCESSOR_ARCHITECTURE)
feat: add appveyor configuration
2018-01-17 13:35:10 -08:00
APP_NAME=comictagger.exe
Appveyor GitHub release (#139)
2019-09-24 15:36:08 -07:00
FINAL_NAME=ComicTagger-$(VERSION_STR)-$(OS_VERSION).exe
feat: add appveyor configuration
2018-01-17 13:35:10 -08:00
else ifeq ($(shell uname -s),Darwin)
Travis build for macOS build (#100)
2019-09-24 15:30:23 -07:00
OS_VERSION=osx-$(shell defaults read loginwindow SystemVersionStampAsString)-$(shell uname -m)
feat: add appveyor configuration
2018-01-17 13:35:10 -08:00
APP_NAME=ComicTagger.app
Travis build for macOS build (#100)
2019-09-24 15:30:23 -07:00
FINAL_NAME=ComicTagger-$(VERSION_STR)-$(OS_VERSION).app
feat: add appveyor configuration
2018-01-17 13:35:10 -08:00
else
APP_NAME=comictagger
Update GitHub Actions Separate release/packaging and CI Add an ignore for flake8 on ctversion.py as it is generated Cleanup unused portions of the makefile Use 'build' to generate PyPi distribution Python venv on windows uses the Scripts directory
2022-06-07 19:13:44 -07:00
FINAL_NAME=ComicTagger-$(VERSION_STR)-$(shell uname -s)
feat: add appveyor configuration
2018-01-17 13:35:10 -08:00
endif
Update GitHub Actions Separate release/packaging and CI Add an ignore for flake8 on ctversion.py as it is generated Cleanup unused portions of the makefile Use 'build' to generate PyPi distribution Python venv on windows uses the Scripts directory
2022-06-07 19:13:44 -07:00
.PHONY: all clean pydist dist CI check
Code cleanup Remove no longer used google scripts Remove convenience files from comicataggerlib and import comicapi directly Add type-hints to facilitate auto-complete tools Make PyQt5 code more compatible with PyQt6 Implement automatic tooling isort and black for code formatting Line length has been set to 120 flake8 for code standards with exceptions: E203 - Whitespace before ':' - format compatiblity with black E501 - Line too long - flake8 line limit cannot be set E722 - Do not use bare except - fixing bare except statements is a lot of overhead and there are already many in the codebase These changes, along with some manual fixes creates much more readable code. See examples below: diff --git a/comicapi/comet.py b/comicapi/comet.py index d1741c5..52dc195 100644 --- a/comicapi/comet.py +++ b/comicapi/comet.py @@ -166,7 +166,2 @@ class CoMet: - if credit['role'].lower() in set(self.editor_synonyms): - ET.SubElement( - root, - 'editor').text = "{0}".format( - credit['person']) @@ -174,2 +169,4 @@ class CoMet: self.indent(root) + if credit["role"].lower() in set(self.editor_synonyms): + ET.SubElement(root, "editor").text = str(credit["person"]) diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py index 4338176..9219f01 100644 --- a/comictaggerlib/autotagmatchwindow.py +++ b/comictaggerlib/autotagmatchwindow.py @@ -63,4 +63,3 @@ class AutoTagMatchWindow(QtWidgets.QDialog): self.skipButton, QtWidgets.QDialogButtonBox.ActionRole) - self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText( - "Accept and Write Tags") + self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags") diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py index 688907d..dbd0c2e 100644 --- a/comictaggerlib/cli.py +++ b/comictaggerlib/cli.py @@ -293,7 +293,3 @@ def process_file_cli(filename, opts, settings, match_results): if opts.raw: - print(( - "{0}".format( - str( - ca.readRawCIX(), - errors='ignore')))) + print(ca.read_raw_cix()) else:
2022-04-01 16:50:46 -07:00
feat: add appveyor configuration
2018-01-17 13:35:10 -08:00
all: clean dist
added makefile for source git-svn-id: http://comictagger.googlecode.com/svn/trunk@174 6c5673fe-1810-88d6-992b-cd32ca31540c
2012-11-29 21:30:37 -08:00
Fix Makefile make check now uses a venv make CI uses the environment Fix rar test
2022-04-19 14:45:36 -07:00
$(PYTHON_VENV):
@if [ -z $(PY3) ]; then echo "Python 3 could not be found."; exit 2; fi
Update GitHub Actions Separate release/packaging and CI Add an ignore for flake8 on ctversion.py as it is generated Cleanup unused portions of the makefile Use 'build' to generate PyPi distribution Python venv on windows uses the Scripts directory
2022-06-07 19:13:44 -07:00
$(PY3) -m venv $(VENV)
Fix Makefile make check now uses a venv make CI uses the environment Fix rar test
2022-04-19 14:45:36 -07:00
added makefile for source git-svn-id: http://comictagger.googlecode.com/svn/trunk@174 6c5673fe-1810-88d6-992b-cd32ca31540c
2012-11-29 21:30:37 -08:00
clean:
Fix make clean
2022-11-24 09:41:51 -08:00
find . -maxdepth 4 -type d -name "__pycache__" -print -depth -exec rm -rf {} \;
Update GitHub Actions Separate release/packaging and CI Add an ignore for flake8 on ctversion.py as it is generated Cleanup unused portions of the makefile Use 'build' to generate PyPi distribution Python venv on windows uses the Scripts directory
2022-06-07 19:13:44 -07:00
rm -rf $(PACKAGE_PATH) $(INSTALL_STAMP) build dist MANIFEST comictaggerlib/ctversion.py
Code cleanup Remove no longer used google scripts Remove convenience files from comicataggerlib and import comicapi directly Add type-hints to facilitate auto-complete tools Make PyQt5 code more compatible with PyQt6 Implement automatic tooling isort and black for code formatting Line length has been set to 120 flake8 for code standards with exceptions: E203 - Whitespace before ':' - format compatiblity with black E501 - Line too long - flake8 line limit cannot be set E722 - Do not use bare except - fixing bare except statements is a lot of overhead and there are already many in the codebase These changes, along with some manual fixes creates much more readable code. See examples below: diff --git a/comicapi/comet.py b/comicapi/comet.py index d1741c5..52dc195 100644 --- a/comicapi/comet.py +++ b/comicapi/comet.py @@ -166,7 +166,2 @@ class CoMet: - if credit['role'].lower() in set(self.editor_synonyms): - ET.SubElement( - root, - 'editor').text = "{0}".format( - credit['person']) @@ -174,2 +169,4 @@ class CoMet: self.indent(root) + if credit["role"].lower() in set(self.editor_synonyms): + ET.SubElement(root, "editor").text = str(credit["person"]) diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py index 4338176..9219f01 100644 --- a/comictaggerlib/autotagmatchwindow.py +++ b/comictaggerlib/autotagmatchwindow.py @@ -63,4 +63,3 @@ class AutoTagMatchWindow(QtWidgets.QDialog): self.skipButton, QtWidgets.QDialogButtonBox.ActionRole) - self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText( - "Accept and Write Tags") + self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags") diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py index 688907d..dbd0c2e 100644 --- a/comictaggerlib/cli.py +++ b/comictaggerlib/cli.py @@ -293,7 +293,3 @@ def process_file_cli(filename, opts, settings, match_results): if opts.raw: - print(( - "{0}".format( - str( - ca.readRawCIX(), - errors='ignore')))) + print(ca.read_raw_cix()) else:
2022-04-01 16:50:46 -07:00
$(MAKE) -C mac clean
make clean at root does all below git-svn-id: http://comictagger.googlecode.com/svn/trunk@346 6c5673fe-1810-88d6-992b-cd32ca31540c
2013-01-24 22:13:33 -08:00
Update GitHub Actions Separate release/packaging and CI Add an ignore for flake8 on ctversion.py as it is generated Cleanup unused portions of the makefile Use 'build' to generate PyPi distribution Python venv on windows uses the Scripts directory
2022-06-07 19:13:44 -07:00
CI: install
$(PYTHON_VENV) -m black .
$(PYTHON_VENV) -m isort .
$(PYTHON_VENV) -m flake8 .
$(PYTHON_VENV) -m pytest
Fix serialization errors Add tests to ensure issue is fixed Add make check Add pytest to make CI
2022-04-19 13:16:33 -07:00
Fix Makefile make check now uses a venv make CI uses the environment Fix rar test
2022-04-19 14:45:36 -07:00
check: install
Update GitHub Actions Separate release/packaging and CI Add an ignore for flake8 on ctversion.py as it is generated Cleanup unused portions of the makefile Use 'build' to generate PyPi distribution Python venv on windows uses the Scripts directory
2022-06-07 19:13:44 -07:00
$(PYTHON_VENV) -m black --check .
$(PYTHON_VENV) -m isort --check .
$(PYTHON_VENV) -m flake8 .
$(PYTHON_VENV) -m pytest
Code cleanup Remove no longer used google scripts Remove convenience files from comicataggerlib and import comicapi directly Add type-hints to facilitate auto-complete tools Make PyQt5 code more compatible with PyQt6 Implement automatic tooling isort and black for code formatting Line length has been set to 120 flake8 for code standards with exceptions: E203 - Whitespace before ':' - format compatiblity with black E501 - Line too long - flake8 line limit cannot be set E722 - Do not use bare except - fixing bare except statements is a lot of overhead and there are already many in the codebase These changes, along with some manual fixes creates much more readable code. See examples below: diff --git a/comicapi/comet.py b/comicapi/comet.py index d1741c5..52dc195 100644 --- a/comicapi/comet.py +++ b/comicapi/comet.py @@ -166,7 +166,2 @@ class CoMet: - if credit['role'].lower() in set(self.editor_synonyms): - ET.SubElement( - root, - 'editor').text = "{0}".format( - credit['person']) @@ -174,2 +169,4 @@ class CoMet: self.indent(root) + if credit["role"].lower() in set(self.editor_synonyms): + ET.SubElement(root, "editor").text = str(credit["person"]) diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py index 4338176..9219f01 100644 --- a/comictaggerlib/autotagmatchwindow.py +++ b/comictaggerlib/autotagmatchwindow.py @@ -63,4 +63,3 @@ class AutoTagMatchWindow(QtWidgets.QDialog): self.skipButton, QtWidgets.QDialogButtonBox.ActionRole) - self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText( - "Accept and Write Tags") + self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags") diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py index 688907d..dbd0c2e 100644 --- a/comictaggerlib/cli.py +++ b/comictaggerlib/cli.py @@ -293,7 +293,3 @@ def process_file_cli(filename, opts, settings, match_results): if opts.raw: - print(( - "{0}".format( - str( - ca.readRawCIX(), - errors='ignore')))) + print(ca.read_raw_cix()) else:
2022-04-01 16:50:46 -07:00
Update GitHub Actions Separate release/packaging and CI Add an ignore for flake8 on ctversion.py as it is generated Cleanup unused portions of the makefile Use 'build' to generate PyPi distribution Python venv on windows uses the Scripts directory
2022-06-07 19:13:44 -07:00
pydist:
$(PYTHON_VENV) -m build
Added use google of upload tool to makefile git-svn-id: http://comictagger.googlecode.com/svn/trunk@440 6c5673fe-1810-88d6-992b-cd32ca31540c
2013-02-06 11:13:07 -08:00
Fix Makefile make check now uses a venv make CI uses the environment Fix rar test
2022-04-19 14:45:36 -07:00
install: $(INSTALL_STAMP)
$(INSTALL_STAMP): $(PYTHON_VENV) requirements.txt requirements_dev.txt
$(PYTHON_VENV) -m pip install -r requirements_dev.txt
$(PYTHON_VENV) -m pip install -e .
touch $(INSTALL_STAMP)
Update GitHub Actions Separate release/packaging and CI Add an ignore for flake8 on ctversion.py as it is generated Cleanup unused portions of the makefile Use 'build' to generate PyPi distribution Python venv on windows uses the Scripts directory
2022-06-07 19:13:44 -07:00
dist:
feat: add appveyor configuration
2018-01-17 13:35:10 -08:00
pyinstaller -y comictagger.spec
Update GitHub Actions Separate release/packaging and CI Add an ignore for flake8 on ctversion.py as it is generated Cleanup unused portions of the makefile Use 'build' to generate PyPi distribution Python venv on windows uses the Scripts directory
2022-06-07 19:13:44 -07:00
cd dist && zip -m -r $(FINAL_NAME).zip $(APP_NAME)
Copy Permalink