Merge pull request #70 from t0xic0der/pyproject-packaging

PyProject Packaging

Author: gridhead

README.md

@@ -52,7 +52,9 @@ This mode installs all the above packages. (Not been implemented yet)
 - **`sudo nvautoinstall --cheksu`**  
 This mode allows you to check the current user privilege level. You can use this tool effectively only when you have logged in as a root or sudo user.
 - **`sudo nvautoinstall --compat`**  
-This mode allows you to check your hardware and host compatiblity. The tool would check your hardware and host and tell if your device is supported by the tool or not.
+This mode allows you to check your hardware and host compatibility. The tool would check your hardware and host and tell if your device is supported by the tool or not.
+- **`sudo nvautoinstall --primec`**  
+This mode allows you to toggle the PRIME offloading to render all display elements using the discrete card. This has only been tested on Workstation variant of Fedora.
 - **`sudo nvautoinstall --version`**  
 This mode would show the tool version and exit out.
 - **`sudo nvautoinstall --help`**  
@@ -67,14 +69,14 @@ This mode would show the help message and exit out.
 * Only tested on 9XX/10XX/20XX series discrete cards.
 * Use discretion while installing with older cards.
 * No additional configuration is required for Optimus setups.
+* Native support for PRIME configuration on Optimus.
 
 ## Coming soon
 * CLI "Launch using Dedicated Graphics Card" option.
 * Intuitive mode switching for hybrid graphics.
 * Distinct mode for using integrated or discrete GPU.
 * Experimental support for RHEL 8 and CentOS 8.
 * Support for older cards by active querying at NVIDIA.
-* Native support for PRIME configuration on Optimus.
 
 ## Disclaimer
 This tool has been tried and tested multiple times and is expected to work flawlessly in Fedora Workstation 32 or above. It has not been tested on any of the spins yet so proceed with caution. While the chances of things going wrong is pretty slim but still you would want to make backups, should things do not go as expected. As always, you are choosing to use this tool at your will and you cannot hold me responsible for any mishap there may occur due to the misuse of this tool.

TODO.md

@@ -1,8 +1,8 @@
 %global srcname nvidia-auto-installer-for-fedora
 
 Name: nvautoinstall
-Version: 0.3.8
-Release: 0%{?dist}
+Version: 0.3.9
+Release: 1%{?dist}
 Summary: NVIDIA Auto Installer for Fedora
 
 License: GPLv3
@@ -12,47 +12,54 @@ Source0: https://github.com/t0xic0der/%{srcname}/releases/download/v%{version}/%
 BuildArch: noarch
 
 BuildRequires: python3-devel
-BuildRequires: python3-setuptools
+
+Requires: dnf-plugins-core
 
 %description
 A CLI tool which lets you install proprietary NVIDIA drivers and much more
 
 %prep
 %autosetup
 
+%generate_buildrequires
+%pyproject_buildrequires -r
+
 %build
-%py3_build
+%pyproject_wheel
 
 %install
-%py3_install
+%pyproject_install
+%pyproject_save_files nvautoinstall
 
-#-- FILES ---------------------------------------------------------------------#
-%files
+%files -f %{pyproject_files}
 %doc README.md
 %license LICENSE
 %{_bindir}/nvautoinstall
-%{python3_sitelib}/%{name}-*.egg-info/
-%{python3_sitelib}/%{name}/
 
-#-- CHANGELOG -----------------------------------------------------------------#
 %changelog
 
-* Mon Aug 02 2021 Akashdeep Dhar <[email protected]>
+* Thu Aug 12 2021 Akashdeep Dhar <[email protected]> - 0.3.9-1
+- v0.3.9
+- Reworked RPM specfile with pyproject directives
+- Removed dependency on python3-setuptools for build
+- Added dnf-plugins-core in the list of runtime dependencies
+
+* Mon Aug 02 2021 Akashdeep Dhar <[email protected]> - 0.3.8-0
 - v0.3.8
 - Replaced ping with curl for checking availability of RPM Fusion servers
 - Replaced ping with curl for checking availability of NVIDIA Developer servers
 
-* Sat May 22 2021 Akashdeep Dhar <[email protected]>
+* Sat May 22 2021 Akashdeep Dhar <[email protected]> - 0.3.7-0
 - v0.3.7
 - Added option to enable/disable PRIME support on Optimus-supported devices
 - Added other miscellaneous changes for ease of maintenance
 
-* Sun May 09 2021 Akashdeep Dhar <[email protected]>
+* Sun May 09 2021 Akashdeep Dhar <[email protected]> - 0.3.6-0
 - v0.3.6
 - Reworked installation method for CUDA repo compatibility
 - Minor patch leading to a version bump
 
-* Thu Apr 29 2021 Akashdeep Dhar <[email protected]>
+* Thu Apr 29 2021 Akashdeep Dhar <[email protected]> - 0.3.5-0
 - v0.3.5
 - Corrected unicode escape sequences for colors
 - Changed CUDA repository to the most recent F33 remote install
@@ -61,7 +68,7 @@ A CLI tool which lets you install proprietary NVIDIA drivers and much more
 - Made compliance related changes here and there
 - Tested and confirmed the tool to be working in F34 Workstation
 
-* Thu Jun 04 2020 Akashdeep Dhar <[email protected]>
+* Thu Jun 04 2020 Akashdeep Dhar <[email protected]> - 0.3.0-0
 - v0.3.0
 - Combined RPM Fusion pinging, checking, installing into a single module
 - Combined driver installer and existing package checking into a single module
@@ -81,13 +88,13 @@ A CLI tool which lets you install proprietary NVIDIA drivers and much more
 - Added network availability check before pinging respective repo servers
 - Improved handling of interrupt. halt and suspend system calls for tool
 
-* Mon Jun 01 2020 Akashdeep Dhar <[email protected]>
+* Mon Jun 01 2020 Akashdeep Dhar <[email protected]> - 0.2.6-0
 - v0.2.6
 - Fixed broken repository addition module
 - Added installation of fedora-workstation-repositories first
 - Added enabling of repository after the install is complete
 
-* Sun May 31 2020 Akashdeep Dhar <[email protected]>
+* Sun May 31 2020 Akashdeep Dhar <[email protected]> - 0.2.5-0
 - v0.2.5
 - Removed mandatory sleep for kernel module load
 - Removed dependency on kernel module loader
@@ -97,7 +104,7 @@ A CLI tool which lets you install proprietary NVIDIA drivers and much more
 - Fixed boolean choices in package check
 - Fixed prompt colors for custom-themed terminals
 
-* Wed May 27 2020 Akashdeep Dhar <[email protected]>
+* Wed May 27 2020 Akashdeep Dhar <[email protected]> - 0.2.0-0
 - v0.2.0
 - Cleaned up repeated code using class implemented decorator calls
 - Enforced root access for whole operation instead of sudo implementation
@@ -109,7 +116,7 @@ A CLI tool which lets you install proprietary NVIDIA drivers and much more
 - Fixed confirmation choice during package check
 - Fixed typo in RPM Fusion mentions throughout the tool interface
 
-* Fri May 22 2020 Akashdeep Dhar <[email protected]>
+* Fri May 22 2020 Akashdeep Dhar <[email protected]> - 0.1.0-0
 - v0.1.0
 - Added host detection with display of system details and hostname
 - Added GPU compatibility check for detecting active NVIDIA GPU

nvautoinstall.spec

@@ -1,11 +1,35 @@
-import setuptools, codecs, os.path
+"""
+##########################################################################
+*
+*   Copyright © 2019-2021 Akashdeep Dhar <[email protected]>
+*
+*   This program is free software: you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation, either version 3 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*
+##########################################################################
+"""
+
+import codecs
+import os.path
+import setuptools
+
 
-# get __version__ from a file
 def read(rel_path):
     here = os.path.abspath(os.path.dirname(__file__))
     with codecs.open(os.path.join(here, rel_path), 'r') as fp:
         return fp.read()
 
+
 def get_version(rel_path):
     for line in read(rel_path).splitlines():
         if line.startswith('__version__'):
@@ -14,6 +38,7 @@ def get_version(rel_path):
     else:
         raise RuntimeError("Unable to find version string.")
 
+
 # setuptools configuration
 setuptools.setup(
     name='nvautoinstall',
@@ -29,26 +54,26 @@ def get_version(rel_path):
     version=get_version("src/nvautoinstall/__init__.py"),
     # tell distutils packages are under src directory
     package_dir={
-      '': 'src',
+        '': 'src',
     },
     packages=setuptools.find_packages('src'),
     install_requires=[
-      'click',
-      'distro',
+        'click',
+        'distro',
     ],
     # automatically create console scripts
     entry_points={
-      'console_scripts': ['nvautoinstall=nvautoinstall.MainFunction:clim'],
+        'console_scripts': ['nvautoinstall=nvautoinstall.MainFunction:clim'],
     },
     classifiers=[
-      'Development Status :: 4 - Beta',
-      'Environment :: Console',
-      'Intended Audience :: End Users/Desktop',
-      'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
-      'Natural Language :: English',
-      'Programming Language :: Python :: 3',
-      'Operating System :: POSIX :: Linux',
-      'Topic :: System :: Hardware :: Hardware Drivers',
-      'Topic :: Utilities',
+        'Development Status :: 4 - Beta',
+        'Environment :: Console',
+        'Intended Audience :: End Users/Desktop',
+        'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
+        'Natural Language :: English',
+        'Programming Language :: Python :: 3',
+        'Operating System :: POSIX :: Linux',
+        'Topic :: System :: Hardware :: Hardware Drivers',
+        'Topic :: Utilities',
     ],
 )

setup.py

@@ -19,4 +19,4 @@
 ##########################################################################
 """
 
-__version__ = "0.3.8"
+__version__ = "0.3.9"