Merge branch 'main' into feature/increase-test-coverage

tj-django · Aug 8, 2021 · d5f2f27 · d5f2f27
2 parents a7967f2 + 26cfe7d
commit d5f2f27
Show file tree

Hide file tree

Showing 16 changed files with 401 additions and 227 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,20 @@
+version: 2
+updates:
+  - package-ecosystem: pip
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+      - "dependabot"
+      - "automerge"
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+      - "dependabot"
+      - "automerge"
diff --git a/.github/workflows/codacy-analysis.yml b/.github/workflows/codacy-analysis.yml
@@ -0,0 +1,49 @@
+# This workflow checks out code, performs a Codacy security scan
+# and integrates the results with the
+# GitHub Advanced Security code scanning feature.  For more information on
+# the Codacy security scan action usage and parameters, see
+# https://github.com/codacy/codacy-analysis-cli-action.
+# For more information on Codacy Analysis CLI in general, see
+# https://github.com/codacy/codacy-analysis-cli.
+
+name: Codacy Security Scan
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+  schedule:
+    - cron: '15 16 * * 2'
+
+jobs:
+  codacy-security-scan:
+    name: Codacy Security Scan
+    runs-on: ubuntu-latest
+    steps:
+      # Checkout the repository to the GitHub Actions runner
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
+      - name: Run Codacy Analysis CLI
+        uses: codacy/codacy-analysis-cli-action@4.0.0
+        with:
+          # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
+          # You can also omit the token and run the tools that support default configurations
+          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
+          verbose: true
+          output: results.sarif
+          format: sarif
+          # Adjust severity of non-security issues
+          gh-code-scanning-compat: true
+          # Force 0 exit code to allow SARIF file generation
+          # This will handover control about PR rejection to the GitHub side
+          max-allowed-issues: 2147483647
+
+      # Upload the SARIF file generated in the previous step
+      - name: Upload SARIF results file
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: results.sarif
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,6 +22,7 @@ jobs:
     runs-on: ${{ matrix.platform }}
     strategy:
       fail-fast: false
+      max-parallel: 10
       matrix:
         platform: [ubuntu-latest, macos-latest, windows-latest]
         python-version: [3.6, 3.7, 3.8, 3.9, '3.10.0-beta.1']
@@ -76,7 +77,7 @@ jobs:
           coverage-reports: coverage.xml
 
       - name: "Upload coverage to Codecov"
-        uses: codecov/codecov-action@v1.5.2
+        uses: codecov/codecov-action@v2.0.2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,7 +6,7 @@ repos:
         args: ['--in-place', '--remove-all-unused-imports', '--remove-unused-variable']
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.9.2
+    rev: 5.9.3
     hooks:
       - id: isort
         args: ["--profile", "black", "--filter-files"]
@@ -20,7 +20,7 @@ repos:
         exclude: ^docs/.*|.*.md
 
   - repo: https://github.com/psf/black
-    rev: 21.6b0
+    rev: 21.7b0
     hooks:
       - id: black
         language_version: python3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,19 +1,78 @@
 # Changelog
 
-## [v1.1.0](https://github.com/tj-django/django-migration-fixer/tree/v1.1.0) (2021-07-09)
+## [v1.1.4](https://github.com/tj-django/django-migration-fixer/tree/v1.1.4) (2021-08-04)
 
-[Full Changelog](https://github.com/tj-django/django-migration-fixer/compare/v1.0.7...v1.1.0)
+[Full Changelog](https://github.com/tj-django/django-migration-fixer/compare/v1.1.3...v1.1.4)
 
-**Implemented enhancements:**
+**Fixed bugs:**
 
-- \[Testing\]: Setup django-test-migrations [\#30](https://github.com/tj-django/django-migration-fixer/issues/30)
+- \[BUG\] Doesn't work with multiple remotes [\#117](https://github.com/tj-django/django-migration-fixer/issues/117)
+
+**Merged pull requests:**
+
+- Pull changes from a specific remote defaults to origin [\#118](https://github.com/tj-django/django-migration-fixer/pull/118) ([jackton1](https://github.com/jackton1))
+- Updated README.md [\#116](https://github.com/tj-django/django-migration-fixer/pull/116) ([jackton1](https://github.com/jackton1))
+- Updated README.md [\#115](https://github.com/tj-django/django-migration-fixer/pull/115) ([jackton1](https://github.com/jackton1))
+- Upgraded v1.1.2 → v1.1.3 [\#114](https://github.com/tj-django/django-migration-fixer/pull/114) ([jackton1](https://github.com/jackton1))
+- Updated README.md [\#113](https://github.com/tj-django/django-migration-fixer/pull/113) ([jackton1](https://github.com/jackton1))
+- Updated README.md [\#112](https://github.com/tj-django/django-migration-fixer/pull/112) ([jackton1](https://github.com/jackton1))
+
+## [v1.1.3](https://github.com/tj-django/django-migration-fixer/tree/v1.1.3) (2021-08-02)
+
+[Full Changelog](https://github.com/tj-django/django-migration-fixer/compare/v1.1.2...v1.1.3)
 
 **Closed issues:**
 
 - Dependency Dashboard [\#40](https://github.com/tj-django/django-migration-fixer/issues/40)
 
 **Merged pull requests:**
 
+- Updated README.md [\#109](https://github.com/tj-django/django-migration-fixer/pull/109) ([jackton1](https://github.com/jackton1))
+- Bump tox from 3.24.0 to 3.24.1 [\#107](https://github.com/tj-django/django-migration-fixer/pull/107) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Update dependency Django to v3.2.6 [\#106](https://github.com/tj-django/django-migration-fixer/pull/106) ([renovate[bot]](https://github.com/apps/renovate))
+- Update precommit hook pycqa/isort to v5.9.3 [\#105](https://github.com/tj-django/django-migration-fixer/pull/105) ([renovate[bot]](https://github.com/apps/renovate))
+- Fixed bug with changed\_files [\#104](https://github.com/tj-django/django-migration-fixer/pull/104) ([jackton1](https://github.com/jackton1))
+- Bump twine from 3.4.1 to 3.4.2 [\#103](https://github.com/tj-django/django-migration-fixer/pull/103) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump mkdocs from 1.1.2 to 1.2.2 [\#102](https://github.com/tj-django/django-migration-fixer/pull/102) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump portray from 1.6.0 to 1.7.0 [\#101](https://github.com/tj-django/django-migration-fixer/pull/101) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump tox from 3.23.1 to 3.24.0 [\#100](https://github.com/tj-django/django-migration-fixer/pull/100) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Update codecov/codecov-action action to v2.0.2 [\#97](https://github.com/tj-django/django-migration-fixer/pull/97) ([renovate[bot]](https://github.com/apps/renovate))
+- Update codacy/codacy-analysis-cli-action action to v4 [\#96](https://github.com/tj-django/django-migration-fixer/pull/96) ([renovate[bot]](https://github.com/apps/renovate))
+- \[pre-commit.ci\] pre-commit autoupdate [\#95](https://github.com/tj-django/django-migration-fixer/pull/95) ([pre-commit-ci[bot]](https://github.com/apps/pre-commit-ci))
+- Update codacy/codacy-analysis-cli-action action to v3 [\#94](https://github.com/tj-django/django-migration-fixer/pull/94) ([renovate[bot]](https://github.com/apps/renovate))
+- Upgraded v1.1.1 → v1.1.2 [\#93](https://github.com/tj-django/django-migration-fixer/pull/93) ([jackton1](https://github.com/jackton1))
+
+## [v1.1.2](https://github.com/tj-django/django-migration-fixer/tree/v1.1.2) (2021-07-19)
+
+[Full Changelog](https://github.com/tj-django/django-migration-fixer/compare/v1.1.1...v1.1.2)
+
+**Merged pull requests:**
+
+- Update codecov/codecov-action action to v2 [\#92](https://github.com/tj-django/django-migration-fixer/pull/92) ([renovate[bot]](https://github.com/apps/renovate))
+- Update dependency mkdocs to v1.2.2 [\#91](https://github.com/tj-django/django-migration-fixer/pull/91) ([renovate[bot]](https://github.com/apps/renovate))
+- Upgraded v1.1.0 → v1.1.1 [\#90](https://github.com/tj-django/django-migration-fixer/pull/90) ([jackton1](https://github.com/jackton1))
+
+## [v1.1.1](https://github.com/tj-django/django-migration-fixer/tree/v1.1.1) (2021-07-18)
+
+[Full Changelog](https://github.com/tj-django/django-migration-fixer/compare/v1.1.0...v1.1.1)
+
+**Merged pull requests:**
+
+- Updated README.md [\#89](https://github.com/tj-django/django-migration-fixer/pull/89) ([jackton1](https://github.com/jackton1))
+- Increased test coverage. [\#88](https://github.com/tj-django/django-migration-fixer/pull/88) ([jackton1](https://github.com/jackton1))
+- Updated README.md [\#87](https://github.com/tj-django/django-migration-fixer/pull/87) ([jackton1](https://github.com/jackton1))
+- Upgraded v1.0.7 → v1.1.0 [\#86](https://github.com/tj-django/django-migration-fixer/pull/86) ([jackton1](https://github.com/jackton1))
+
+## [v1.1.0](https://github.com/tj-django/django-migration-fixer/tree/v1.1.0) (2021-07-09)
+
+[Full Changelog](https://github.com/tj-django/django-migration-fixer/compare/v1.0.7...v1.1.0)
+
+**Implemented enhancements:**
+
+- \[Testing\]: Setup django-test-migrations [\#30](https://github.com/tj-django/django-migration-fixer/issues/30)
+
+**Merged pull requests:**
+
 - Increased test coverage [\#85](https://github.com/tj-django/django-migration-fixer/pull/85) ([jackton1](https://github.com/jackton1))
 - Update precommit hook pycqa/isort to v5.9.2 [\#84](https://github.com/tj-django/django-migration-fixer/pull/84) ([renovate[bot]](https://github.com/apps/renovate))
 - Upgraded v1.0.6 → v1.0.7 [\#83](https://github.com/tj-django/django-migration-fixer/pull/83) ([jackton1](https://github.com/jackton1))

diff --git a/Makefile b/Makefile
@@ -38,7 +38,7 @@ clean-pyc:  ## remove Python file artifacts
 	@find . -name '*.pyc' -exec rm -f {} +
 	@find . -name '*.pyo' -exec rm -f {} +
 	@find . -name '*~' -exec rm -f {} +
-	@find . -name '__pycache__' -exec rm -fr {} +
+	@find . -name '__pycache__' -exec rm -fr {} + || true
 
 clean-test:  ## remove test and coverage artifacts
 	@rm -fr .tox/
@@ -105,7 +105,9 @@ install-deploy: install-wheel
 	@pip install -e .'[deploy]'
 
 test: install-test
-	@pytest --basetemp={envtmpdir}
+	@pytest -E invalid_repo
+	@pytest -E utils
+
 
 migrations:
 	@python manage.py makemigrations