refactor: add support for Python 3.10 (#111)

hugovk · web-flow · commit 175a8fa41b72 · 2022-07-23T21:38:40.000+02:00
* Add support for Python 3.10
* Upgrade Python syntax with pyupgrade --py37-plus
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
@@ -12,13 +12,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
diff --git a/PyGitUp/gitup.py b/PyGitUp/gitup.py
@@ -290,7 +290,7 @@ def rebase_all_branches(self):
                     # we get a detached head after doing our rebase *confused*.
                     # Running self.repo.active_branch would fail.
                     or not self.repo.active_branch.name == original_branch.name):
-                print(colored('returning to {}'.format(original_branch.name),
+                print(colored(f'returning to {original_branch.name}',
                               'magenta'))
                 original_branch.checkout()
 
@@ -470,7 +470,7 @@ def load_config(self):
 
     def config(self, key):
         """ Get a git-up-specific config value. """
-        return self.git.config('git-up.{}'.format(key))
+        return self.git.config(f'git-up.{key}')
 
     def is_prune(self):
         """
diff --git a/PyGitUp/tests/__init__.py b/PyGitUp/tests/__init__.py
@@ -57,7 +57,7 @@ def update_file(repo, commit_message='', counter=[0], filename=testfile_name):
     counter[0] += 1  # See: http://stackoverflow.com/a/279592/997063
 
     path_file = join(repo.working_dir, filename)
-    contents = 'line 1\nline 2\ncounter: {}'.format(counter[0])
+    contents = f'line 1\nline 2\ncounter: {counter[0]}'
     write_file(path_file, contents)
 
     repo.index.add([path_file])
diff --git a/PyGitUp/tests/test_separate_worktree.py b/PyGitUp/tests/test_separate_worktree.py
@@ -9,7 +9,7 @@
 
 test_name = 'worktree'
 repo_path = join(basepath, test_name + os.sep)
-worktree_dir = '{}_worktree'.format(test_name)
+worktree_dir = f'{test_name}_worktree'
 worktree_path = join(basepath, worktree_dir)
 
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -22,6 +22,7 @@ classifiers = [
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
     "Topic :: Software Development :: Version Control",
     "Topic :: Utilities",
 ]

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ classifiers = [`
`22`	`22`	`"Programming Language :: Python :: 3.7",`
`23`	`23`	`"Programming Language :: Python :: 3.8",`
`24`	`24`	`"Programming Language :: Python :: 3.9",`
	`25`	`+ "Programming Language :: Python :: 3.10",`
`25`	`26`	`"Topic :: Software Development :: Version Control",`
`26`	`27`	`"Topic :: Utilities",`
`27`	`28`	`]`