add python 3.10 to testing, update shell.nix (#13)

jpetrucciani · Oct 8, 2021 · d514495 · d514495
1 parent cb9c2cc
commit d514495
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -31,7 +31,7 @@ jobs:
     needs: [archives, mypy, prospector, black]
     strategy:
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
     name: python ${{ matrix.python-version }} tests
     steps:
       - uses: actions/checkout@v2

diff --git a/setup.py b/setup.py
@@ -33,6 +33,7 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
     ],

diff --git a/shell.nix b/shell.nix
@@ -1,10 +1,22 @@
 let
+  nixpkgs = import
+    (
+      fetchTarball {
+        name = "nixos-unstable-2021-08-31";
+        url = "https://github.com/NixOS/nixpkgs/archive/cb021898fab2a19e75d4e10c10c1da69c4e9f331.tar.gz";
+        sha256 = "1hxpp44bg1gwfzcd570wqfvd6am4vk52938zqcwy7mxwjmk6wbrh";
+      }
+    )
+    { };
   mach-nix = import
     (builtins.fetchGit {
       url = "https://github.com/DavHau/mach-nix/";
       ref = "refs/tags/3.3.0";
     })
-    { python = "python3"; };
+    {
+      pkgs = nixpkgs;
+      python = "python39";
+    };
 in
 mach-nix.mkPythonShell {
   requirements = builtins.readFile ./requirements.dev.txt;

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py37,pypy
+envlist = py36,py37,py38,py39,pypy
 
 [testenv]
 deps =