diff --git a/.github/workflows/tests-core.yaml b/.github/workflows/tests-core.yaml index 5cfbd2d..1a771ac 100644 --- a/.github/workflows/tests-core.yaml +++ b/.github/workflows/tests-core.yaml @@ -44,6 +44,9 @@ jobs: ~/.cache/pip key: poetry-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }} + - name: Clear Poetry PyPI cache + run: poetry cache clear pypi --all + - name: Install dependencies from source only run: poetry install --no-interaction --with dev env: diff --git a/.github/workflows/tests-download.yaml b/.github/workflows/tests-download.yaml index a944633..50bc9da 100644 --- a/.github/workflows/tests-download.yaml +++ b/.github/workflows/tests-download.yaml @@ -38,6 +38,9 @@ jobs: ~/.cache/pip key: poetry-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/poetry.lock') }} + - name: Clear Poetry PyPI cache + run: poetry cache clear pypi --all + - name: Install dependencies from source only run: poetry install --no-interaction --with dev env: diff --git a/src/auto_archiver/modules/gsheet_feeder_db/gsheet_feeder_db.py b/src/auto_archiver/modules/gsheet_feeder_db/gsheet_feeder_db.py index 109be3f..ce552b3 100644 --- a/src/auto_archiver/modules/gsheet_feeder_db/gsheet_feeder_db.py +++ b/src/auto_archiver/modules/gsheet_feeder_db/gsheet_feeder_db.py @@ -88,10 +88,7 @@ class GsheetsFeederDB(Feeder, Database): if len(self.allow_worksheets) and sheet_name not in self.allow_worksheets: # ALLOW rules exist AND sheet name not explicitly allowed return False - if len(self.block_worksheets) and sheet_name in self.block_worksheets: - # BLOCK rules exist AND sheet name is blocked - return False - return True + return not (self.block_worksheets and sheet_name in self.block_worksheets) def missing_required_columns(self, gw: GWorksheet) -> list: missing = []