Skip to content

Commit

Permalink
[Minor] Point Change Changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Rixxan committed Mar 13, 2024
1 parent cc39052 commit 0518d2d
Show file tree
Hide file tree
Showing 16 changed files with 19 additions and 23 deletions.
6 changes: 0 additions & 6 deletions EDMarketConnector.VisualElementsManifest.xml

This file was deleted.

Binary file removed EDMarketConnector.icns
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ Please see the [Acknowledgements](https://github.com/EDCD/EDMarketConnector/wiki

License
-------
Copyright © 2015-2019 Jonathan Harris, 2020-2021 EDCD
Copyright © 2015-2019 Jonathan Harris, 2020-2024 EDCD

Licensed under the [GNU Public License (GPL)](http://www.gnu.org/licenses/gpl-2.0.html) version 2 or later.
10 changes: 6 additions & 4 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ def generate_data_files(
"modules.json",
"ships.json",
"ships.p", # TODO: Remove in 6.0
f"{app_name}.VisualElementsManifest.xml",
f"{app_name}.ico",
f"resources/{appcmdname}.ico",
"EDMarketConnector - TRACE.bat",
"EDMarketConnector - localserver-auth.bat",
"EDMarketConnector - reset-ui.bat",
Expand Down Expand Up @@ -165,15 +165,16 @@ def build() -> None:
"script": "EDMarketConnector.py",
"icon_resources": [(0, f"{appname}.ico")],
"other_resources": [
(24, 1, pathlib.Path(f"{appname}.manifest").read_text(encoding="UTF8"))
(24, 1, pathlib.Path(f"resources/{appname}.manifest").read_text(encoding="UTF8"))
],
}

console_config: dict = {
"dest_base": appcmdname,
"script": "EDMC.py",
"icon_resources": [(0, f"resources/{appcmdname}.ico")],
"other_resources": [
(24, 1, pathlib.Path(f"{appcmdname}.manifest").read_text(encoding="UTF8"))
(24, 1, pathlib.Path(f"resources/{appcmdname}.manifest").read_text(encoding="UTF8"))
],
}

Expand All @@ -185,7 +186,8 @@ def build() -> None:
data_files=data_files,
options=options,
)
except FileNotFoundError:
except FileNotFoundError as err:
print(err)
sys.exit(
"Build Failed due to Missing Files! Have you set up your submodules? \n"
"https://github.com/EDCD/EDMarketConnector/wiki/Running-from-source"
Expand Down
4 changes: 2 additions & 2 deletions config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@
# <https://semver.org/#semantic-versioning-specification-semver>
# Major.Minor.Patch(-prerelease)(+buildmetadata)
# NB: Do *not* import this, use the functions appversion() and appversion_nobuild()
_static_appversion = '5.10.1'
_static_appversion = '5.10.2'

_cached_version: semantic_version.Version | None = None
copyright = '© 2015-2019 Jonathan Harris, 2020-2023 EDCD'
copyright = '© 2015-2019 Jonathan Harris, 2020-2024 EDCD'

update_feed = 'https://raw.githubusercontent.com/EDCD/EDMarketConnector/releases/edmarketconnector.xml'
update_interval = 8*60*60 # 8 Hours
Expand Down
16 changes: 8 additions & 8 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@ wheel
# We can't rely on just picking this up from either the base (not venv),
# or venv-init-time version. Specify here so that dependabot will prod us
# about new versions.
setuptools==69.0.3
setuptools==69.1.1

# Static analysis tools
flake8==6.1.0
flake8==7.0.0
flake8-annotations-coverage==0.0.6
flake8-cognitive-complexity==0.1.0
flake8-comprehensions==3.14.0
flake8-docstrings==1.7.0
flake8-json==23.7.0
flake8-noqa==1.3.2
flake8-noqa==1.4.0
flake8-polyfill==1.0.2
flake8-use-fstring==1.4

mypy==1.8.0
pep8-naming==0.13.3
safety==2.3.5
types-requests==2.31.0.20231231
types-requests==2.31.0.20240125
types-pkg-resources==0.1.3

# Code formatting tools
autopep8==2.0.4

# Git pre-commit checking
pre-commit==3.6.0
pre-commit==3.6.2

# HTML changelogs
grip==4.6.2
Expand All @@ -38,13 +38,13 @@ grip==4.6.2
py2exe==0.13.0.1; sys_platform == 'win32'

# Testing
pytest==7.4.3
pytest==8.0.2
pytest-cov==4.1.0 # Pytest code coverage support
coverage[toml]==7.3.4 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs
coverage[toml]==7.4.1 # pytest-cov dep. This is here to ensure that it includes TOML support for pyproject.toml configs
coverage-conditional-plugin==0.9.0
# For manipulating folder permissions and the like.
pywin32==306; sys_platform == 'win32'


# All of the normal requirements
-r requirements.txt
-r requirements.txt
File renamed without changes.
2 changes: 1 addition & 1 deletion resources/EDMC_Installer_Config_template.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#SuppURL}
AppUpdatesURL={#SuppURL}
AppCopyright=Copyright (C) 2015-2019 Jonathan Harris, 2020-2023 EDCD
AppCopyright=Copyright (C) 2015-2019 Jonathan Harris, 2020-2024 EDCD
AllowUNCPath=no
AllowNetworkDrive=no
DefaultDirName={autopf}\{#MyAppName}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file added resources/edmc.ico
Binary file not shown.
Binary file added resources/io.edcd.EDMarketConnector.cmd.psd
Binary file not shown.
2 changes: 1 addition & 1 deletion scripts/find_localised_strings.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ def generate_lang_template(data: dict[pathlib.Path, list[ast.Call]]) -> str:
print(f'NEW! {file}:{c.lineno}: {arg!r}')

for old in set(template) ^ seen:
print(f'No longer used: {old}')
print(f'No longer used: {old!r}')

elif args.json:
to_print_data = [
Expand Down

0 comments on commit 0518d2d

Please sign in to comment.