From 112d702abcfaac6e2c6c3b3533cfed6019ea8497 Mon Sep 17 00:00:00 2001 From: Edwin Young Date: Sat, 9 May 2020 15:47:38 -0700 Subject: [PATCH] release prep (#89) --- README.md | 2 +- doc/gnofract4d-manual/C/gnofract4d-manual.xml | 2 +- fract4d/options.py | 2 +- fract4dgui/createdocs.py | 2 +- setup.py | 2 +- test.py | 10 ++-------- tox.ini | 4 ++-- website/content/_index.md | 2 +- 8 files changed, 10 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index fe3008023..c38ea4ae5 100644 --- a/README.md +++ b/README.md @@ -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 ``` diff --git a/doc/gnofract4d-manual/C/gnofract4d-manual.xml b/doc/gnofract4d-manual/C/gnofract4d-manual.xml index 0aa7d3e64..dbf405d47 100644 --- a/doc/gnofract4d-manual/C/gnofract4d-manual.xml +++ b/doc/gnofract4d-manual/C/gnofract4d-manual.xml @@ -10,7 +10,7 @@ Gnofract 4D"> Fractint"> UltraFractal"> - + ]>
diff --git a/fract4d/options.py b/fract4d/options.py index 0898ceae7..2b725ecc7 100644 --- a/fract4d/options.py +++ b/fract4d/options.py @@ -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", diff --git a/fract4dgui/createdocs.py b/fract4dgui/createdocs.py index b072284f4..c3d8c753a 100755 --- a/fract4dgui/createdocs.py +++ b/fract4dgui/createdocs.py @@ -94,7 +94,7 @@ def output_table(self, commands, name, type): print('', 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) diff --git a/setup.py b/setup.py index 45a6b9923..915f13224 100755 --- a/setup.py +++ b/setup.py @@ -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.") diff --git a/test.py b/test.py index e7d6661c1..66d0b33f1 100755 --- a/test.py +++ b/test.py @@ -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") @@ -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') diff --git a/tox.ini b/tox.ini index bf90a867a..14a701666 100644 --- a/tox.ini +++ b/tox.ini @@ -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 diff --git a/website/content/_index.md b/website/content/_index.md index 8507f1098..e49e35f36 100644 --- a/website/content/_index.md +++ b/website/content/_index.md @@ -2,7 +2,7 @@ title: "Front Page" date: 2020-04-12T08:55:54-07:00 draft: false -latest: "4.0.1" +latest: "4.1" ---