move files to top dir for packaging

MerginMaps · Sep 19, 2019 · 8a9f48d · 8a9f48d
1 parent dd4b3a3
commit 8a9f48d
Show file tree

Hide file tree

Showing 19 changed files with 16 additions and 60 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,8 @@ build*/
 CMakeLists.txt.user
 *-shm
 *-wal
-*.pyc
+*.pyc
+dist/
+_skbuild/
+*egg-info/
+MANIFEST
diff --git a/pygeodiff/MANIFEST.in → MANIFEST.in b/pygeodiff/MANIFEST.in → MANIFEST.in
@@ -1,4 +1,5 @@
 # Things to include in the built package (besides the packages defined in setup.py)
-include README
 include LICENSE
-include pyproject.toml
+include pyproject.toml
+include geodiff/CMakeLists.txt
+include geodiff/src/*
diff --git a/geodiff/src/geodiff.cpp b/geodiff/src/geodiff.cpp
@@ -23,7 +23,7 @@
 
 const char *GEODIFF_version()
 {
-  return "0.2.2";
+  return "0.2.3";
 }
 
 void _errorLogCallback( void *pArg, int iErrCode, const char *zMsg )

diff --git a/pygeodiff/makefile → makefile b/pygeodiff/makefile → makefile
diff --git a/pygeodiff/.gitignore b/pygeodiff/.gitignore
diff --git a/pygeodiff/LICENSE b/pygeodiff/LICENSE
diff --git a/pygeodiff/README b/pygeodiff/README
diff --git a/pygeodiff/pygeodiff/__about__.py → pygeodiff/__about__.py b/pygeodiff/pygeodiff/__about__.py → pygeodiff/__about__.py
@@ -1,7 +1,7 @@
 __title__ = 'PyGeoDiff'
 __description__ = 'Diff tool for geo-spatial data'
 __url__ = 'https://github.com/lutraconsulting/geodiff'
-__version__ = '0.2.2'
+__version__ = '0.2.3'
 __author__ = 'Peter Petrik'
 __author_email__ = 'zilolv@gmail.com'
 __maintainer__ = 'Peter Petrik'

diff --git a/pygeodiff/pygeodiff/__init__.py → pygeodiff/__init__.py b/pygeodiff/pygeodiff/__init__.py → pygeodiff/__init__.py
diff --git a/pygeodiff/pygeodiff/geodifflib.py → pygeodiff/geodifflib.py b/pygeodiff/pygeodiff/geodifflib.py → pygeodiff/geodifflib.py
diff --git a/pygeodiff/pygeodiff/main.py → pygeodiff/main.py b/pygeodiff/pygeodiff/main.py → pygeodiff/main.py
diff --git a/pygeodiff/pyproject.toml → pyproject.toml b/pygeodiff/pyproject.toml → pyproject.toml
diff --git a/scripts/publish_pypi.bash b/scripts/publish_pypi.bash
@@ -10,7 +10,7 @@ else
 fi
 
 echo -n "Publishing pygeodiff to $URL"
-cd $DIR/../pygeodiff
+cd $DIR/..
 
 rm -rf pygeodiff.egg-info
 rm -rf _skbuild

diff --git a/scripts/update_version.py b/scripts/update_version.py
@@ -24,10 +24,10 @@ def replace_in_file(filepath, regex, sub):
 print("patching " + cpp_file)
 replace_in_file(cpp_file, r'(GEODIFF_version\(\)\n{\n\s+return\s)".*"(;\n})', r'\1"' + ver + r'"\2')
 
-about_file = os.path.join(dir_path, os.pardir, "pygeodiff", "pygeodiff", "__about__.py")
+about_file = os.path.join(dir_path, os.pardir, "pygeodiff", "__about__.py")
 print("patching " + about_file)
 replace_in_file(about_file, "__version__\s=\s'.*", "__version__ = '" + ver + "'")
 
-setup_file = os.path.join(dir_path, os.pardir, "pygeodiff", "setup.py")
+setup_file = os.path.join(dir_path, os.pardir, "setup.py")
 print("patching " + setup_file)
 replace_in_file(setup_file, "VERSION\s=\s'.*", "VERSION = '" + ver + "'")
diff --git a/pygeodiff/setup.py → setup.py b/pygeodiff/setup.py → setup.py
@@ -18,20 +18,15 @@
 EXCLUDE_FROM_PACKAGES = ["contrib", "docs", "tests*"]
 CURDIR = os.path.abspath(os.path.dirname(__file__))
 
-with io.open(os.path.join(CURDIR, "README"), "r", encoding="utf-8") as f:
-    README = f.read()
-
-
-VERSION = '0.2.2'
+VERSION = '0.2.3'
 
 setup(
     name="pygeodiff",
     version=VERSION,
     author="Peter Petrik",
     author_email="peter.petrik@lutraconsulting.co.uk",
     description="Python wrapper around GeoDiff library",
-    long_description=README,
-    long_description_content_type="text/markdown",
+    long_description="Python wrapper around GeoDiff library",
     url="https://github.com/lutraconsulting/geodiff",
     packages=find_packages(exclude=EXCLUDE_FROM_PACKAGES),
     include_package_data=True,
@@ -40,7 +35,7 @@
     entry_points={"console_scripts": ["pygeodiff=pygeodiff.main:main"]},
     zip_safe=False,
     cmake_args=['-DENABLE_TESTS:BOOL=OFF', '-DENABLE_COVERAGE:BOOL=OFF', '-DBUILD_TOOLS:BOOL=OFF', '-DPYGEODIFFVERSION='+str(VERSION)],
-    cmake_source_dir="../geodiff",
+    cmake_source_dir="geodiff",
     cmake_with_sdist=True,
     test_suite="tests.test_project",
     python_requires=">=3.6",

diff --git a/pygeodiff/tests/__init__.py → tests/__init__.py b/pygeodiff/tests/__init__.py → tests/__init__.py
diff --git a/pygeodiff/tests/test_concurrent_commits.py → tests/test_concurrent_commits.py b/pygeodiff/tests/test_concurrent_commits.py → tests/test_concurrent_commits.py
diff --git a/pygeodiff/tests/test_single_commit.py → tests/test_single_commit.py b/pygeodiff/tests/test_single_commit.py → tests/test_single_commit.py
diff --git a/pygeodiff/tests/testutils.py → tests/testutils.py b/pygeodiff/tests/testutils.py → tests/testutils.py