Skip to content

Commit

Permalink
bump version to 6.2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
leovan committed Feb 6, 2024
1 parent e3cff93 commit 1a1172b
Show file tree
Hide file tree
Showing 17 changed files with 66 additions and 34 deletions.
28 changes: 27 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,34 @@
name: Build latest version
on: [push]
jobs:
build-macos-arm64:
runs-on: macos-14
steps:
- name: Check out code
uses: actions/checkout@v3

- name: Setup python
uses: actions/setup-python@v4
with:
python-version: '3.10'

- name: Install create-dmg
run: brew install create-dmg

- name: Build and package
run: |
chmod +x ./building/build_macos.sh
./building/build_macos.sh arm64
shell: bash

- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: SciHubEVA-macOS-arm64-latest
path: dist-macOS-arm64/SciHubEVA-arm64-latest.dmg

build-macos-x86_64:
runs-on: macOS-latest
runs-on: macos-latest
steps:
- name: Check out code
uses: actions/checkout@v3
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## [6.2.5](https://github.com/leovan/SciHubEVA/compare/v6.2.4...v6.2.5) (2024-02-06)

### Tests

- Add arm64 arch macOS Github Actions building.

## [6.2.4](https://github.com/leovan/SciHubEVA/compare/v6.2.3...v6.2.4) (2023-11-12)

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2018-2023 Leo Van
Copyright (c) 2018-2024 Leo Van

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Sometimes, you may need enter the captcha to continue.

- Run the [AppImage file](https://github.com/leovan/SciHubEVA/releases). Using [AppImageLauncher](https://github.com/TheAssassin/AppImageLauncher) is recommended.

> **Note**
> [!NOTE]
> Tested only on Ubuntu 20.04 and Ubuntu 22.04.
## Building
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2018-2023 Leo Van -->
<!-- Copyright 2018-2024 Leo Van -->
<component type="desktop-application">
<id>tech.leovan.SciHubEVA</id>

Expand Down
6 changes: 3 additions & 3 deletions building/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## macOS

> **Note**
> [!NOTE]
> Require macOS 10.15+, x86_64 and arm64 arch are tested.
1. Create a python environment.
Expand Down Expand Up @@ -44,7 +44,7 @@

## Windows

> **Note**
> [!NOTE]
> Require Windows 10+, x86_64 arch is tested.
1. See step 1 in [macOS](#macos).
Expand All @@ -61,7 +61,7 @@

## Linux

> **Note**
> [!NOTE]
> Require Ubuntu 20.04+, x86_64 arch is tested.
1. See step 1 in [macOS](#macos).
Expand Down
4 changes: 2 additions & 2 deletions building/Windows/SciHubEVA-x86_64.iss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define MyAppName "Sci-Hub EVA"
#define MyAppVersion "6.2.4"
#define MyAppVersion "6.2.5"
#define MyAppPublisher "Leo Van"
#define MyAppURL "https://github.com/leovan/SciHubEVA"
#define MyAppExeName "SciHubEVA.exe"
Expand All @@ -13,7 +13,7 @@ AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
AppCopyright=Copyright (c) 2018-2023 Leo Van.
AppCopyright=Copyright (c) 2018-2024 Leo Van.
VersionInfoVersion={#MyAppVersion}
DefaultDirName={autopf64}\{#MyAppName}
DefaultGroupName={#MyAppName}
Expand Down
10 changes: 5 additions & 5 deletions building/Windows/SciHubEVA.win.version
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
VSVersionInfo(
ffi=FixedFileInfo(
filevers=(6, 2, 4, 0),
prodvers=(6, 2, 4, 0),
filevers=(6, 2, 5, 0),
prodvers=(6, 2, 5, 0),
mask=0x3f,
flags=0x0,
OS=0x4,
Expand All @@ -16,12 +16,12 @@ VSVersionInfo(
u'040904B0',
[StringStruct(u'CompanyName', u'leovan.tech'),
StringStruct(u'FileDescription', u'Sci-Hub EVA'),
StringStruct(u'FileVersion', u'6.2.4.0'),
StringStruct(u'FileVersion', u'6.2.5.0'),
StringStruct(u'InternalName', u'SciHubEVA'),
StringStruct(u'LegalCopyright', u'\xa9 2018-2023 Leo Van.'),
StringStruct(u'LegalCopyright', u'\xa9 2018-2024 Leo Van.'),
StringStruct(u'OriginalFilename', u'SciHubEVA.exe'),
StringStruct(u'ProductName', u'Sci-Hub EVA'),
StringStruct(u'ProductVersion', u'6.2.4.0')])
StringStruct(u'ProductVersion', u'6.2.5.0')])
]),
VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
]
Expand Down
4 changes: 2 additions & 2 deletions building/macOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>MacOS/Sci-Hub EVA</string>
<key>CFBundleShortVersionString</key>
<string>6.2.4</string>
<string>6.2.5</string>
<key>LSBackgroundOnly</key>
<string>0</string>
<key>CFBundleName</key>
Expand All @@ -21,7 +21,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2018-2023 Leo Van</string>
<string>Copyright 2018-2024 Leo Van</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>NSHighResolutionCapable</key>
Expand Down
4 changes: 2 additions & 2 deletions i18n/SciHubEVA_pt_PT.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@
<translation>Por favor primeiro selecione aonde salvar!</translation>
</message>
<message>
<source>Please specify query!</source>
<translation>Por favor especifique o valor da consulta!</translation>
<source>Please set the query!</source>
<translation>Por favor defina a consulta!</translation>
</message>
<message>
<source>Load</source>
Expand Down
4 changes: 2 additions & 2 deletions i18n/SciHubEVA_zh_CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@
<translation>请先选择保存路径!</translation>
</message>
<message>
<source>Please specify query!</source>
<translation>请指定搜索内容!</translation>
<source>Please set query!</source>
<translation>请设置搜索内容!</translation>
</message>
<message>
<source>Load</source>
Expand Down
4 changes: 2 additions & 2 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
docopt==0.6.2
flask==3.0.0
flask==3.0.2
opencc-python-reimplemented==0.1.7
pyinstaller==6.2.0
pyinstaller==6.3.0
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
darkdetect==0.8.0
lxml==4.9.3
lxml==5.1.0
pathvalidate==3.2.0
pdfminer.six==20221105
PySide6==6.6.0
pdfminer.six==20231228
PySide6==6.6.1
PySocks==1.7.1
requests==2.31.0
urllib3==2.0.7
urllib3==2.2.0
10 changes: 5 additions & 5 deletions scihub_eva/globals/preferences.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@

# Network
NETWORK_SCIHUB_URL_KEY = 'Network/SciHubURL'
NETWORK_SCIHUB_URL_DEFAULT = 'https://sci-hub.se'
NETWORK_SCIHUB_URL_DEFAULT = 'https://www.sci-hub.se'

NETWORK_SCIHUB_URLS_KEY = 'Network/SciHubURLs'
NETWORK_SCIHUB_URLS_DEFAULT = [
'https://sci-hub.se',
'https://sci-hub.st',
'https://sci-hub.ru',
'https://www.sci-hub.se',
'https://sci-hub.ren',
'https://www.sci-hub.ru',
]

NETWORK_TIMEOUT_KEY = 'Network/Timeout'
Expand All @@ -37,7 +37,7 @@
NETWORK_USER_AGENT_DEFAULT = (
'Mozilla/5.0 (Windows NT 10.0; Win64; x64) ' +
'AppleWebKit/537.36 (KHTML, like Gecko) ' +
'Chrome/116.0.0.0 ' +
'Chrome/121.0.0.0 ' +
'Safari/537.36'
)

Expand Down
2 changes: 1 addition & 1 deletion scihub_eva/globals/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
ORGANIZATION_NAME = 'LeoVan'
ORGANIZATION_DOMAIN = 'leovan.tech'
APPLICATION_NAME = 'SciHubEVA'
APPLICATION_VERSION = 'v6.2.4'
APPLICATION_VERSION = 'v6.2.5'
2 changes: 1 addition & 1 deletion ui/About.qml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Dialog {
"<p>" + "<a href=\"https://github.com/leovan/SciHubEVA\">Sci-Hub EVA</a> " +
qsTr("is a cross-platform Sci-Hub GUI Application.") + "<br/>" +
"Powered By Python " + PYTHON_VERSION + " & Qt " + QT_VERSION + "</p>" +
"<p>Copyright (c) 2018-2023 <a href=\"https://leovan.me\">" + qsTr("Leo Van") +
"<p>Copyright (c) 2018-2024 <a href=\"https://leovan.me\">" + qsTr("Leo Van") +
"</a> The MIT License</p>"

Layout.fillWidth: true
Expand Down
2 changes: 1 addition & 1 deletion ui/SciHubEVA.qml
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ ApplicationWindow {
dialogMessage.open()
} else if (textFieldQuery.text.trim() === "") {
dialogMessage.messageType = "error"
dialogMessage.message = qsTr("Please specify query!")
dialogMessage.message = qsTr("Please set the query!")
dialogMessage.open()
} else {
rampage(textFieldQuery.text.trim())
Expand Down

0 comments on commit 1a1172b

Please sign in to comment.