瀏覽代碼

Remove the useless "historical" directory, promote webware to top level (#3071)

Michael Hixson 7 年之前
父節點
當前提交
fb52f27dbd

+ 1 - 1
.travis.yml

@@ -165,7 +165,6 @@ env:
     - "TESTDIR=Python/django"
     - "TESTDIR=Python/falcon"
     - "TESTDIR=Python/flask"
-    - "TESTDIR=Python/historical"
     - "TESTDIR=Python/japronto"
     - "TESTDIR=Python/klein"
     - "TESTDIR=Python/morepath"
@@ -175,6 +174,7 @@ env:
     - "TESTDIR=Python/uvicorn"
     - "TESTDIR=Python/uwsgi"
     - "TESTDIR=Python/web2py"
+    - "TESTDIR=Python/webware"
     - "TESTDIR=Python/weppy"
     - "TESTDIR=Python/wheezyweb"
     - "TESTDIR=Python/wsgi"

+ 0 - 0
frameworks/Python/historical/README.md


+ 0 - 0
frameworks/Python/historical/webware/.gitignore → frameworks/Python/webware/.gitignore


+ 0 - 0
frameworks/Python/historical/webware/app/.cvsignore → frameworks/Python/webware/app/.cvsignore


+ 0 - 0
frameworks/Python/historical/webware/app/AppServer → frameworks/Python/webware/app/AppServer


+ 0 - 0
frameworks/Python/historical/webware/app/Configs/AppServer.config → frameworks/Python/webware/app/Configs/AppServer.config


+ 0 - 0
frameworks/Python/historical/webware/app/Configs/Application.config → frameworks/Python/webware/app/Configs/Application.config


+ 0 - 0
frameworks/Python/historical/webware/app/Context/.cvsignore → frameworks/Python/webware/app/Context/.cvsignore


+ 0 - 0
frameworks/Python/historical/webware/app/Context/AFortune.py → frameworks/Python/webware/app/Context/AFortune.py


+ 0 - 0
frameworks/Python/historical/webware/app/Context/DbSession.py → frameworks/Python/webware/app/Context/DbSession.py


+ 0 - 0
frameworks/Python/historical/webware/app/Context/UrlHelper.py → frameworks/Python/webware/app/Context/UrlHelper.py


+ 0 - 0
frameworks/Python/historical/webware/app/Context/World.py → frameworks/Python/webware/app/Context/World.py


+ 0 - 0
frameworks/Python/historical/webware/app/Context/db.py → frameworks/Python/webware/app/Context/db.py


+ 0 - 0
frameworks/Python/historical/webware/app/Context/fortune.py → frameworks/Python/webware/app/Context/fortune.py


+ 0 - 0
frameworks/Python/historical/webware/app/Context/json2.py → frameworks/Python/webware/app/Context/json2.py


+ 0 - 0
frameworks/Python/historical/webware/app/Context/plaintext.py → frameworks/Python/webware/app/Context/plaintext.py


+ 0 - 0
frameworks/Python/historical/webware/app/Context/queries.py → frameworks/Python/webware/app/Context/queries.py


+ 0 - 0
frameworks/Python/historical/webware/app/Context/updates.py → frameworks/Python/webware/app/Context/updates.py


+ 0 - 0
frameworks/Python/historical/webware/app/Launch.py → frameworks/Python/webware/app/Launch.py


+ 0 - 0
frameworks/Python/historical/webware/app/WebKit.cgi → frameworks/Python/webware/app/WebKit.cgi


+ 0 - 0
frameworks/Python/historical/webware/app/adapter.address → frameworks/Python/webware/app/adapter.address


+ 0 - 0
frameworks/Python/historical/webware/app/http.address → frameworks/Python/webware/app/http.address


+ 0 - 0
frameworks/Python/historical/webware/app/webkit → frameworks/Python/webware/app/webkit


+ 2 - 2
frameworks/Python/historical/benchmark_config.json → frameworks/Python/webware/benchmark_config.json

@@ -1,8 +1,8 @@
 {
-  "framework": "historical",
+  "framework": "webware",
   "tests": [{
     "default": {
-      "setup_file": "webware/setup",
+      "setup_file": "setup",
       "json_url": "/json2",
       "plaintext_url": "/plaintext",
       "db_url": "/db",

+ 0 - 0
frameworks/Python/historical/webware/requirements.txt → frameworks/Python/webware/requirements.txt


+ 3 - 4
frameworks/Python/historical/webware/setup.sh → frameworks/Python/webware/setup.sh

@@ -2,16 +2,15 @@
 
 fw_depends mysql python2 apache
 
-pip install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/webware/requirements.txt
+pip install --install-option="--prefix=${PY2_ROOT}" -r $TROOT/requirements.txt
 
-cd webware 
 rm -fr Webware Webware-1.1.1 Webware-1.1.1.tar.gz
 
 fw_get -O https://downloads.sourceforge.net/webware/Webware-1.1.1.tar.gz
 fw_untar Webware-1.1.1.tar.gz
 cp -r app/ Webware-1.1.1/
 
-cd $TROOT/webware/Webware-1.1.1
+cd $TROOT/Webware-1.1.1
 python install.py --no-password-prompt 
-cd $TROOT/webware/Webware-1.1.1/app
+cd $TROOT/Webware-1.1.1/app
 python Launch.py &