From 4430ced2787429ea53da66c6b4f424c719ed1f6d Mon Sep 17 00:00:00 2001
From: Julian Rother <julian@jrother.eu>
Date: Wed, 28 Jul 2021 17:47:11 +0200
Subject: [PATCH] Moved library code from src/ back to top-level
While "src/" seems to be the recommended way, too many (linter/testing/...)
tools have problems with it.
---
.gitlab-ci.yml | 8 ++++----
{src/ldapserver => ldapserver}/__init__.py | 0
{src/ldapserver => ldapserver}/asn1.py | 0
{src/ldapserver => ldapserver}/directory.py | 0
{src/ldapserver => ldapserver}/dn.py | 0
{src/ldapserver => ldapserver}/exceptions.py | 0
{src/ldapserver => ldapserver}/ldap.py | 0
{src/ldapserver => ldapserver}/schema.py | 0
{src/ldapserver => ldapserver}/server.py | 0
{src/ldapserver => ldapserver}/util.py | 0
setup.py | 4 ++--
11 files changed, 6 insertions(+), 6 deletions(-)
rename {src/ldapserver => ldapserver}/__init__.py (100%)
rename {src/ldapserver => ldapserver}/asn1.py (100%)
rename {src/ldapserver => ldapserver}/directory.py (100%)
rename {src/ldapserver => ldapserver}/dn.py (100%)
rename {src/ldapserver => ldapserver}/exceptions.py (100%)
rename {src/ldapserver => ldapserver}/ldap.py (100%)
rename {src/ldapserver => ldapserver}/schema.py (100%)
rename {src/ldapserver => ldapserver}/server.py (100%)
rename {src/ldapserver => ldapserver}/util.py (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 441abbb..dcc97c3 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 9d22c88..46ebb45 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',
)
--
GitLab