fixes

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
         python-version: ${{ matrix.python }}
     - name: "Install dependencies"
       run: |
-        python -m pip install --upgrade pip
+        # python -m pip install --upgrade pip
         python -m pip install pytest
         python -m pip install mock
         python -m pip install flake8
@@ -44,7 +44,7 @@ jobs:
         flake8 . --count --exit-zero --max-complexity=10 --max-line-length=80 --statistics
     - name: "Build and test"
       run: |
-        python -m build -s
+        python -m build --no-isolation
         pip install dist/dominate*.tar.gz
         pytest
     - name: Coveralls

MANIFEST.in

@@ -1,6 +1,7 @@
 include README.md
 include LICENSE.txt
 include pyproject.toml
+include setup/setup.py
 recursive-include tests *
 global-exclude __pycache__
 global-exclude *.pyc

Makefile

@@ -1,12 +1,17 @@
 test:
-	python2 -m pytest .
+	-python2 -m pytest .
 	python3 -m pytest .
 
-publish: clean test
+publish_old: clean test
 	python3 setup/setup.py sdist
 	python3 setup/setup.py bdist_wheel
 	python3 -m twine upload dist/*
 
+publish: clean test
+	python3 -m build --no-isolation
+	python3 -m twine upload dist/*
+
 clean:
 	-rm dist/ -r
+	-rm build/ -r
 	-rm *.egg-info/ -r

dominate/_version.py

@@ -1 +1 @@
-__version__ = '2.8.0'
+__version__ = '2.9.0'

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools"]
+requires = ["setuptools>=62"]
 build-backend = "setuptools.build_meta"
 
 [project]

setup.cfg

@@ -1,6 +1,5 @@
 [metadata]
-license_file = LICENSE.txt
+license_files = ["LICENSE.txt"]
 
 [bdist_wheel]
 universal=1
-

tests/test_dominate.py

@@ -1,18 +1,6 @@
-import pytest
-
-import dominate
-from dominate import tags
-from dominate import util
 
 def test_version():
   import dominate
-  version = '2.8.0'
+  version = '2.9.0'
   assert dominate.version == version
   assert dominate.__version__ == version
-
-
-def test_context():
-  id1 = dominate.dom_tag._get_thread_context()
-  id2 = dominate.dom_tag._get_thread_context()
-  assert id1 == id2
-

tests/test_utils.py

@@ -1,9 +1,13 @@
-import pytest
-
+import dominate
 from dominate.tags import *
 from dominate import util
 
 
+def test_context():
+  id1 = dominate.dom_tag._get_thread_context()
+  id2 = dominate.dom_tag._get_thread_context()
+  assert id1 == id2
+
 def test_include():
   import os
   try:
@@ -53,4 +57,3 @@ def test_container():
 '''<div>
   <h1>a</h1>
 </div>'''
-