TP works on python 3.10.

Match statements are not implemented (nor are keyword-only arguments),
but the core runs on this platform. At some point, need to implement
these other features.

Author: braxtonmckee

.activate

@@ -0,0 +1,16 @@
+# brief shell script to activate the python-version-specific
+# virtual environments that are built by the makefile.
+#
+# usage: in a bash shell, type
+#
+#    make install # if you havn't already done so
+#    . .activate
+#
+# and you'll get popped into a virtualenv appropriate for your installed version of python
+
+PYTHON_VERSION=`python3 -c 'import sys; print("3_" + str(sys.version_info.minor))'`
+
+echo "Using python environment .venv_$PYTHON_VERSION"
+
+. .venv_$PYTHON_VERSION/bin/activate
+. .env_$PYTHON_VERSION

.github/workflows/python-package.yml

@@ -11,12 +11,14 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-10.15]
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9, '3.10']
         exclude:
           - os: macos-10.15
             python-version: 3.8
           - os: macos-10.15
             python-version: 3.9
+          - os: macos-10.15
+            python-version: '3.10'
     steps:
     - uses: actions/checkout@v2
 
@@ -73,12 +75,14 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-10.15]
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9, '3.10']
         exclude:
           - os: macos-10.15
             python-version: 3.8
           - os: macos-10.15
             python-version: 3.9
+          - os: macos-10.15
+            python-version: '3.10'
     steps:
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2

.gitignore

@@ -18,11 +18,11 @@ object_database/web/content/dist
 
 # leading slash means only match at repo-root level
 /.python-version
-/.venv
+/.venv*
 /.eggs
 /.coverage*
 /.tox
-/.env
+/.env*
 /dist/
 /pip-wheel-metadata/
 /testcert.cert

Makefile

@@ -12,8 +12,11 @@ PYTHON_VERSION = $(shell python3 -c 'import sys; print("3_" + str(sys.version_in
 
 # Path to virtual environment(s)
 VIRTUAL_ENV ?= .venv_$(PYTHON_VERSION)
+ENV ?= .env_$(PYTHON_VERSION)
 NODE_ENV ?= .nodeenv
 
+PIPENV_PIPFILE ?= Pipfile_$(PYTHON_VERSION)
+
 TP_SRC_PATH ?= typed_python
 
 TP_BUILD_PATH ?= build/temp.linux-x86_64/typed_python
@@ -65,6 +68,7 @@ install: install-dependencies install-pre-commit
 .ONESHELL:
 install-dependencies: $(VIRTUAL_ENV)
 	. $(VIRTUAL_ENV)/bin/activate; \
+		export PIPENV_PIPFILE=$(PIPENV_PIPFILE); \
 		pipenv install --dev --deploy
 
 
@@ -107,23 +111,24 @@ clean:
 	rm -rf typed_python.egg-info/
 	rm -f nose.*.log
 	rm -f typed_python/_types.cpython-*.so
-	rm -rf $(VIRTUAL_ENV) .env
+	rm -rf $(VIRTUAL_ENV) $(ENV)
 	rm -f .coverage*
 	rm -fr dist
 
 
 ##########################################################################
 #  HELPER RULES
 
-.env:
-	echo "NOTICE: File Auto-generated by Makefile" > $@
+$(ENV):
+	echo "# NOTICE: File Auto-generated by Makefile" > $@
 	echo "export COVERAGE_PROCESS_START=$(PWD)/tox.ini" >> $@
 	echo "export PYTHONPATH=$(PWD)" >> $@
 
 .ONESHELL:
-$(VIRTUAL_ENV): $(PYTHON) .env
+$(VIRTUAL_ENV): $(PYTHON) $(ENV)
 	$(PYTHON) -m venv $(VIRTUAL_ENV); \
 		. $(VIRTUAL_ENV)/bin/activate; \
+		export PIPENV_PIPFILE=$(PIPENV_PIPFILE); \
 		pip install -U pip; \
 		pip install pipenv; \
 		pip install wheel;

Pipfile_3_10

@@ -0,0 +1,22 @@
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+autopep8 = "*"
+beautifulsoup4 = "*"
+flake8 = "*"
+pytest = "*"
+pre-commit = "*"
+flaky = "*"
+pytest-cov = "*"
+
+[packages]
+sortedcontainers = "*"
+scipy = "==1.8.0"
+llvmlite = "==0.38.0"
+numpy = "==1.22"
+psutil = "*"
+pytz = "*"
+typed_python = {editable = true, path = "."}

Pipfile_3_10.lock

@@ -0,0 +1,21 @@
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+autopep8 = "*"
+beautifulsoup4 = "*"
+flake8 = "*"
+pytest = "*"
+pre-commit = "*"
+flaky = "*"
+pytest-cov = "*"
+
+[packages]
+sortedcontainers = "*"
+llvmlite = "==0.36.0"
+numpy = "<1.20"
+psutil = "*"
+pytz = "*"
+typed_python = {editable = true, path = "."}

Pipfile renamed to Pipfile_3_7

@@ -407,7 +407,7 @@
                 "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
                 "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
             "version": "==1.16.0"
         },
         "soupsieve": {
@@ -423,7 +423,7 @@
                 "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b",
                 "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"
             ],
-            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'",
             "version": "==0.10.2"
         },
         "tomli": {