Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release prep #89

Merged
merged 1 commit into from
May 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ You can run it in two ways:
$ sudo pip3 install pylint
$ ./bin/pylint.sh
```
- Using docker (same enviorment than pipeline):
- Using docker (same enviorment as pipeline):
```
$ ./docker/bin/run_lint.sh
```
2 changes: 1 addition & 1 deletion doc/gnofract4d-manual/C/gnofract4d-manual.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<!ENTITY gf4d "<application>Gnofract 4D</application>">
<!ENTITY fractint "<application>Fractint</application>">
<!ENTITY ultrafractal "<application>UltraFractal</application>">
<!ENTITY version "4.0">
<!ENTITY version "4.1">

]>
<article id="gnofract4d">
Expand Down
2 changes: 1 addition & 1 deletion fract4d/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from . import fractal

# version of Gnofract 4D
VERSION = '4.0'
VERSION = '4.1'

POSITION_ARGUMENTS = ("xcenter", "ycenter", "zcenter", "wcenter",
"xyangle", "xzangle", "xwangle", "yzangle", "ywangle", "zwangle",
Expand Down
2 changes: 1 addition & 1 deletion fract4dgui/createdocs.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def output_table(self, commands, name, type):
print('</sect2>', file=self.f)


@patch('fract4dgui.main_window.MainWindow.__init__')
# @patch('fract4dgui.main_window.MainWindow.__init__')
def main(outfile):
out = open(outfile, "w")
printer = CommandPrinter(out)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import subprocess
import sys

gnofract4d_version = '4.0'
gnofract4d_version = '4.1'

if sys.version_info < (3, 5):
print("Sorry, you need Python 3.5 or higher to run Gnofract 4D.")
Expand Down
10 changes: 2 additions & 8 deletions test.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ def testWebsiteVersionMatches(self):
if not os.path.exists("website"):
# not included in source dist
return
mkweb = open("website/mkweb.py")
mkweb = open("website/content/_index.md")
content = mkweb.read()
mkweb.close()
ver_re = re.compile(r'text="Version (\S+) released.')
ver_re = re.compile(r'latest: "(\S+)"')

m = ver_re.search(content)
self.assertTrue(m, "doc doesn't specify version")
Expand All @@ -60,11 +60,5 @@ def testGenerateMandelbrot(self):
def suite():
return unittest.makeSuite(Test, 'test')

def main():
pytest.main(['fract4d/tests', 'fract4dgui/tests', 'fract4d_compiler/tests'])


if __name__ == '__main__':
if len(sys.argv) == 1 or sys.argv[1] != "--thisonly":
main()
unittest.main(defaultTest='suite')
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ deps =
pytest

commands =
pytest {posargs: fract4d fract4dgui fract4d_compiler}
pytest {posargs: fract4d fract4dgui fract4d_compiler test.py}

passenv = DISPLAY XAUTHORITY
passenv = DISPLAY XAUTHORITY HOME
2 changes: 1 addition & 1 deletion website/content/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "Front Page"
date: 2020-04-12T08:55:54-07:00
draft: false
latest: "4.0.1"
latest: "4.1"
---


Expand Down