0
Commit Graph

2632 Commits

Author SHA1 Message Date
Nicolas F
e28c2e9284 docs/installing: remove CentOS 6 section
Hopelessly outdated distro release that not even EPEL can save, so
there's no way we can support it with prebuilt packages.
2019-05-20 15:35:49 +02:00
Nicolas F
7d5f3009e7 Merge pull request #1556 from SteadBytes/python3-popen-bytes
Decode Popen stdout bytes to utf-8
2019-04-20 16:45:46 +02:00
Ben Steadman
8bd731fde1 decode Popen stdout bytes to utf-8 2019-04-20 10:36:53 +01:00
Nicolas F
f512492ed7 Merge pull request #1545 from SteadBytes/contrib-python3
Move Contrib Scripts to Python3
2019-04-07 14:27:59 +02:00
Nicolas F
98e197d64c docs/installing: update CenturyOldOS instructions
Imagine not having Python 3 in 2019 LMAO
2019-04-06 21:15:50 +02:00
Ben Steadman
2241f4856d remove deleted contrib scripts 2019-04-06 19:12:19 +01:00
Ben Steadman
ae32f5f019 logger.warn->logger.warning 2019-04-06 19:08:23 +01:00
Ben Steadman
b7e9e868ce use adjacency dictionary for graph equality 2019-03-30 16:49:17 +00:00
Ben Steadman
6b533dad04 python3.5 minimum 2019-03-30 14:44:28 +00:00
Ben Steadman
3423b8f6a4 pip install networkx in travis 2019-03-30 11:57:23 +00:00
Ben Steadman
9db2ececb8 testRender.py tests 2019-03-30 11:51:45 +00:00
Ben Steadman
d11bf1306d testRender.py Python3 refactor 2019-03-30 11:49:39 +00:00
Ben Steadman
dd11cdd03b # This is a combination of 7 commits.
# This is the 1st commit message:

testRender.py Python3 refactor

# The commit message #2 will be skipped:

# Popen -> subprocess.run

# The commit message #3 will be skipped:

# split subprocess args

# The commit message #4 will be skipped:

# map -> list comprehension

# The commit message #5 will be skipped:

# optparse->argparse

# The commit message #6 will be skipped:

# factor out CLI parsing from main logic

# The commit message #7 will be skipped:

# fix backwards verbose/quiet behaviour
2019-03-30 11:46:37 +00:00
Ben Steadman
36f55ea7b4 python3 shebang lines 2019-03-30 11:46:37 +00:00
Ben Steadman
cf695ed9de regionTrimmer.py tests 2019-03-30 11:48:38 +00:00
Ben Steadman
9121a4b080 regionTrimmer.py Python3 refactor 2019-03-30 11:46:37 +00:00
Ben Steadman
ced67cf317 deltete deprecated/unused scripts 2019-03-30 11:48:07 +00:00
Ben Steadman
5807c2565b playerInspect.py Python3 refactor 2019-03-30 11:46:37 +00:00
Ben Steadman
7516cd0c25 gallery.py Python3 refactor 2019-03-30 11:46:37 +00:00
Ben Steadman
4e3a861c9c cyrillic_convert.py Python3 refactor 2019-03-30 11:47:00 +00:00
Ben Steadman
7a2b0e6061 contributors.py Python3 refactor 2019-03-30 11:46:37 +00:00
Ben Steadman
bd596c56c2 contributors.py Python3 refactor 2019-03-30 11:46:37 +00:00
Nicolas F
58f73d8f81 docs/building.rst: clean up macOS instructions
I've had to fight rst a lot to get this right, somehow the code
block after the last bullet point breaks if you explicitly number
the enumerated list instead of using auto-enumeration. Like legit,
change `#.` to `12.` and it'll break. No clue why.
2019-03-27 15:15:07 +01:00
Nicolas F
3c4d8e34e6 docs: move last mentions of Python 2 to Python 3
I've adjusted the macOS instructions slightly to be more general,
e.g. do not advise symlinking a specific Python executable of a
specific version, just tell people they should make sure it's in
their environment.

And yes, on Windows, python.exe is whatever version you have installed,
so if you install Python 3, python.exe is going to be Python 3.

I've removed the FreeBSD instructions because they only talk about
working around ports potentially using Python 2.6, which is no longer
relevant. If somebody here uses FreeBSD and has anything to add to the
instructions not already covered by the Linux instructions, let me know.
2019-03-27 15:14:01 +01:00
Nicolas F
4c3e0bfb6e docs: update mingw build instructions (untested) 2019-03-22 17:19:47 +01:00
Nicolas F
316b8099e9 docs: update Linux build instructions for Python 3 2019-03-22 17:18:12 +01:00
Nicolas F
dc7d1cd208 genPOI: replace optparse with argparse
Maybe one day we'll use actual subparsers but today is not that day.
2019-03-22 17:10:52 +01:00
Nicolas F
4c78a05e91 travis: switch to xenial and test for python 3.7
Python 3.7 requires using the xenial images in Travis-CI. It appears
that they do not yet have newer distro version images available, so
that's the best we can get for now.
2019-03-21 15:29:41 +01:00
Nicolas F
a23682fec8 docs: update optimizeimages instructions for py3 2019-03-21 15:21:43 +01:00
Nicolas F
11aa232141 genPOI: port to Python 3
There's some stuff left to do, like properly do the functools.partial
stuff, and check that the uuidcache is actually working. But hey,
player markers work at least, and so does --skip-scan.

Still needs a port to argparse though.
2019-03-18 19:45:22 +01:00
Nicolas F
7085b048de overviewer: fix shell quoting check in edge case
If you supply an option that can't possibly be a world or an output
but isn't recognised, Overviewer would barf.
2019-03-18 19:36:24 +01:00
Nicolas F
a533f3a396 contribManager: Python 3 compatibility 2019-03-18 18:52:32 +01:00
Nicolas F
a709dbccf5 Merge branch 'contribManager-management' into python3-fun-times 2019-03-18 18:50:23 +01:00
Nicolas F
0072eae3f0 world: fix reading old biomes
Some older maps store biomes differently, and we should use this as
a bytes object, not a str object.
2019-03-17 18:13:26 +01:00
Nicolas F
137797cd51 travis: move to Python 3 2019-03-17 18:08:03 +01:00
Nicolas F
e348a548b6 Initial Python 3 port
Many things work, some don't. Notably, genPOI doesn't work, and
there's some signedness comparison stuff going on in the C extension.

This also completely drops support for Python 2, as maintaining a C
extension for both Python 2 and 3 is a pain and not worth it for the
9 months that Python 2 is still going to be supported upstream.

The documentation needs to be adjusted as well.

All of the few tests we have pass, and rendering a map works, both
with a configuration file and without. We can also use optimizeimages.

Concerns #1528.
2019-03-17 17:57:07 +01:00
Nicolas F
99eebd5b69 world: fix potatoes and carrots growth stages
Concerns #1486

Also get rid of an obviously broken leftover wheat elif.
2019-03-16 17:47:49 +01:00
Nicolas F
f7ab92917f world: fix seed growth stages
Concerns #1486
2019-03-16 17:40:05 +01:00
Nicolas F
061406ca55 world: fix mossy cobblestone block/wall rendering
Concerns #1486

I need some high-proof alcohol.
2019-03-16 17:07:35 +01:00
Nicolas F
dd6e69189f world: fix petrified_oak_slab rendering
Concerns #1486
2019-03-16 16:50:15 +01:00
Nicolas F
6aaf680c8c settingsValidators: fix code style, adjust strings
Some absolute thonkers in here like two-spaces indent code. Yikes
my man.
2019-03-15 16:48:08 +01:00
Nicolas F
d6ed0bd416 overviewer: use print_function
PYTHON 3 SOON POGGERS
2019-03-14 16:03:35 +01:00
Nicolas F
4082c8ed05 contrib/playerInspect: add usage output 2019-03-14 13:57:29 +01:00
Nicolas F
05f031fbb9 contrib/playerInspect: fix code style
Also use the print function.
2019-03-14 13:48:53 +01:00
Nicolas F
75f2bc1dfc contribManager: fix imports, use print_function
We don't need to import nbt from overviewer_core at all so we
can remove the silly fix to do that. Why was that ever there? It's
a mystery!
2019-03-14 13:40:27 +01:00
Nicolas F
4be0f07156 contribManager: fix code style 2019-03-14 13:30:22 +01:00
Nicolas F
daa25d80fd Merge pull request #1533 from CounterPillow/png-it-modernisation
Modernise png-it.py and make it less weird
2019-03-13 17:09:27 +01:00
Nicolas F
d742c15a1c Merge pull request #1534 from NPCtom/patch-2
Replace OSX with macOS
2019-03-12 05:58:15 +01:00
Tom Tamaira
579b0aacf8 Replaced OSX with macOS 2019-03-12 16:25:05 +13:00
Nicolas F
2c1ce0d522 contrib/png-it: allow saving to stdout with -
Following the same convention as some other tools, - as output
filename means stdout now.
2019-03-12 00:41:57 +01:00