Merge pull request #122 from wetneb/setuptools_upgrade

4 files changed, 55 insertions, 20 deletions

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
new file mode 100644
index 0000000..6dae66e
--- /dev/null
+++ b/.github/workflows/CI.yml
@@ -0,0 +1,43 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
+
+name: Python package
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install flake8 pytest pygit2
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Install git-deps
+      run: |
+        pip install -e .
+    - name: Test with pytest
+      run: |
+        pytest
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 56e4751..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-dist: focal
-virt: lxd
-language: python
-matrix:
-  include:
-  - python: 3.7
-    env: TOX_ENV=py37
-  - python: 3.8
-    env: TOX_ENV=py38
-install:
-- pip install tox
-script:
-- tox -e flake8
-- tox -e $TOX_ENV
diff --git a/setup.cfg b/setup.cfg
index 97318ec..4204b45 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,10 +2,10 @@
 name = git-deps
 summary = automatically detect dependencies between git commits
 author = Adam Spiers
-author-email = git@adamspiers.org
+author_email = git@adamspiers.org
 license = GPL-2+
-home-page = https://github.com/aspiers/git-deps
-description-file = README.md
+home_page = https://github.com/aspiers/git-deps
+description_file = README.md
 classifier =
     Development Status :: 4 - Beta
     Environment :: Console
@@ -27,11 +27,17 @@ console_scripts =
 [files]
 scripts =
     bin/git-fixup
-packages =
-    git_deps
 data_files =
     share/git_deps = share/gitfile-handler.desktop
 
+[options]
+packages =
+    git_deps
+
+[options.entry_points]
+console_scripts =
+    git-deps = git_deps.cli:run
+
 [test]
 # py.test options when running `python setup.py test`
 addopts = tests
diff --git a/setup.py b/setup.py
index 6f11ee4..d36bf64 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ def setup_package():
     setup(
         setup_requires=[
             'six',
-            'pyscaffold>=2.5.10,<2.6a0',
+            'pyscaffold',
         ] + sphinx,
         long_description='README.md',
         long_description_content_type="text/markdown",