瀏覽代碼

Merge branch 'release-0.0.3'

Arkadiusz Ryś 3 年之前
父節點
當前提交
23a42a8d2b
共有 6 個文件被更改,包括 49 次插入 和 18 次删除
  1. 1 0
      .gitignore
  2. 21 0
      .gitlab-ci.yml
  3. 5 0
      HISTORY.rst
  4. 10 7
      README.rst
  5. 1 1
      graph_exploring_tool/__init__.py
  6. 11 10
      requirements.txt

+ 1 - 0
.gitignore

@@ -5,3 +5,4 @@ dist/
 *.egg-info
 
 *.log
+.idea

+ 21 - 0
.gitlab-ci.yml

@@ -47,3 +47,24 @@ build-upload:
     - python -m twine upload dist/*
   only:
     - tags
+
+build-windows-exe:
+  image: tobix/pywine:3.11 # Use this image instead of the custom one. It's maintained and easier. registry.rys.one/arrys/pyinstaller
+  stage: build
+  before_script:
+    - echo "Building windows executable"
+    - apt install -qy zip
+  script:
+    - xvfb-run sh -c "wine pip install --no-warn-script-location -r requirements.py; wineserver -w"
+#    - pyinstaller graph_exploring_tool/__main__.py --onefile --add-data data:data --collect-all graph-exploring-tool --windowed --noconfirm
+    - xvfb-run sh -c "wine pyinstaller graph_exploring_tool/__main__.py --onefile; wineserver -w"
+    - mkdir -p dist/data/
+    - cp -r data/* dist/data/
+    - zip -r graph-exploring-tool.zip dist
+    - ls -la dist
+  only:
+    - tags
+  artifacts:
+    name: "graph-exploring-tool-%CI_TAG.zip" # % because of windoze https://docs.gitlab.com/ee/ci/jobs/job_artifacts.html#with-a-windows-runner-or-shell-executor
+    paths:
+      - ./graph-exploring-tool.zip

+ 5 - 0
HISTORY.rst

@@ -2,6 +2,11 @@
 History
 =======
 
+0.0.3 (2023-05-04)
+------------------
+* Create windows release.
+* Fix release bugs.
+
 0.0.2 (2023-05-04)
 ------------------
 * Add documentation.

+ 10 - 7
README.rst

@@ -40,7 +40,7 @@ Usage
 Interface
 ~~~~~~~~~
 
-|query_image||prefix_image|
+|query_image| |prefix_image|
 |ui_annotated_image|
 
 .. |query_image| image:: docs/query.png
@@ -53,17 +53,18 @@ Interface
 
 .. |ui_annotated_image| image:: docs/ui_annotated.png
    :alt: Screenshot including the prefix panel of the user interface
-   :width: 48%
+   :width: 100%
 
 The Graph Exploring Tool (or GET) is a graphical application which allows you to explore the knowledge graph using SPARQL queries.
 We provide templates which allow for quick traversal of compliant knowledge graphs.
-The tool separates actions into multiple panel.
-1. The left Query Palette panel (red) allows you to load a predefined template. Hovering over the name of the template will provide a tooltip with the description of the action carried out by that template.
-2. The center and main Query Editor panel (green) is where the template is shown once it has been chosen. You can change the template itself or use the provided fields (blue) to insert references into the template itself.
+The tool separates actions into multiple panels.
+
+1. The left Query Palette panel **(red)** allows you to load a predefined template. Hovering over the name of the template will provide a tooltip with the description of the action carried out by that template.
+2. The center and main Query Editor panel **(green)** is where the template is shown once it has been chosen. You can change the template itself or use the provided fields **(blue)** to insert references into the template itself.
    The reference fields support dragging and dropping.
    To perform the query you need to click the Query button.
-3. The small one line panel (yellow) show the status. This includes messages whether a query was successful. Any error will also be displayed right here.
-4. The most important panel is the Results panel (orange). Any information returned by the query will be displayed here.
+3. The small one line panel **(yellow)** show the status. This includes messages whether a query was successful. Any error will also be displayed right here.
+4. The most important panel is the Results panel **(orange)**. Any information returned by the query will be displayed here.
    You can drag and drop any of the fields in the result onto the parameters fields in the template.
 
 
@@ -75,7 +76,9 @@ You open up the FTGPM++ (workflow diagram) and look at what is of interest to yo
 Let's say you are interested in finding all the individuals (or instances) of a certain type.
 You look at the Query Palette panel. You see the first options which is what you need.
 Now you click on this (Find Individuals) button. Here you see that you need to specify two parameters.
+
 - We need to know what class the individuals you're looking for belong to and perhaps a relation to another individual.
+
 The example assumes you want to find all Formalisms and their name.
 At this point you can execute the query by clicking the Query button.
 The list of corresponding individuals will now be visible in the Results panel.

+ 1 - 1
graph_exploring_tool/__init__.py

@@ -1,3 +1,3 @@
 """Graph Exploring Tool."""
-__version__ = "0.0.2"
+__version__ = "0.0.3"
 __version_info__ = tuple((int(num) if num.isdigit() else num for num in __version__.replace("-", ".", 1).split(".")))

+ 11 - 10
requirements.txt

@@ -5,18 +5,19 @@ dacite        ~= 1.8.0
 rdflib        ~= 6.3.2
 sparqlwrapper ~= 2.0.0
 # Test
-pytest ~= 7.2.2
+pytest ~= 7.3.1
 # Doc
-sphinx ~= 6.1.3
+sphinx ~= 7.0.0
 # Dev
-tox      ~= 4.4.8
-pip      ~= 23.0.1
-flit     ~= 3.8.0
-twine    ~= 4.0.2
-invoke   ~= 2.0.0
-jinja2   ~= 3.1.2
-flake8   ~= 6.0.0
-coverage ~= 7.2.2
+tox         ~= 4.5.1
+pip         ~= 23.1.2
+flit        ~= 3.8.0
+twine       ~= 4.0.2
+invoke      ~= 2.1.1
+jinja2      ~= 3.1.2
+flake8      ~= 6.0.0
+coverage    ~= 7.2.5
+pyinstaller ~= 5.10.1
 # pylode        ~= 3.0.4
 # owlready2     ~= 0.40
 # graphviz      ~= 0.20.1