Merge pull request #119 from sepandhaghighi/dev

Version 1.2

Author: sepandhaghighi

.github/workflows/publish_conda.yaml

@@ -0,0 +1,18 @@
+name: publish_conda
+
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - '*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: publish-to-conda
+        uses: sepandhaghighi/conda-package-publish-action@v1.2
+        with:
+          subDir: 'otherfile'
+          AnacondaToken: ${{ secrets.ANACONDA_TOKEN }}

.github/workflows/publish.yml renamed to .github/workflows/publish_pypi.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9, 3.10.0]
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

.github/workflows/test.yml

@@ -1,8 +1,8 @@
 # Core Developers #
 
 ----------
-- Sepand Haghighi - Sharif University Of Technology - ([@sepandhaghighi](http://github.com/sepandhaghighi)) ([sepand@pyrgg.ir](mailto:sepand@pyrgg.ir))
-- Sadra Sabouri - Sharif University Of Technology - ([@sadrasabouri](https://github.com/sadrasabouri)) ([sadra@pyrgg.ir](mailto:sadra@pyrgg.ir))
+- Sepand Haghighi - Sharif University of Technology - ([@sepandhaghighi](http://github.com/sepandhaghighi)) ([sepand@pyrgg.ir](mailto:sepand@pyrgg.ir))
+- Sadra Sabouri - Sharif University of Technology - ([@sadrasabouri](https://github.com/sadrasabouri)) ([sadra@pyrgg.ir](mailto:sadra@pyrgg.ir))
 
 # Other Contributors #
 ----------

AUTHORS.md

@@ -5,6 +5,25 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [1.2] - 2022-09-07
+### Added
+- Anaconda workflow
+- Discord badge
+### Changed
+- Menu optimized
+- Docstrings modified
+- `branch_gen` function modified
+- `edge_gen` function modified
+- `precision` and `min_edge` parameters added to `branch_gen` function
+- `random_edge` parameter removed from `branch_gen` function
+- Test system modified
+- `AUTHORS.md` updated
+- License updated
+- `README.md` modified
+- `Python 3.10` added to `test.yml`
+### Removed
+- `sign_gen` function
+- `random_edge_limits` function
 ## [1.1] - 2021-06-09
 ### Added
 - `requirements-splitter.py`
@@ -128,7 +147,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - JSON format
 - README
 
-[Unreleased]: https://github.com/sepandhaghighi/pyrgg/compare/v1.1...dev
+[Unreleased]: https://github.com/sepandhaghighi/pyrgg/compare/v1.2...dev
+[1.2]: https://github.com/sepandhaghighi/pyrgg/compare/v1.1...v1.2
 [1.1]: https://github.com/sepandhaghighi/pyrgg/compare/v1.0...v1.1
 [1.0]: https://github.com/sepandhaghighi/pyrgg/compare/v0.9...v1.0
 [0.9]: https://github.com/sepandhaghighi/pyrgg/compare/v0.8...v0.9

CHANGELOG.md

@@ -2,6 +2,8 @@ MIT License
 
 Copyright (c) 2017 Sepand Haghighi
 
+Copyright (c) 2021 Sadra Sabouri
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

LICENSE

@@ -13,7 +13,9 @@
 <a href="https://codecov.io/gh/sepandhaghighi/pyrgg">
   <img src="https://codecov.io/gh/sepandhaghighi/pyrgg/branch/master/graph/badge.svg" alt="Codecov" /></a>
 <a href="https://www.python.org/"><img src="https://img.shields.io/badge/built%20with-Python3-green.svg" alt="built with Python3" /></a>
-
+<a href="https://discord.gg/dfYAWVMaCW">
+  <img src="https://img.shields.io/discord/1013411447130308669.svg" alt="Discord Channel">
+</a>
 </div>	
 
 ----------
@@ -32,7 +34,7 @@
    * [References](https://github.com/sepandhaghighi/pyrgg#references)
    * [Citing](https://github.com/sepandhaghighi/pyrgg#citing)
    * [Authors](https://github.com/sepandhaghighi/pyrgg/blob/master/AUTHORS.md)
-   * [License](https://github.com/sepandhaghighi/pyrgg#license)
+   * [License](https://github.com/sepandhaghighi/pyrgg/blob/master/LICENSE)
    * [Show Your Support](https://github.com/sepandhaghighi/pyrgg#show-your-support)
    * [Changelog](https://github.com/sepandhaghighi/pyrgg/blob/master/CHANGELOG.md)
    * [Code of Conduct](https://github.com/sepandhaghighi/pyrgg/blob/master/.github/CODE_OF_CONDUCT.md)			
@@ -49,7 +51,7 @@ Pyrgg target audiences are computer scientists who study graph algorithms and gr
 	</tr>
 	<tr>
 		<td align="center">PyPI Counter</td>
-		<td align="center"><a href="http://pepy.tech/count/pyrgg"><img src="http://pepy.tech/badge/pyrgg"></a></td>
+		<td align="center"><a href="http://pepy.tech/project/pyrgg"><img src="http://pepy.tech/badge/pyrgg"></a></td>
 	</tr>
 	<tr>
 		<td align="center">Github Stars</td>
@@ -86,23 +88,23 @@ Pyrgg target audiences are computer scientists who study graph algorithms and gr
 ## Installation		
 
 ### Source Code
-- Download [Version 1.1](https://github.com/sepandhaghighi/pyrgg/archive/v1.1.zip) or [Latest Source ](https://github.com/sepandhaghighi/pyrgg/archive/dev.zip)
+- Download [Version 1.2](https://github.com/sepandhaghighi/pyrgg/archive/v1.2.zip) or [Latest Source ](https://github.com/sepandhaghighi/pyrgg/archive/dev.zip)
 - `pip install -r requirements.txt` or `pip3 install -r requirements.txt` (Need root access)
 - `python3 setup.py install` or `python setup.py install` (Need root access)				
 
 ### PyPI
 
 - Check [Python Packaging User Guide](https://packaging.python.org/installing/)     
-- `pip install pyrgg==1.1` or `pip3 install pyrgg==1.1` (Need root access)							
+- `pip install pyrgg==1.2` or `pip3 install pyrgg==1.2` (Need root access)							
 
 ### Conda
 
 - Check [Conda Managing Package](https://conda.io)
 - `conda install -c sepandhaghighi pyrgg` (Need root access)	
 
 ### Exe Version (Only Windows)
-- Download [Exe-Version 1.1](https://github.com/sepandhaghighi/pyrgg/releases/download/v1.1/PYRGG-1.1.exe)
-- Run `PYRGG-1.1.exe`
+- Download [Exe-Version 1.2](https://github.com/sepandhaghighi/pyrgg/releases/download/v1.2/PYRGG-1.2.exe)
+- Run `PYRGG-1.2.exe`
 
 ### System Requirements
 Pyrgg will likely run on a modern dual core PC. Typical configuration is:
@@ -124,9 +126,16 @@ Note that it may run on lower end equipment though good performance is not guara
 
 ## Issues & Bug Reports			
 
-Just fill an issue and describe it. I'll check it ASAP!							
+Just fill an issue and describe it. We'll check it ASAP!							
 or send an email to [info@pyrgg.ir](mailto:info@pyrgg.ir "info@pyrgg.ir"). 
 
+You can also join our discord server			
+
+<a href="https://discord.gg/dfYAWVMaCW">
+  <img src="https://img.shields.io/discord/1013411447130308669.svg?style=for-the-badge" alt="Discord Channel">
+</a>
+
+
 ## TODO	
 - [x] Formats
   - [x] DIMACS
@@ -537,11 +546,6 @@ If you use pyrgg in your research, please cite the [JOSS paper](http://joss.theo
 </table>
  			
 
-## License
-
-<a href="https://app.fossa.com/projects/git%2Bgithub.com%2Fsepandhaghighi%2Fpyrgg?ref=badge_large" alt="FOSSA Status"><img src="https://app.fossa.com/api/projects/git%2Bgithub.com%2Fsepandhaghighi%2Fpyrgg.svg?type=large"/></a>
-
-
 ## References
 					
 
@@ -597,5 +601,10 @@ bnb1zglwcf0ac3d0s2f6ck5kgwvcru4tlctt4p5qef
 <h4>Dash</h4>
 Xd3Yn2qZJ7VE8nbKw2fS98aLxR5M6WUU3s
 <h4>Stellar</h4>		
-
-GALPOLPISRHIYHLQER2TLJRGUSZH52RYDK6C3HIU4PSMNAV65Q36EGNL	
+GALPOLPISRHIYHLQER2TLJRGUSZH52RYDK6C3HIU4PSMNAV65Q36EGNL
+<h4>Zilliqa</h4>
+zil1knmz8zj88cf0exr2ry7nav9elehxfcgqu3c5e5
+<h4>Coffeete</h4>
+<a href="http://www.coffeete.ir/opensource">
+<img src="http://www.coffeete.ir/images/buttons/lemonchiffon.png" style="width:260px;" />
+</a>	

README.md

@@ -1,5 +1,5 @@
-art==5.2
-pyyaml==5.4.1
+art==5.7
+pyyaml==6.0
 codecov>=2.0.15
 scipy>=1.2.0
 networkx>=2.1

dev-requirements.txt

@@ -1,7 +1,7 @@
 VSVersionInfo(
   ffi=FixedFileInfo(
-    filevers=(1, 1, 0, 0),
-    prodvers=(1, 1, 0, 0),
+    filevers=(1, 2, 0, 0),
+    prodvers=(1, 2, 0, 0),
     mask=0x3f,
     flags=0x0,
     OS=0x40004,
@@ -14,14 +14,14 @@ VSVersionInfo(
       [
     StringTable(
         u'040904B0',
-        [StringStruct(u'CompanyName', u'Sepand Haghighi'),
+        [StringStruct(u'CompanyName', u'PyRGG Development Team'),
         StringStruct(u'FileDescription', u'PYRGG.exe'),
-        StringStruct(u'FileVersion', u'1.1.0.0'),
+        StringStruct(u'FileVersion', u'1.2.0.0'),
         StringStruct(u'InternalName', u'PYRGG.exe'),
-        StringStruct(u'LegalCopyright', u'Copyright (c) 2021 Sepand Haghighi'),
+        StringStruct(u'LegalCopyright', u'Copyright (c) 2022 PyRGG Development Team'),
         StringStruct(u'OriginalFilename', u'PYRGG.exe'),
         StringStruct(u'ProductName', u'PYRGG'),
-        StringStruct(u'ProductVersion', u'1, 1, 0, 0')])
+        StringStruct(u'ProductVersion', u'1, 2, 0, 0')])
     ]), 
     VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
   ]

otherfile/Version.rc

@@ -0,0 +1,36 @@
+{% set name = "pyrgg" %}
+{% set version = "1.2" %}
+
+package:
+    name: {{ name|lower }}
+    version: {{ version }}
+source:
+    git_url: https://github.com/sepandhaghighi/pyrgg
+    git_rev: v{{ version }}
+build:
+    noarch: python
+    number: 0
+    script: {{ PYTHON }} -m pip install . -vv
+requirements:
+    host:
+        - pip
+        - setuptools
+        - python >=3.5
+    run:
+        - art >=0.7
+        - pyyaml >=3.12
+        - python >=3.5
+about:
+    home: https://github.com/sepandhaghighi/pyrgg
+    license: MIT
+    license_family: MIT
+    summary: Python Random Graph Generator
+    description: |
+        Pyrgg is an easy-to-use synthetic random graph generator written in Python which supports various graph file formats including DIMACS .gr files. Pyrgg has the ability to generate graphs of different sizes and is designed to provide input files for broad range of graph-based research applications, including but not limited to testing, benchmarking and performance-analysis of graph processing frameworks. Pyrgg target audiences are computer scientists who study graph algorithms and graph processing frameworks.
+
+        Website: https://www.pyrgg.ir
+
+        Repo: https://github.com/sepandhaghighi/pyrgg
+extra:
+    recipe-maintainers:
+        - sepandhaghighi

otherfile/meta.yaml

@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 """Profile file."""
 from pyrgg import *
+import pyrgg.params
+import random
 
-
-dimacs_maker('profile', 1, 5000, 30000, 1, 60, 0, 1, 1, 1)
+pyrgg.params.PYRGG_TEST_MODE = True
+random.seed(400)
+dimacs_maker('profile', 1, 5000, 10000, 5, 600, 0, 1, 1, 1)

otherfile/pyrgg_profile.py

@@ -4,7 +4,7 @@
 import sys
 import codecs
 Failed = 0
-VERSION = "1.1"
+VERSION = "1.2"
 
 VERSION_1 = VERSION.split(".")[0]
 VERSION_2 = str(int(float(VERSION) * 10 - int(VERSION_1) * 10))
@@ -31,13 +31,19 @@
     "(u'FileVersion', u'{0}.{1}.{2}.{3}'),",
     "(u'ProductVersion', u'{0}, {1}, {2}, {3}')"]
 PARAMS_ITEMS = ['PYRGG_VERSION = "{0}"']
+META_ITEMS = ['% set version = "{0}" %']
+
 FILES = {
     "setup.py": SETUP_ITEMS,
     "README.md": README_ITEMS,
     "CHANGELOG.md": CHANGELOG_ITEMS,
     os.path.join(
         "pyrgg",
-        "params.py"): PARAMS_ITEMS}
+        "params.py"): PARAMS_ITEMS,
+    os.path.join(
+        "otherfile",
+        "meta.yaml"): META_ITEMS
+}
 
 TEST_NUMBER = len(FILES.keys()) + 1