diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 441abbbb807ecdc3df2683f0d554c0314eb7fea9..dcc97c3eb1c26ef0a2d17ad9826cd8666bd00d96 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,9 +3,9 @@ linter: image: python:3.7 script: - pip install pylint-gitlab - - python3 -m pylint --exit-zero --rcfile .pylintrc --output-format=pylint_gitlab.GitlabCodeClimateReporter src/ldapserver > codeclimate.json || true - - python3 -m pylint --exit-zero --rcfile .pylintrc --output-format=pylint_gitlab.GitlabPagesHtmlReporter src/ldapserver > pylint.html || true - - python3 -m pylint --rcfile .pylintrc --output-format=text src/ldapserver || true + - python3 -m pylint --exit-zero --rcfile .pylintrc --output-format=pylint_gitlab.GitlabCodeClimateReporter ldapserver > codeclimate.json || true + - python3 -m pylint --exit-zero --rcfile .pylintrc --output-format=pylint_gitlab.GitlabPagesHtmlReporter ldapserver > pylint.html || true + - python3 -m pylint --rcfile .pylintrc --output-format=text ldapserver || true artifacts: when: always paths: @@ -19,7 +19,7 @@ test: image: python:3.7 script: - pip install pytest coverage - - PYTHONPATH=src coverage run --include 'src/*.py' -m pytest --junitxml=report.xml + - coverage run --include '*.py' -m pytest --junitxml=report.xml - coverage report -m - coverage html - coverage xml diff --git a/src/ldapserver/__init__.py b/ldapserver/__init__.py similarity index 100% rename from src/ldapserver/__init__.py rename to ldapserver/__init__.py diff --git a/src/ldapserver/asn1.py b/ldapserver/asn1.py similarity index 100% rename from src/ldapserver/asn1.py rename to ldapserver/asn1.py diff --git a/src/ldapserver/directory.py b/ldapserver/directory.py similarity index 100% rename from src/ldapserver/directory.py rename to ldapserver/directory.py diff --git a/src/ldapserver/dn.py b/ldapserver/dn.py similarity index 100% rename from src/ldapserver/dn.py rename to ldapserver/dn.py diff --git a/src/ldapserver/exceptions.py b/ldapserver/exceptions.py similarity index 100% rename from src/ldapserver/exceptions.py rename to ldapserver/exceptions.py diff --git a/src/ldapserver/ldap.py b/ldapserver/ldap.py similarity index 100% rename from src/ldapserver/ldap.py rename to ldapserver/ldap.py diff --git a/src/ldapserver/schema.py b/ldapserver/schema.py similarity index 100% rename from src/ldapserver/schema.py rename to ldapserver/schema.py diff --git a/src/ldapserver/server.py b/ldapserver/server.py similarity index 100% rename from src/ldapserver/server.py rename to ldapserver/server.py diff --git a/src/ldapserver/util.py b/ldapserver/util.py similarity index 100% rename from src/ldapserver/util.py rename to ldapserver/util.py diff --git a/setup.py b/setup.py index 9d22c887ade7ac0465338e5f16bc8bdf0b13f606..46ebb451bcd78a5bdf4927f76178b6e90a8a57a9 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ setuptools.setup( 'Operating System :: OS Independent', 'Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP', ], - package_dir={'': 'src'}, - packages=setuptools.find_packages(where='src'), + package_dir={'': '.'}, + packages=setuptools.find_packages(where='.'), python_requires='>=3.9', )