glparchis-20221113

README.md

@@ -3,8 +3,8 @@
 ## Project links
 
 Glparchis doxygen documentation:
-    http://turulomio.users.sourceforge.net/doxygen/glparchis/
-    
+    https://coolnewton.mooo.com/doxygen/glparchis/index.html
+
 Game statistics
     http://glparchis.sourceforge.net/php/glparchis_statistics.php
 
@@ -17,14 +17,10 @@ Game statistics
 
 If you use Gentoo you can find a ebuild in https://github.com/Turulomio/myportage/tree/master/games-board/glparchis
 
-If you use other distribution compatible con pip, you need to install PyQt5 and glParchis with the following commands:
-
-`pip install PyQt5`
+If you use other distribution compatible con pip, you need to run:
 
 `pip install glparchis`
 
-You need to install PyQt5 first, because is not in Linux setup.py dependencies, due to PyQt5 doesn't use standard setup tools. So for compatibility reasons with distributions like Gentoo, we use this additional step.
-
 ## Install in Windows as a python module
 
 You need to install Python from https://www.python.org and add it to the PATH

doc/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = glParchis
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 20181125
+PROJECT_NUMBER         = 20221113
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

setup.py

@@ -6,12 +6,23 @@
 from concurrent.futures import ProcessPoolExecutor
 from multiprocessing import cpu_count
 
+## Class to define doxygen command
 class Doxygen(Command):
     description = "Create/update doxygen documentation in doc/html"
-    user_options = []
+
+    user_options = [
+      # The format is (long option, short option, description).
+      ( 'user=', None, 'Remote ssh user'),
+      ( 'directory=', None, 'Remote ssh path'),
+      ( 'port=', None, 'Remote ssh port'),
+      ( 'server=', None, 'Remote ssh server'),
+  ]
 
     def initialize_options(self):
-        pass
+        self.user="root"
+        self.directory="/var/www/html/doxygen/glparchis/"
+        self.port=22
+        self.server="127.0.0.1"
 
     def finalize_options(self):
         pass
@@ -20,11 +31,15 @@ def run(self):
         print("Creating Doxygen Documentation")
         system("""sed -i -e "41d" doc/Doxyfile""")#Delete line 41
         system("""sed -i -e "41iPROJECT_NUMBER         = {}" doc/Doxyfile""".format(__version__))#Insert line 41
+        system("rm -Rf build")
         chdir("doc")
-        system("doxygen Doxyfile")
-        system("rsync -avzP -e 'ssh -l turulomio' html/ frs.sourceforge.net:/home/users/t/tu/turulomio/userweb/htdocs/doxygen/glparchis/ --delete-after")
+        system("doxygen Doxyfile")      
+        command=f"""rsync -avzP -e 'ssh -l {self.user} -p {self.port} ' html/ {self.server}:{self.directory} --delete-after"""
+        print(command)
+        system(command)
         chdir("..")
 
+
 class Compile(Command):
     description = "Compile ui and images"
     user_options = []
@@ -77,10 +92,11 @@ def run(self):
   * python setup.py doc
   * python setup.py install
   * python setup.py doxygen
-  * git commit -a -m 'glparchis-{}'
+  * git commit -a -m 'glparchis-{0}'
   * git push
   * Hacer un nuevo tag en GitHub
-  * python setup.py sdist upload -r pypi
+  * python setup.py sdist
+  * twine upload dist/glparchis-{0}.tar.gz 
   * Pasa a Windows y ejecuta setup.py pyinstaller
   * Crea un nuevo ebuild de Gentoo con la nueva versión
   * Subelo al repositorio del portage