move to a more standard folder layout (#83)

Co-authored-by: Javier Cordero <[email protected]>

.github/workflows/ci_psycopg2.yml

@@ -62,5 +62,5 @@ jobs:
       - run: pip install psycopg2
       - run: pip install psycogreen
       - run: pip install gevent
-      - run: python setup.py -q install
+      - run: pip install .
       - run: python runtests_psycopg2.py

.github/workflows/ci_psycopg3.yml

@@ -52,5 +52,5 @@ jobs:
       - run: pip install django==${{ matrix.django-version}}
       - run: pip install psycopg[binary]
       - run: pip install gevent
-      - run: python setup.py -q install
+      - run: pip install .
       - run: python runtests_psycopg3.py

.github/workflows/python-publish.yml

@@ -21,19 +21,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install build
+        pip install hatch
     - name: Build package
       run: python -m build
+    - name: Test package
+      run: hatch run test
     - name: Publish package
-      uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
+      uses: pypa/gh-action-pypi-publish@v1
       with:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 4.0.4
+
+- Fix package
+
+## 4.0.3
+
+- Support for psycopg3
+
 ## 4.0.2
 
 - Fixed eventlet rlock using as context manager, issue #73, @StuBz211

MANIFEST.in

@@ -1,4 +1,4 @@
 include LICENSE AUTHORS.rst README.md
 recursive-include django-db-geventpool *
 recursive-exclude * *.pyc *.swp
-prune django_db_geventpoll/.ropeproject
+prune django_db_geventpool/.ropeproject

django_db_geventpool/__init__.py

@@ -0,0 +1 @@
+version = 'v4.0.4'

pyproject.toml

@@ -0,0 +1,38 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "django-db-geventpool"
+dynamic = ["version"]
+description = "Add a DB connection pool using gevent to django"
+readme = "README.md"
+license = "Apache-2.0"
+authors = [
+    { name = "Javier Cordero Martinez", email = "[email protected]" },
+]
+classifiers = [
+    "Environment :: Web Environment",
+    "Framework :: Django",
+    "Framework :: Django :: 3.1",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: Apache Software License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Topic :: Software Development :: Libraries :: Application Frameworks",
+]
+dependencies = [
+    "django>=3.1",
+]
+
+[project.urls]
+Homepage = "https://github.com/jneight/django-db-geventpool"
+
+[tool.hatch.version]
+path = "django_db_geventpool/__init__.py"
+
+[tool.hatch.build.targets.sdist]
+include = [
+    "/django_db_geventpool",
+]

tests/tests.py

@@ -10,7 +10,7 @@
 def test_multiple_connections(count):
     print("Test {0} starts".format(count))
     for x in range(0, 20):
-        assert len(TestModel.objects.all()) == 1
+        assert not TestModel.objects.exists()
     print("Test {0} ends".format(count))
 
 
@@ -29,9 +29,8 @@ def test_model_save(self):
             self.assertEqual(data[key], getattr(obj, key))
 
     def test_connections(self):
-        TestModel.objects.create()
         greenlets = []
 
         for x in range(0, 50):
             greenlets.append(gevent.spawn(test_multiple_connections, x))
-        gevent.joinall(greenlets)
+        gevent.joinall(greenlets, raise_error=True)