clean up naming and ignore

OCHA-DAP · Sep 24, 2023 · 15954f0 · 15954f0
1 parent 01dcbd0
commit 15954f0
Show file tree

Hide file tree

Showing 35 changed files with 34 additions and 466 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 /venv*
 .DS_Store
 .pypirc
+*build/
+*dist/
diff --git a/build/lib/src/db_admin2.py b/build/lib/src/db_admin2.py
diff --git a/build/lib/src/db_operational_presence.py b/build/lib/src/db_operational_presence.py
diff --git a/build/lib/src/db_resource.py b/build/lib/src/db_resource.py
diff --git a/dist/hapi-schema-0.0.1.tar.gz b/dist/hapi-schema-0.0.1.tar.gz
diff --git a/dist/hapi_schema-0.0.1-py3-none-any.whl b/dist/hapi_schema-0.0.1-py3-none-any.whl
diff --git a/hapi_schema.egg-info/PKG-INFO b/hapi_schema.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hapi-schema
-Version: 0.0.1
+Version: 0.0.4
 Summary: HAPI database schema specified in SQLAlchemy
 Home-page: https://github.com/OCHA-DAP/hapi-sqlalchemy-schema
 Author: HDX

diff --git a/hapi_schema.egg-info/SOURCES.txt b/hapi_schema.egg-info/SOURCES.txt
@@ -1,21 +1,21 @@
 LICENSE
 README.md
 setup.py
+hapi_schema/__init__.py
+hapi_schema/databasequeries.py
+hapi_schema/db_admin1.py
+hapi_schema/db_admin2.py
+hapi_schema/db_age_range.py
+hapi_schema/db_dataset.py
+hapi_schema/db_gender.py
+hapi_schema/db_location.py
+hapi_schema/db_operational_presence.py
+hapi_schema/db_org.py
+hapi_schema/db_orgtype.py
+hapi_schema/db_population.py
+hapi_schema/db_resource.py
+hapi_schema/db_sector.py
 hapi_schema.egg-info/PKG-INFO
 hapi_schema.egg-info/SOURCES.txt
 hapi_schema.egg-info/dependency_links.txt
-hapi_schema.egg-info/top_level.txt
-src/__init__.py
-src/databasequeries.py
-src/db_admin1.py
-src/db_admin2.py
-src/db_age_range.py
-src/db_dataset.py
-src/db_gender.py
-src/db_location.py
-src/db_operational_presence.py
-src/db_org.py
-src/db_orgtype.py
-src/db_population.py
-src/db_resource.py
-src/db_sector.py
+hapi_schema.egg-info/top_level.txt
diff --git a/hapi_schema.egg-info/top_level.txt b/hapi_schema.egg-info/top_level.txt
@@ -1 +1 @@
-src
+hapi_schema
diff --git a/build/lib/src/__init__.py → hapi_schema/__init__.py b/build/lib/src/__init__.py → hapi_schema/__init__.py
@@ -2,5 +2,5 @@
 HAPI-Schemas
 """
 
-__version__ = "0.1.0"
+__version__ = "0.0.4"
 __author__ = 'HDX'
diff --git a/build/lib/src/databasequeries.py → hapi_schema/databasequeries.py b/build/lib/src/databasequeries.py → hapi_schema/databasequeries.py
diff --git a/build/lib/src/db_admin1.py → hapi_schema/db_admin1.py b/build/lib/src/db_admin1.py → hapi_schema/db_admin1.py
@@ -12,7 +12,7 @@
 )
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
-from hapi.pipelines.database.db_location import DBLocation  # noqa: F401
+from hapi_schema.db_location import DBLocation  # noqa: F401
 
 
 class DBAdmin1(Base):

diff --git a/src/db_admin2.py → hapi_schema/db_admin2.py b/src/db_admin2.py → hapi_schema/db_admin2.py
@@ -12,7 +12,7 @@
 )
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
-from hapi.pipelines.database.db_admin1 import DBAdmin1  # noqa: F401
+from hapi_schema.db_admin1 import DBAdmin1  # noqa: F401
 
 
 class DBAdmin2(Base):

diff --git a/build/lib/src/db_age_range.py → hapi_schema/db_age_range.py b/build/lib/src/db_age_range.py → hapi_schema/db_age_range.py
diff --git a/build/lib/src/db_dataset.py → hapi_schema/db_dataset.py b/build/lib/src/db_dataset.py → hapi_schema/db_dataset.py
diff --git a/build/lib/src/db_gender.py → hapi_schema/db_gender.py b/build/lib/src/db_gender.py → hapi_schema/db_gender.py
diff --git a/build/lib/src/db_location.py → hapi_schema/db_location.py b/build/lib/src/db_location.py → hapi_schema/db_location.py
diff --git a/src/db_operational_presence.py → hapi_schema/db_operational_presence.py b/src/db_operational_presence.py → hapi_schema/db_operational_presence.py
@@ -11,10 +11,10 @@
 )
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
-from hapi.pipelines.database.db_admin2 import DBAdmin2  # noqa: F401
-from hapi.pipelines.database.db_org import DBOrg  # noqa: F401
-from hapi.pipelines.database.db_resource import DBResource  # noqa: F401
-from hapi.pipelines.database.db_sector import DBSector  # noqa: F401
+from hapi_schema.db_admin2 import DBAdmin2  # noqa: F401
+from hapi_schema.db_org import DBOrg  # noqa: F401
+from hapi_schema.db_resource import DBResource  # noqa: F401
+from hapi_schema.db_sector import DBSector  # noqa: F401
 
 
 class DBOperationalPresence(Base):

diff --git a/build/lib/src/db_org.py → hapi_schema/db_org.py b/build/lib/src/db_org.py → hapi_schema/db_org.py
@@ -11,7 +11,7 @@
 )
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
-from hapi.pipelines.database.db_orgtype import DBOrgType  # noqa: F401
+from hapi_schema.db_orgtype import DBOrgType  # noqa: F401
 
 
 class DBOrg(Base):

diff --git a/build/lib/src/db_orgtype.py → hapi_schema/db_orgtype.py b/build/lib/src/db_orgtype.py → hapi_schema/db_orgtype.py
diff --git a/build/lib/src/db_population.py → hapi_schema/db_population.py b/build/lib/src/db_population.py → hapi_schema/db_population.py
@@ -11,10 +11,10 @@
 )
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
-from hapi.pipelines.database.db_admin2 import DBAdmin2  # noqa: F401
-from hapi.pipelines.database.db_age_range import DBAgeRange  # noqa: F401
-from hapi.pipelines.database.db_gender import DBGender  # noqa: F401
-from hapi.pipelines.database.db_resource import DBResource  # noqa: F401
+from hapi_schema.db_admin2 import DBAdmin2  # noqa: F401
+from hapi_schema.db_age_range import DBAgeRange  # noqa: F401
+from hapi_schema.db_gender import DBGender  # noqa: F401
+from hapi_schema.db_resource import DBResource  # noqa: F401
 
 
 class DBPopulation(Base):

diff --git a/src/db_resource.py → hapi_schema/db_resource.py b/src/db_resource.py → hapi_schema/db_resource.py
@@ -10,7 +10,7 @@
 )
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
-from hapi.pipelines.database.db_dataset import DBDataset  # noqa: F401
+from hapi_schema.db_dataset import DBDataset  # noqa: F401
 
 
 class DBResource(Base):

diff --git a/build/lib/src/db_sector.py → hapi_schema/db_sector.py b/build/lib/src/db_sector.py → hapi_schema/db_sector.py
diff --git a/setup.py b/setup.py
@@ -4,8 +4,8 @@
     long_description = fh.read()
 
 setuptools.setup(
-    name="hapi-schema",
-    version="0.0.1",
+    name="hapi_schema",
+    version="0.0.4",
     author="HDX",
     author_email="simon.johnson@un.org",
     description="HAPI database schema specified in SQLAlchemy",

diff --git a/src/__init__.py b/src/__init__.py
diff --git a/src/databasequeries.py b/src/databasequeries.py
diff --git a/src/db_admin1.py b/src/db_admin1.py