From f7b688ed60a717cd7f58153d7288f002672bda32 Mon Sep 17 00:00:00 2001 From: thatgirlginger Date: Mon, 21 Sep 2026 21:18:47 -0500 Subject: [PATCH 1/3] updated lxml requirement --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fd12516..476d90d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ charade==1.0.3 Genshi==0.7.7 ipaddr==2.2.0 keyring==24.2.0 -lxml==4.9.3 +lxml==6.1.3 ndg_httpsclient==0.5.1 pyasn1==0.5.0 pytest==7.4.3 From 621f594366bf77426afc41b5d32c0ec6820d5b6b Mon Sep 17 00:00:00 2001 From: thatgirlginger Date: Wed, 23 Sep 2026 12:40:36 -0500 Subject: [PATCH 2/3] updated Args, OD-1715 --- shared_python/Args.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/shared_python/Args.py b/shared_python/Args.py index b543b99..2fa2b8f 100755 --- a/shared_python/Args.py +++ b/shared_python/Args.py @@ -43,9 +43,6 @@ def _process_args(self): ) # General archive-specific settings - parser.add_argument( - "-a", "--archive_type", type=str, choices=["AA"], help="Type of archive: AA" - ) parser.add_argument( "-df", "--default_fandom", type=str, help="Default fandom to use" ) @@ -155,9 +152,6 @@ def _process_args(self): else args.archive_name ) - while args.archive_type is None or args.archive_type not in ["AA"]: - args.archive_type = input("Type of archive (AA): ") - return args def _print_args(self, args): From 1b0a59df06fd854c527c3f7ca84dea1822b8791d Mon Sep 17 00:00:00 2001 From: Harlan Lieberman-Berg Date: Thu, 15 Oct 2026 22:07:16 -0400 Subject: [PATCH 3/3] Delete Mac/Windows GH Workflow Unfortunately, this workflow is no longer working. It is never getting picked up by github runners, and debugging it isn't worth it right now. It's easy enough to recreate if we need it, and with more modern Python to boot. --- .../workflows/python-app-macos-windows.yml | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 .github/workflows/python-app-macos-windows.yml diff --git a/.github/workflows/python-app-macos-windows.yml b/.github/workflows/python-app-macos-windows.yml deleted file mode 100644 index ec824a5..0000000 --- a/.github/workflows/python-app-macos-windows.yml +++ /dev/null @@ -1,40 +0,0 @@ -# This workflow will install Python dependencies, run tests and lint with a single version of Python -# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions - -name: MacOS + Windows tests - OTW Open Doors eFiction Converter - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - build: - - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ macos-13, windows-latest ] # Using macos-13 since macos-latest no longer supports 3.8 - - steps: - - uses: actions/checkout@v2 - - name: Set up Python 3.8.9 - uses: actions/setup-python@v2 - with: - python-version: 3.8.9 - - name: Install dependencies - shell: bash - run: | - python -m pip install --upgrade pip - pip install pytest - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - - name: Lint with ruff - run: | - ruff check . - - name: Check formatting with ruff - run: | - ruff format --check . - - name: Test with pytest - exclude MySQL integration tests - run: | - pytest --ignore "test/test_multitag_mapping.py" --ignore "test/test_percent_symbol.py" --ignore "test/test_tags_length.py" --ignore "test/test_step_05.py"