Move code to toplevel pretix_ldap/ and tests to toplevel tests/

Sohalt · Apr 15, 2024 · cafd70d · cafd70d
1 parent 9458554
commit cafd70d
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 19 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -11,7 +11,6 @@ __pycache__/
 env/
 build/
 develop-eggs/
-dist/
 downloads/
 eggs/
 .eggs/

diff --git a/Dockerfile b/Dockerfile
diff --git a/README.rst b/README.rst
@@ -71,18 +71,24 @@ Development setup
 Running CI linter and tests locally
 -----------------------------------
 
-1. [Install nix](https://github.com/DeterminateSystems/nix-installer)
+1. `Install nix`_
 
 2. Enter devshell: `nix develop`
 
-3. Run linter::
+3. Build package::
+
+    python -m build
+
+4. Run linter::
 
-    cd src/
     flake8
 
-4. Run tests::
+5. Run tests::
+
+    cp -r dist tests
+
+    cd tests
 
-    cd src/tests
     pytest
 
 
@@ -98,3 +104,4 @@ Released under the terms of the Apache License 2.0
 
 .. _pretix: https://github.com/pretix/pretix
 .. _pretix development setup: https://docs.pretix.eu/en/latest/development/setup.html
+.. _Install nix: https://github.com/DeterminateSystems/nix-installer
diff --git a/src/pretix_ldap/__init__.py → pretix_ldap/__init__.py b/src/pretix_ldap/__init__.py → pretix_ldap/__init__.py
diff --git a/src/pretix_ldap/ldap_connector.py → pretix_ldap/ldap_connector.py b/src/pretix_ldap/ldap_connector.py → pretix_ldap/ldap_connector.py
diff --git a/src/setup.cfg → setup.cfg b/src/setup.cfg → setup.cfg
diff --git a/src/setup.py → setup.py b/src/setup.py → setup.py
@@ -4,7 +4,7 @@
 
 try:
     with open(
-        os.path.join(os.path.dirname(__file__), "../README.rst"), encoding="utf-8"
+        os.path.join(os.path.dirname(__file__), "README.rst"), encoding="utf-8"
     ) as f:
         long_description = f.read()
 except:  # NOQA

diff --git a/tests/Dockerfile b/tests/Dockerfile
@@ -0,0 +1,9 @@
+FROM docker.io/pretix/standalone:stable
+USER root
+WORKDIR /pretix-ldap/
+COPY dist/pretix_ldap*.whl .
+RUN PYTHONPATH=$PYTHONPATH:/pretix/src pip3 install pretix_ldap*.whl
+USER pretixuser
+RUN cd /pretix/src && make production
+
+
diff --git a/src/tests/docker-compose.yml → tests/docker-compose.yml b/src/tests/docker-compose.yml → tests/docker-compose.yml
@@ -21,7 +21,7 @@ services:
     container_name: redis
 
   pretix:
-    build: ./../..
+    build: ./.
     container_name: pretix
     volumes:
       - ./pretix/etc/pretix:/etc/pretix

diff --git a/src/tests/ldif/01-structure.ldif → tests/ldif/01-structure.ldif b/src/tests/ldif/01-structure.ldif → tests/ldif/01-structure.ldif
diff --git a/src/tests/ldif/02-password-hashing.ldif → tests/ldif/02-password-hashing.ldif b/src/tests/ldif/02-password-hashing.ldif → tests/ldif/02-password-hashing.ldif
diff --git a/src/tests/ldif/03-ppolicyoverlay.ldif → tests/ldif/03-ppolicyoverlay.ldif b/src/tests/ldif/03-ppolicyoverlay.ldif → tests/ldif/03-ppolicyoverlay.ldif
diff --git a/src/tests/ldif/04-users.ldif → tests/ldif/04-users.ldif b/src/tests/ldif/04-users.ldif → tests/ldif/04-users.ldif
diff --git a/src/tests/pretix/etc/pretix/pretix.cfg → tests/pretix/etc/pretix/pretix.cfg b/src/tests/pretix/etc/pretix/pretix.cfg → tests/pretix/etc/pretix/pretix.cfg
diff --git a/src/tests/requirements.txt → tests/requirements.txt b/src/tests/requirements.txt → tests/requirements.txt
diff --git a/src/tests/test_pretix-ldap.py → tests/test_pretix-ldap.py b/src/tests/test_pretix-ldap.py → tests/test_pretix-ldap.py
@@ -8,9 +8,17 @@
 
 @pytest.fixture(scope="module")
 def start_pretix():
+    import os
+
+    print(os.getcwd())
+    print(os.system("ls"))
+    print("start pretix")
     subprocess.Popen(["podman-compose", "up"])
+    print("started pretix")
     yield
+    print("stop pretix")
     subprocess.run(["podman-compose", "down"])
+    print("stopped pretix")
 
 
 @pytest.fixture(scope="module")
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,6 @@ __pycache__/ @@
     env/
     build/
     develop-eggs/
-    dist/
     downloads/
     eggs/
     .eggs/
@@ Expand Down @@