diff --git a/server/requirements.txt b/server/requirements.txt deleted file mode 100644 index 73628f7..0000000 --- a/server/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -Paste==1.7.5.1 -SQLAlchemy==0.8.3 -bottle==0.11.6 -wsgiref==0.1.2 diff --git a/setup.py b/setup.py index 8e5d6de..d2b96c9 100644 --- a/setup.py +++ b/setup.py @@ -4,20 +4,17 @@ from setuptools import setup setup( name="techrec", - version="1.2.0", - description="A Python2 web application " + version="2.0.0", + description="A Python3 web application " "that assist radio speakers in recording their shows", long_description=open("README.md").read(), long_description_content_type="text/markdown", author="boyska", author_email="piuttosto@logorroici.org", packages=["techrec"], - package_dir={"techrec": "server"}, - install_requires=["Paste~=3.2", "SQLAlchemy==0.8.3", "bottle~=0.12"], - classifiers=[ - "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3.7", - ], + package_dir={"techrec": "techrec"}, + install_requires=["SQLAlchemy==0.8.3", "fastapi==0.62.0"], + classifiers=["Programming Language :: Python :: 3.7"], entry_points={"console_scripts": ["techrec = techrec.cli:main"]}, zip_safe=False, install_package_data=True, diff --git a/server/.gitignore b/techrec/.gitignore similarity index 100% rename from server/.gitignore rename to techrec/.gitignore diff --git a/server/__init__.py b/techrec/__init__.py similarity index 100% rename from server/__init__.py rename to techrec/__init__.py diff --git a/server/cli.py b/techrec/cli.py similarity index 100% rename from server/cli.py rename to techrec/cli.py diff --git a/server/config_manager.py b/techrec/config_manager.py similarity index 100% rename from server/config_manager.py rename to techrec/config_manager.py diff --git a/server/db.py b/techrec/db.py similarity index 100% rename from server/db.py rename to techrec/db.py diff --git a/server/default_config.py b/techrec/default_config.py similarity index 100% rename from server/default_config.py rename to techrec/default_config.py diff --git a/server/forge.py b/techrec/forge.py similarity index 100% rename from server/forge.py rename to techrec/forge.py diff --git a/server/maint.py b/techrec/maint.py similarity index 100% rename from server/maint.py rename to techrec/maint.py diff --git a/server/pages/archive.html b/techrec/pages/archive.html similarity index 100% rename from server/pages/archive.html rename to techrec/pages/archive.html diff --git a/server/pages/new.html b/techrec/pages/new.html similarity index 100% rename from server/pages/new.html rename to techrec/pages/new.html diff --git a/server/pages/old.html b/techrec/pages/old.html similarity index 100% rename from server/pages/old.html rename to techrec/pages/old.html diff --git a/server/processqueue.py b/techrec/processqueue.py similarity index 100% rename from server/processqueue.py rename to techrec/processqueue.py diff --git a/techrec/requirements.txt b/techrec/requirements.txt new file mode 100644 index 0000000..fe93be7 --- /dev/null +++ b/techrec/requirements.txt @@ -0,0 +1,8 @@ +SQLAlchemy==0.8.3 +click==7.1.2 +fastapi==0.62.0 +h11==0.11.0 +pydantic==1.7.3 +starlette==0.13.6 +typing-extensions==3.7.4.3 +uvicorn==0.13.1 diff --git a/server/server.py b/techrec/server.py similarity index 100% rename from server/server.py rename to techrec/server.py diff --git a/server/static/css/font-awesome.css b/techrec/static/css/font-awesome.css similarity index 100% rename from server/static/css/font-awesome.css rename to techrec/static/css/font-awesome.css diff --git a/server/static/css/images/animated-overlay.gif b/techrec/static/css/images/animated-overlay.gif similarity index 100% rename from server/static/css/images/animated-overlay.gif rename to techrec/static/css/images/animated-overlay.gif diff --git a/server/static/css/images/ui-bg_diagonals-small_40_db4865_40x40.png b/techrec/static/css/images/ui-bg_diagonals-small_40_db4865_40x40.png similarity index 100% rename from server/static/css/images/ui-bg_diagonals-small_40_db4865_40x40.png rename to techrec/static/css/images/ui-bg_diagonals-small_40_db4865_40x40.png diff --git a/server/static/css/images/ui-bg_diagonals-small_50_93c3cd_40x40.png b/techrec/static/css/images/ui-bg_diagonals-small_50_93c3cd_40x40.png similarity index 100% rename from server/static/css/images/ui-bg_diagonals-small_50_93c3cd_40x40.png rename to techrec/static/css/images/ui-bg_diagonals-small_50_93c3cd_40x40.png diff --git a/server/static/css/images/ui-bg_diagonals-small_50_ff3853_40x40.png b/techrec/static/css/images/ui-bg_diagonals-small_50_ff3853_40x40.png similarity index 100% rename from server/static/css/images/ui-bg_diagonals-small_50_ff3853_40x40.png rename to techrec/static/css/images/ui-bg_diagonals-small_50_ff3853_40x40.png diff --git a/server/static/css/images/ui-bg_diagonals-small_75_ccd232_40x40.png b/techrec/static/css/images/ui-bg_diagonals-small_75_ccd232_40x40.png similarity index 100% rename from server/static/css/images/ui-bg_diagonals-small_75_ccd232_40x40.png rename to techrec/static/css/images/ui-bg_diagonals-small_75_ccd232_40x40.png diff --git a/server/static/css/images/ui-bg_dots-medium_80_ffff38_4x4.png b/techrec/static/css/images/ui-bg_dots-medium_80_ffff38_4x4.png similarity index 100% rename from server/static/css/images/ui-bg_dots-medium_80_ffff38_4x4.png rename to techrec/static/css/images/ui-bg_dots-medium_80_ffff38_4x4.png diff --git a/server/static/css/images/ui-bg_dots-small_35_35414f_2x2.png b/techrec/static/css/images/ui-bg_dots-small_35_35414f_2x2.png similarity index 100% rename from server/static/css/images/ui-bg_dots-small_35_35414f_2x2.png rename to techrec/static/css/images/ui-bg_dots-small_35_35414f_2x2.png diff --git a/server/static/css/images/ui-bg_flat_75_ba9217_40x100.png b/techrec/static/css/images/ui-bg_flat_75_ba9217_40x100.png similarity index 100% rename from server/static/css/images/ui-bg_flat_75_ba9217_40x100.png rename to techrec/static/css/images/ui-bg_flat_75_ba9217_40x100.png diff --git a/server/static/css/images/ui-bg_flat_75_ffffff_40x100.png b/techrec/static/css/images/ui-bg_flat_75_ffffff_40x100.png similarity index 100% rename from server/static/css/images/ui-bg_flat_75_ffffff_40x100.png rename to techrec/static/css/images/ui-bg_flat_75_ffffff_40x100.png diff --git a/server/static/css/images/ui-bg_white-lines_85_f7f7ba_40x100.png b/techrec/static/css/images/ui-bg_white-lines_85_f7f7ba_40x100.png similarity index 100% rename from server/static/css/images/ui-bg_white-lines_85_f7f7ba_40x100.png rename to techrec/static/css/images/ui-bg_white-lines_85_f7f7ba_40x100.png diff --git a/server/static/css/images/ui-icons_454545_256x240.png b/techrec/static/css/images/ui-icons_454545_256x240.png similarity index 100% rename from server/static/css/images/ui-icons_454545_256x240.png rename to techrec/static/css/images/ui-icons_454545_256x240.png diff --git a/server/static/css/images/ui-icons_88a206_256x240.png b/techrec/static/css/images/ui-icons_88a206_256x240.png similarity index 100% rename from server/static/css/images/ui-icons_88a206_256x240.png rename to techrec/static/css/images/ui-icons_88a206_256x240.png diff --git a/server/static/css/images/ui-icons_c02669_256x240.png b/techrec/static/css/images/ui-icons_c02669_256x240.png similarity index 100% rename from server/static/css/images/ui-icons_c02669_256x240.png rename to techrec/static/css/images/ui-icons_c02669_256x240.png diff --git a/server/static/css/images/ui-icons_e1e463_256x240.png b/techrec/static/css/images/ui-icons_e1e463_256x240.png similarity index 100% rename from server/static/css/images/ui-icons_e1e463_256x240.png rename to techrec/static/css/images/ui-icons_e1e463_256x240.png diff --git a/server/static/css/images/ui-icons_ffeb33_256x240.png b/techrec/static/css/images/ui-icons_ffeb33_256x240.png similarity index 100% rename from server/static/css/images/ui-icons_ffeb33_256x240.png rename to techrec/static/css/images/ui-icons_ffeb33_256x240.png diff --git a/server/static/css/images/ui-icons_ffffff_256x240.png b/techrec/static/css/images/ui-icons_ffffff_256x240.png similarity index 100% rename from server/static/css/images/ui-icons_ffffff_256x240.png rename to techrec/static/css/images/ui-icons_ffffff_256x240.png diff --git a/server/static/css/jquery-ui.min.css b/techrec/static/css/jquery-ui.min.css similarity index 100% rename from server/static/css/jquery-ui.min.css rename to techrec/static/css/jquery-ui.min.css diff --git a/server/static/css/pure-min.css b/techrec/static/css/pure-min.css similarity index 100% rename from server/static/css/pure-min.css rename to techrec/static/css/pure-min.css diff --git a/server/static/css/pure-skin-porpora.css b/techrec/static/css/pure-skin-porpora.css similarity index 100% rename from server/static/css/pure-skin-porpora.css rename to techrec/static/css/pure-skin-porpora.css diff --git a/server/static/css/style.css b/techrec/static/css/style.css similarity index 100% rename from server/static/css/style.css rename to techrec/static/css/style.css diff --git a/server/static/css/techrec.css b/techrec/static/css/techrec.css similarity index 100% rename from server/static/css/techrec.css rename to techrec/static/css/techrec.css diff --git a/server/static/fonts/FontAwesome.otf b/techrec/static/fonts/FontAwesome.otf similarity index 100% rename from server/static/fonts/FontAwesome.otf rename to techrec/static/fonts/FontAwesome.otf diff --git a/server/static/fonts/fontawesome-webfont.eot b/techrec/static/fonts/fontawesome-webfont.eot similarity index 100% rename from server/static/fonts/fontawesome-webfont.eot rename to techrec/static/fonts/fontawesome-webfont.eot diff --git a/server/static/fonts/fontawesome-webfont.svg b/techrec/static/fonts/fontawesome-webfont.svg similarity index 100% rename from server/static/fonts/fontawesome-webfont.svg rename to techrec/static/fonts/fontawesome-webfont.svg diff --git a/server/static/fonts/fontawesome-webfont.ttf b/techrec/static/fonts/fontawesome-webfont.ttf similarity index 100% rename from server/static/fonts/fontawesome-webfont.ttf rename to techrec/static/fonts/fontawesome-webfont.ttf diff --git a/server/static/fonts/fontawesome-webfont.woff b/techrec/static/fonts/fontawesome-webfont.woff similarity index 100% rename from server/static/fonts/fontawesome-webfont.woff rename to techrec/static/fonts/fontawesome-webfont.woff diff --git a/server/static/img/7915.orig.png b/techrec/static/img/7915.orig.png similarity index 100% rename from server/static/img/7915.orig.png rename to techrec/static/img/7915.orig.png diff --git a/server/static/img/7915.png b/techrec/static/img/7915.png similarity index 100% rename from server/static/img/7915.png rename to techrec/static/img/7915.png diff --git a/server/static/img/ajax-loader.gif b/techrec/static/img/ajax-loader.gif similarity index 100% rename from server/static/img/ajax-loader.gif rename to techrec/static/img/ajax-loader.gif diff --git a/server/static/img/button.jpg b/techrec/static/img/button.jpg similarity index 100% rename from server/static/img/button.jpg rename to techrec/static/img/button.jpg diff --git a/server/static/img/icon.ico b/techrec/static/img/icon.ico similarity index 100% rename from server/static/img/icon.ico rename to techrec/static/img/icon.ico diff --git a/server/static/js/jquery-1.9.1.min.js b/techrec/static/js/jquery-1.9.1.min.js similarity index 100% rename from server/static/js/jquery-1.9.1.min.js rename to techrec/static/js/jquery-1.9.1.min.js diff --git a/server/static/js/jquery-ui.min.js b/techrec/static/js/jquery-ui.min.js similarity index 100% rename from server/static/js/jquery-ui.min.js rename to techrec/static/js/jquery-ui.min.js diff --git a/server/static/js/jquery.form.min.js b/techrec/static/js/jquery.form.min.js similarity index 100% rename from server/static/js/jquery.form.min.js rename to techrec/static/js/jquery.form.min.js diff --git a/server/static/js/jquery.ui.datepicker-it.min.js b/techrec/static/js/jquery.ui.datepicker-it.min.js similarity index 100% rename from server/static/js/jquery.ui.datepicker-it.min.js rename to techrec/static/js/jquery.ui.datepicker-it.min.js diff --git a/server/static/js/new.js b/techrec/static/js/new.js similarity index 100% rename from server/static/js/new.js rename to techrec/static/js/new.js diff --git a/server/static/js/old.js b/techrec/static/js/old.js similarity index 100% rename from server/static/js/old.js rename to techrec/static/js/old.js diff --git a/server/static/js/rec.js b/techrec/static/js/rec.js similarity index 100% rename from server/static/js/rec.js rename to techrec/static/js/rec.js diff --git a/server/static/js/ui.js b/techrec/static/js/ui.js similarity index 100% rename from server/static/js/ui.js rename to techrec/static/js/ui.js diff --git a/server/static/js/underscore-min.js b/techrec/static/js/underscore-min.js similarity index 100% rename from server/static/js/underscore-min.js rename to techrec/static/js/underscore-min.js diff --git a/server/static/techrec/jquery-1.9.1.min.js b/techrec/static/techrec/jquery-1.9.1.min.js similarity index 100% rename from server/static/techrec/jquery-1.9.1.min.js rename to techrec/static/techrec/jquery-1.9.1.min.js diff --git a/server/test_forge.py b/techrec/test_forge.py similarity index 100% rename from server/test_forge.py rename to techrec/test_forge.py